From 17b3f125f85a24bcdcb5fa8eccd71a54c6fe7e76 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Sun, 10 Dec 2017 19:25:40 +0200
Subject: [PATCH] Resolved issue #779. Add more roll paper size templates.

--HG--
branch : develop
---
 ChangeLog.txt                                 |  1 +
 dist/OBS_debian/debian.valentina.1            | 60 ++++++++++++++++---
 dist/debian/valentina.1                       | 13 +++-
 .../dialogs/dialoglayoutsettings.cpp          |  7 ++-
 .../dialogs/vabstractlayoutdialog.cpp         | 20 ++++++-
 .../valentina/dialogs/vabstractlayoutdialog.h |  7 ++-
 6 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5ea552860..f7d078e73 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -32,6 +32,7 @@
 - [#772] New tool Duplicate detail.
 - [#726] Improve Move tool. Add optional rotate option.
 - [#774] New feature. Matching Parentheses.
+- [#779] Add more roll paper size templates.
 
 # Version 0.5.1
 - [#683] Tool Seam allowance's dialog is off screen on small resolutions.
diff --git a/dist/OBS_debian/debian.valentina.1 b/dist/OBS_debian/debian.valentina.1
index 56766c989..9e50acf57 100644
--- a/dist/OBS_debian/debian.valentina.1
+++ b/dist/OBS_debian/debian.valentina.1
@@ -1,6 +1,6 @@
 .\" Manpage for valentina.
 .\" Contact dismine@gmail.com to correct errors.
-.TH valentina 1 "28 September, 2017" "valentina man page"
+.TH valentina 1 "10 December, 2017" "valentina man page"
 .SH NAME
 Valentina \- Pattern making program.
 .SH SYNOPSIS
@@ -113,7 +113,7 @@ The path to output destination folder. By default the directory at which the app
 .IP "-e, --gheight <The height value>"
 .RB "Set height value a pattern file, that was opened with multisize measurements (" "export mode" "). Valid values: 92, 98, 104, 110, 116, 122, 128, 134, 140, 146, 152, 158, 164, 170, 176, 182, 188, 194, 200cm."
 .IP "-p, --pageformat <Template number>"
-.RB "Number corresponding to page  template (default = 0, " "export mode" "):"
+.RB "Number corresponding to layout page template (default = 0, " "export mode" "):"
 .RS
 .BR "*" " A0 = 0,"
 .RE
@@ -148,24 +148,33 @@ The path to output destination folder. By default the directory at which the app
 .BR "*" " Roll 42in = 10,"
 .RE
 .RS
-.BR "*" " Roll 44in = 11."
+.BR "*" " Roll 44in = 11,"
+.RE
+.RS
+.BR "*" " Roll 48in = 12,"
+.RE
+.RS
+.BR "*" " Roll 62in = 13,"
+.RE
+.RS
+.BR "*" " Roll 72in = 14."
 .RE
 .IP "-W, --pagew <The page width>"
 .RB "Page width in current units like 12.0 (cannot be used with \*(lqpageformat\*(rq, " "export mode" ")."
 .IP "-H, --pageh <The page height>"
 .RB "Page height in current units like 12.0 (cannot be used with \*(lqpageformat\*(rq, " "export mode" ")."
 .IP "-U, --pageunits <The measure unit>"
-.RB "Page height/width measure units (cannot be used with \*(lqpageformat\*(rq, " "export mode" "). Valid values: mm, cm, inch, px."
+.RB "Page measure units (" "export mode" "). Valid values: mm, cm, inch, px."
 .IP "-i, --ignoremargins"
-.RB "Ignore margins printing (" "export mode" "). Disable value keys: \*(lqlmargin", \*(lqrmargin\*(rq, \*(lqtmargin\*(rq, \*(lqbmargin\*(rq. Set all margins to 0."
+.RB "Ignore margins printing (" "export mode" "). Use if need full paper space. In case of later printing you must account for the margins himself."
 .IP "-L, --lmargin <The left margin>"
-.RB "Page left margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key \*(lqignoremargins\*(rq is used."
+.RB "Page left margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found."
 .IP "-R, --rmargin <The right margin>"
-.RB "Page right margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key \*(lqignoremargins\*(rq is used."
+.RB "Page right margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found."
 .IP "-T, --tmargin <The top margin>"
-.RB "Page top margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key \*(lqignoremargins\*(rq is used."
+.RB "Page top margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found."
 .IP "-B, --bmargin <The bottom margin>"
-.RB "Page bottom margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found. Value will be ignored if key \*(lqignoremargins\*(rq is used."
+.RB "Page bottom margin in current units like 3.0 (" "export mode" "). If not set will be used value from default printer. Or 0 if none printers was found."
 .IP "-r, --rotate <Angle>"
 .RB "Rotation in degrees (one of predefined, " "export mode" "). Default value is " "180" ". 0 is no-rotate. Valid values: 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 12, 15, 18, 20, 24, 30, 36, 40, 45, 60, 72, 90, 180. Each value show how many times details will be rotated. For example 180 mean two times (360/180=2) by 180 degree."
 .IP "-c, --crop"
@@ -551,6 +560,39 @@ Run the program in a test mode. The program in this mode loads a single pattern
 .RE
 .IP "--csvExportFM <Path to csv file>"
 .RB "Calling this command enable exporting final measurements. Specify path to csv file with final measurements. The path must contain path to directory and name of file. It can be absolute or relatetive. In case of relative path will be used current working directory to calc a destination path."
+.IP "--tiledPageformat <Template number>"              
+.RB "Number corresponding to tiled pdf page template (default = 0, " "export mode with tiled pdf format" "):"
+.RS
+.BR "*" " A0 = 0,"
+.RE
+.RS
+.BR "*" " A1 = 1,"
+.RE
+.RS
+.BR "*" " A2 = 2,"
+.RE
+.RS
+.BR "*" " A3 = 3,"
+.RE
+.RS
+.BR "*" " A4 = 4,"
+.RE
+.RS
+.BR "*" " Letter = 5,"
+.RE
+.RS
+.BR "*" " Legal = 6."
+.RE
+.IP "--tiledlmargin <The left margin>"               
+.RB "Tiled page left margin in current units like 3.0 (" "export mode" "). If not set will be used default value 1 cm."
+.IP "--tiledrmargin <The right margin>"              
+.RB "Tiled page right margin in current units like 3.0 (" "export mode" "). If not set will be used default value 1 cm."
+.IP "--tiledtmargin <The top margin>"                
+.RB "Tiled page top margin in current units like 3.0 (" "export mode" "). If not set will be used value default value 1 cm."
+.IP "--tiledbmargin <The bottom margin>"             
+.RB "Tiled page bottom margin in current units like 3.0 (" "export mode" "). If not set will be used value default value 1 cm."
+.IP "--tiledLandscape"                               
+.RB "Set tiled page orienatation to landscape (" "export mode" "). Default value if not set portrait."
 .IP Arguments: 
 .I filename
 \- a pattern file.
diff --git a/dist/debian/valentina.1 b/dist/debian/valentina.1
index 7fcd45b13..9e50acf57 100644
--- a/dist/debian/valentina.1
+++ b/dist/debian/valentina.1
@@ -1,6 +1,6 @@
 .\" Manpage for valentina.
 .\" Contact dismine@gmail.com to correct errors.
-.TH valentina 1 "12 October, 2017" "valentina man page"
+.TH valentina 1 "10 December, 2017" "valentina man page"
 .SH NAME
 Valentina \- Pattern making program.
 .SH SYNOPSIS
@@ -148,7 +148,16 @@ The path to output destination folder. By default the directory at which the app
 .BR "*" " Roll 42in = 10,"
 .RE
 .RS
-.BR "*" " Roll 44in = 11."
+.BR "*" " Roll 44in = 11,"
+.RE
+.RS
+.BR "*" " Roll 48in = 12,"
+.RE
+.RS
+.BR "*" " Roll 62in = 13,"
+.RE
+.RS
+.BR "*" " Roll 72in = 14."
 .RE
 .IP "-W, --pagew <The page width>"
 .RB "Page width in current units like 12.0 (cannot be used with \*(lqpageformat\*(rq, " "export mode" ")."
diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp
index 5a9fe906b..96f03a7e1 100644
--- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp
+++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp
@@ -792,11 +792,11 @@ QString DialogLayoutSettings::MakeHelpTemplateList()
     auto cntr = static_cast<VIndexType>(PaperSizeTemplate::A0);
     for (int i = 0; i < VAbstractLayoutDialog::pageFormatNames.size(); ++i)
     {
-        if (cntr <= static_cast<int>(PaperSizeTemplate::Roll44in))// Don't include custom template
+        if (cntr < static_cast<int>(PaperSizeTemplate::Custom))// Don't include custom template
         {
             out += "\t* "+VAbstractLayoutDialog::pageFormatNames.at(i)+" = "+ QString::number(cntr++);
 
-            if (i < VAbstractLayoutDialog::pageFormatNames.size() - 1)
+            if (i < VAbstractLayoutDialog::pageFormatNames.size() - 2)
             {
                out += ",\n";
             }
@@ -854,6 +854,9 @@ QSizeF DialogLayoutSettings::Template()
         case PaperSizeTemplate::Roll36in:
         case PaperSizeTemplate::Roll42in:
         case PaperSizeTemplate::Roll44in:
+        case PaperSizeTemplate::Roll48in:
+        case PaperSizeTemplate::Roll62in:
+        case PaperSizeTemplate::Roll72in:
             SetAdditionalOptions(true);
             return GetTemplateSize(temp, paperUnit);
         case PaperSizeTemplate::Custom:
diff --git a/src/app/valentina/dialogs/vabstractlayoutdialog.cpp b/src/app/valentina/dialogs/vabstractlayoutdialog.cpp
index b1a63b143..1ab4fe6b8 100644
--- a/src/app/valentina/dialogs/vabstractlayoutdialog.cpp
+++ b/src/app/valentina/dialogs/vabstractlayoutdialog.cpp
@@ -43,13 +43,15 @@ const VAbstractLayoutDialog::FormatsVector VAbstractLayoutDialog::pageFormatName
                                                 << QApplication::translate("VAbstractLayoutDialog", "Roll 36in")
                                                 << QApplication::translate("VAbstractLayoutDialog", "Roll 42in")
                                                 << QApplication::translate("VAbstractLayoutDialog", "Roll 44in")
+                                                << QApplication::translate("VAbstractLayoutDialog", "Roll 48in")
+                                                << QApplication::translate("VAbstractLayoutDialog", "Roll 62in")
+                                                << QApplication::translate("VAbstractLayoutDialog", "Roll 72in")
                                                 << QApplication::translate("VAbstractLayoutDialog", "Custom");
 
 //---------------------------------------------------------------------------------------------------------------------
 VAbstractLayoutDialog::VAbstractLayoutDialog(QWidget *parent)
     : QDialog(parent)
-{
-}
+{}
 
 //---------------------------------------------------------------------------------------------------------------------
 void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates)
@@ -66,7 +68,7 @@ void VAbstractLayoutDialog::InitTemplates(QComboBox *comboBoxTemplates)
         {
             comboBoxTemplates->addItem(icoPaper, v+" "+pdi, QVariant(cntr++));
         }
-        else if (cntr <= static_cast<int>(PaperSizeTemplate::Roll44in))
+        else if (cntr <= static_cast<int>(PaperSizeTemplate::Roll72in))
         {
             comboBoxTemplates->addItem(icoRoll, v+" "+pdi, QVariant(cntr++));
         }
@@ -134,6 +136,18 @@ QSizeF VAbstractLayoutDialog::GetTemplateSize(const PaperSizeTemplate &tmpl, con
             width = UnitConvertor(44, Unit::Inch, unit);
             height = UnitConvertor(QIMAGE_MAX, Unit::Px, unit);
             return RoundTemplateSize(width, height, unit);
+        case PaperSizeTemplate::Roll48in:
+            width = UnitConvertor(48, Unit::Inch, unit);
+            height = UnitConvertor(QIMAGE_MAX, Unit::Px, unit);
+            return RoundTemplateSize(width, height, unit);
+        case PaperSizeTemplate::Roll62in:
+            width = UnitConvertor(62, Unit::Inch, unit);
+            height = UnitConvertor(QIMAGE_MAX, Unit::Px, unit);
+            return RoundTemplateSize(width, height, unit);
+        case PaperSizeTemplate::Roll72in:
+            width = UnitConvertor(72, Unit::Inch, unit);
+            height = UnitConvertor(QIMAGE_MAX, Unit::Px, unit);
+            return RoundTemplateSize(width, height, unit);
         default:
             break;
     }
diff --git a/src/app/valentina/dialogs/vabstractlayoutdialog.h b/src/app/valentina/dialogs/vabstractlayoutdialog.h
index eb2a1687d..287222420 100644
--- a/src/app/valentina/dialogs/vabstractlayoutdialog.h
+++ b/src/app/valentina/dialogs/vabstractlayoutdialog.h
@@ -48,8 +48,11 @@ public:
                                           Roll30in,     // Used also for showing icon
                                           Roll36in,
                                           Roll42in,
-                                          Roll44in = 11,
-                                          Custom = 12};
+                                          Roll44in,
+                                          Roll48in,
+                                          Roll62in,
+                                          Roll72in,
+                                          Custom = 15};
 
     explicit VAbstractLayoutDialog(QWidget *parent = nullptr);