From 89f786d98abd07f70e79996377a5f96159a803b3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 1 Jul 2019 09:57:49 +0300 Subject: [PATCH] Refactoring. Moving enum class LayoutExportFormats. --HG-- branch : develop --- src/app/valentina/dialogs/dialogsavelayout.h | 41 +------------------- src/libs/vlayout/vlayoutdef.h | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/app/valentina/dialogs/dialogsavelayout.h b/src/app/valentina/dialogs/dialogsavelayout.h index 9e5e90de5..382af7fe4 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.h +++ b/src/app/valentina/dialogs/dialogsavelayout.h @@ -31,6 +31,7 @@ #include "../vgeometry/vgeometrydef.h" #include "vabstractlayoutdialog.h" +#include "../vlayout/vlayoutdef.h" #ifndef PDFTOPS #ifdef Q_OS_WIN @@ -45,46 +46,6 @@ namespace Ui class DialogSaveLAyout; } -enum class LayoutExportFormats : char -{ - SVG = 0, - PDF = 1, - PNG = 2, - OBJ = 3, /* Wavefront OBJ*/ - PS = 4, - EPS = 5, - DXF_AC1006_Flat = 6, /* R10. */ - DXF_AC1009_Flat = 7, /* R11 & R12. */ - DXF_AC1012_Flat = 8, /* R13. */ - DXF_AC1014_Flat = 9, /* R14. */ - DXF_AC1015_Flat = 10, /* ACAD 2000. */ - DXF_AC1018_Flat = 11, /* ACAD 2004. */ - DXF_AC1021_Flat = 12, /* ACAD 2007. */ - DXF_AC1024_Flat = 13, /* ACAD 2010. */ - DXF_AC1027_Flat = 14, /* ACAD 2013. */ - DXF_AC1006_AAMA = 15, /* R10. */ - DXF_AC1009_AAMA = 16, /* R11 & R12. */ - DXF_AC1012_AAMA = 17, /* R13. */ - DXF_AC1014_AAMA = 18, /* R14. */ - DXF_AC1015_AAMA = 19, /* ACAD 2000. */ - DXF_AC1018_AAMA = 20, /* ACAD 2004. */ - DXF_AC1021_AAMA = 21, /* ACAD 2007. */ - DXF_AC1024_AAMA = 22, /* ACAD 2010. */ - DXF_AC1027_AAMA = 23, /* ACAD 2013. */ - DXF_AC1006_ASTM = 24, /* R10. */ - DXF_AC1009_ASTM = 25, /* R11 & R12. */ - DXF_AC1012_ASTM = 26, /* R13. */ - DXF_AC1014_ASTM = 27, /* R14. */ - DXF_AC1015_ASTM = 28, /* ACAD 2000. */ - DXF_AC1018_ASTM = 29, /* ACAD 2004. */ - DXF_AC1021_ASTM = 30, /* ACAD 2007. */ - DXF_AC1024_ASTM = 31, /* ACAD 2010. */ - DXF_AC1027_ASTM = 32, /* ACAD 2013. */ - PDFTiled = 33, - NC = 34, /*G-code. Reserved for future*/ - COUNT /*Use only for validation*/ -}; - class DialogSaveLayout : public VAbstractLayoutDialog { Q_OBJECT diff --git a/src/libs/vlayout/vlayoutdef.h b/src/libs/vlayout/vlayoutdef.h index 246f0804f..ee6aba976 100644 --- a/src/libs/vlayout/vlayoutdef.h +++ b/src/libs/vlayout/vlayoutdef.h @@ -35,6 +35,46 @@ #include "../vmisc/typedef.h" +enum class LayoutExportFormats : char +{ + SVG = 0, + PDF = 1, + PNG = 2, + OBJ = 3, /* Wavefront OBJ*/ + PS = 4, + EPS = 5, + DXF_AC1006_Flat = 6, /* R10. */ + DXF_AC1009_Flat = 7, /* R11 & R12. */ + DXF_AC1012_Flat = 8, /* R13. */ + DXF_AC1014_Flat = 9, /* R14. */ + DXF_AC1015_Flat = 10, /* ACAD 2000. */ + DXF_AC1018_Flat = 11, /* ACAD 2004. */ + DXF_AC1021_Flat = 12, /* ACAD 2007. */ + DXF_AC1024_Flat = 13, /* ACAD 2010. */ + DXF_AC1027_Flat = 14, /* ACAD 2013. */ + DXF_AC1006_AAMA = 15, /* R10. */ + DXF_AC1009_AAMA = 16, /* R11 & R12. */ + DXF_AC1012_AAMA = 17, /* R13. */ + DXF_AC1014_AAMA = 18, /* R14. */ + DXF_AC1015_AAMA = 19, /* ACAD 2000. */ + DXF_AC1018_AAMA = 20, /* ACAD 2004. */ + DXF_AC1021_AAMA = 21, /* ACAD 2007. */ + DXF_AC1024_AAMA = 22, /* ACAD 2010. */ + DXF_AC1027_AAMA = 23, /* ACAD 2013. */ + DXF_AC1006_ASTM = 24, /* R10. */ + DXF_AC1009_ASTM = 25, /* R11 & R12. */ + DXF_AC1012_ASTM = 26, /* R13. */ + DXF_AC1014_ASTM = 27, /* R14. */ + DXF_AC1015_ASTM = 28, /* ACAD 2000. */ + DXF_AC1018_ASTM = 29, /* ACAD 2004. */ + DXF_AC1021_ASTM = 30, /* ACAD 2007. */ + DXF_AC1024_ASTM = 31, /* ACAD 2010. */ + DXF_AC1027_ASTM = 32, /* ACAD 2013. */ + PDFTiled = 33, + NC = 34, /*G-code. Reserved for future*/ + COUNT /*Use only for validation*/ +}; + enum class LayoutErrors : char { NoError,