Merge pull request #1063 from FashionFreedom/new-measurement--file-sc…

…hema feat: New measurement file schema
FashionFreedom · Jan 30, 2024 · eb5f74c · eb5f74c
2 parents f35045a + 90a59fb
commit eb5f74c
Show file tree

Hide file tree

Showing 167 changed files with 6,332 additions and 2,648 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -1065,7 +1065,7 @@ EXCLUDE_PATTERNS       = *.svg \
                          *.vit \
                          *.vst \
                          *.sm2d \
-                         *.smin \
+                         *.smis \
                          *.smms \
                          *.pdf \
                          *.png \

diff --git a/common.pri b/common.pri
@@ -83,6 +83,7 @@ defineTest(copyToDestdir) {
                     FILE ~= s,/,\\,g
                     DDIR ~= s,/,\\,g
                 }
+                message("copy:" $$quote($$FILE))
                 QMAKE_POST_LINK += $$VCOPY $$quote($$FILE) $$quote($$DDIR) $$escape_expand(\\n\\t)
             }
 

diff --git a/dist/macx/seamly2d/Info.plist b/dist/macx/seamly2d/Info.plist
@@ -47,7 +47,7 @@
 			<string>individual_size_file.icns</string>
 			<key>LSItemContentTypes</key>
 			<array>
-				<string>org.seamly2dproject.smin</string>
+				<string>org.seamly2dproject.smis</string>
 			</array>
 			<key>CFBundleTypeName</key>
 			<string>SeamlyMe individual measurements</string>
@@ -104,7 +104,7 @@
 			<key>UTTypeIconFile</key>
 			<string>individual_size_file.icns</string>
 			<key>UTTypeIdentifier</key>
-			<string>org.seamly2dproject.smin</string>
+			<string>org.seamly2dproject.smis</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>

diff --git a/dist/macx/seamlyme/Info.plist b/dist/macx/seamlyme/Info.plist
@@ -68,7 +68,7 @@
 			<key>UTTypeIconFile</key>
 			<string>individual_size_file.icns</string>
 			<key>UTTypeIdentifier</key>
-                <string>org.seamly2dproject.smin</string>
+                <string>org.seamly2dproject.smis</string>
 			<key>UTTypeTagSpecification</key>
 			<dict>
 				<key>public.filename-extension</key>

diff --git a/src/app/samples.pri b/src/app/samples.pri
@@ -0,0 +1,38 @@
+# Keep path to all files with individual measurements we support right now
+INSTALL_INDIVIDUAL_MEASUREMENTS += \
+    $${PWD}/share/samples/measurements/individual/male_shirt.smis \
+    $${PWD}/share/samples/measurements/individual/trousers.smis
+
+# Keep path to all files with multisize measurements we support right now
+INSTALL_MULTISIZE_MEASUREMENTS += \
+    $${PWD}/share/samples/measurements/multisize/gost_man_ru.smms
+
+# Keep path to all template files we have right now
+INSTALL_STANDARD_TEMPLATES += \
+    $${PWD}/share/samples/measurements/templates/all_measurements_template.smis \
+    $${PWD}/share/samples/measurements/templates/aldrich_women_template.smis
+
+# Keep path to all patterns we provide right now
+INSTALL_PATTERNS += \
+    $${PWD}/share/samples/patterns/jacket1_52-176.sm2d \
+    $${PWD}/share/samples/patterns/jacket2_40-146.sm2d \
+    $${PWD}/share/samples/patterns/jacket3_40-146.sm2d \
+    $${PWD}/share/samples/patterns/jacket4_40-146.sm2d \
+    $${PWD}/share/samples/patterns/jacket5_30-110.sm2d \
+    $${PWD}/share/samples/patterns/jacket6_30-110.sm2d \
+    $${PWD}/share/samples/patterns/male_shirt.sm2d \
+    $${PWD}/share/samples/patterns/trousers.sm2d
+
+# Keep path to all label templates we provide right now
+INSTALL_LABEL_TEMPLATES += \
+    $${PWD}/share/labels/default_pattern_label.xml \
+    $${PWD}/share/labels/default_piece_label.xml
+
+win32
+{
+    copyToDestdir($$INSTALL_INDIVIDUAL_MEASUREMENTS, $$shell_path($${OUT_PWD}/$${DESTDIR}/samples/measurements/individual))
+    copyToDestdir($$INSTALL_MULTISIZE_MEASUREMENTS, $$shell_path($${OUT_PWD}/$${DESTDIR}/samples/measurements/multisize))
+    copyToDestdir($$INSTALL_STANDARD_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/samples/measurements/templates))
+    copyToDestdir($$INSTALL_PATTERNS, $$shell_path($${OUT_PWD}/$${DESTDIR}/samples/patterns))
+    copyToDestdir($$INSTALL_LABEL_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/labels))
+}
diff --git a/src/app/seamly2d/dialogs/dialogpatternproperties.cpp b/src/app/seamly2d/dialogs/dialogpatternproperties.cpp
@@ -189,7 +189,7 @@ DialogPatternProperties::DialogPatternProperties(VPattern *doc,  VContainer *pat
     connect(ui->comboBoxSize, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
             this, DefValueChanged);
 
-    const bool readOnly = doc->IsReadOnly();
+    const bool readOnly = doc->isReadOnly();
     ui->checkBoxPatternReadOnly->setChecked(readOnly);
     if (not readOnly)
     {

diff --git a/src/app/seamly2d/mainwindow.cpp b/src/app/seamly2d/mainwindow.cpp
@@ -6245,7 +6245,7 @@ bool MainWindow::LoadPattern(const QString &fileName, const QString& customMeasu
 
     if (guiEnabled)
     { // No errors occurred
-        patternReadOnly = doc->IsReadOnly();
+        patternReadOnly = doc->isReadOnly();
         setWidgetsEnabled(true);
         setCurrentFile(fileName);
         helpLabel->setText(tr("File loaded"));
@@ -6836,9 +6836,9 @@ QString MainWindow::checkPathToMeasurements(const QString &patternPath, const QS
                     {
                         MultiSizeConverter converter(filename);
                         QString filename = converter.Convert();
-                        if (filename.contains(".vst"))
+                        if (filename.contains(QLatin1String(".") + vstExt))
                         {
-                            filename.replace(QString(".vst"), QString(".smms"));
+                            filename.replace(QLatin1String(".") + vstExt, QLatin1String(".") + smmsExt);
                             QString error;
                             const bool result = measurements->SaveDocument(filename, error);
                             if (result)
@@ -6852,9 +6852,9 @@ QString MainWindow::checkPathToMeasurements(const QString &patternPath, const QS
                     {
                         IndividualSizeConverter converter(filename);
                         QString filename = converter.Convert();
-                        if (filename.contains(".vit"))
+                        if (filename.contains(QLatin1String(".") + vitExt))
                         {
-                            filename.replace(QString(".vit"), QString(".smis"));
+                            filename.replace(QLatin1String(".") + vitExt, QLatin1String(".") + smisExt);
                             QString error;
                             const bool result = measurements->SaveDocument(filename, error);
                             if (result)

diff --git a/src/app/seamly2d/mainwindowsnogui.cpp b/src/app/seamly2d/mainwindowsnogui.cpp
@@ -1169,7 +1169,7 @@ void MainWindowsNoGUI::FlatDxfFile(const QString &name, int version, bool binary
     generator.setFileName(name);
     generator.setSize(paper->rect().size().toSize());
     generator.setResolution(PrintDPI);
-    generator.SetVersion(static_cast<DRW::Version>(version));
+    generator.setVersion(static_cast<DRW::Version>(version));
     generator.SetBinaryFormat(binary);
     generator.setInsunits(VarInsunits::Millimeters);// Decided to always use mm. See issue #745
 
@@ -1190,7 +1190,7 @@ void MainWindowsNoGUI::AAMADxfFile(const QString &name, int version, bool binary
     generator.setFileName(name);
     generator.setSize(size);
     generator.setResolution(PrintDPI);
-    generator.SetVersion(static_cast<DRW::Version>(version));
+    generator.setVersion(static_cast<DRW::Version>(version));
     generator.SetBinaryFormat(binary);
     generator.setInsunits(VarInsunits::Millimeters);// Decided to always use mm. See issue #745
     generator.ExportToAAMA(pieces);

diff --git a/src/app/seamly2d/seamly2d.pro b/src/app/seamly2d/seamly2d.pro
@@ -78,8 +78,8 @@ message(seamly2d.pro: Examples: $$[QT_INSTALL_EXAMPLES])
 # Path to resource file.
 win32:RC_FILE = share/resources/seamly2d.rc
 
-# INSTALL_MULTISIZE_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES and INSTALL_LABEL_TEMPLATES inside tables.pri
-include(../tables.pri)
+# INSTALL_MULTISIZE_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES and INSTALL_LABEL_TEMPLATES inside samples.pri
+include(../samples.pri)
 
 win32 {
     INSTALL_PDFTOPS += ../../../dist/win/pdftops.exe

diff --git a/src/app/seamly2d/xml/vpattern.cpp b/src/app/seamly2d/xml/vpattern.cpp
@@ -3879,7 +3879,7 @@ void VPattern::SetDefCustomSize(int value)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-bool VPattern::IsReadOnly() const
+bool VPattern::isReadOnly() const
 {
     const QDomElement pattern = documentElement();
 

diff --git a/src/app/seamly2d/xml/vpattern.h b/src/app/seamly2d/xml/vpattern.h
@@ -114,7 +114,7 @@ class VPattern : public VAbstractPattern
     int  GetDefCustomSize() const;
     void SetDefCustomSize(int value);
 
-    bool IsReadOnly() const;
+    bool isReadOnly() const;
     void SetReadOnly(bool rOnly);
 
     void LiteParseIncrements();

diff --git a/src/app/seamlyme/main.cpp b/src/app/seamlyme/main.cpp
@@ -101,7 +101,6 @@ int main(int argc, char *argv[])
     }
 
     QTimer::singleShot(0, &app, &MApplication::processCommandLine);
-    //app.processCommandLine();
 
     return app.exec();
 }
diff --git a/src/app/seamlyme/seamlyme.pro b/src/app/seamlyme/seamlyme.pro
@@ -38,12 +38,8 @@ RESOURCES += \
     share/resources/seamlymeicon.qrc \
     share/resources/diagrams.qrc
 
-# INSTALL_MULTISIZE_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES and INSTALL_LABEL_TEMPLATES inside tables.pri
-include(../tables.pri)
-
-win32 {
-    copyToDestdir($$INSTALL_STANDARD_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/tables/templates))
-}
+# INSTALL_MULTISIZE_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES and INSTALL_LABEL_TEMPLATES inside samples.pri
+include(../samples.pri)
 
 include(../translations.pri)