From 6c6ee3c8834f9e07fbf70195e16b3403a47dbdbd Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 14 Jul 2014 21:16:00 +0300 Subject: [PATCH] Prepare folder for issue #16: Visualization. --HG-- branch : develop --- src/app/app.pro | 1 + src/app/tools/drawTools/vabstractspline.h | 2 +- src/app/tools/drawTools/vtoolcut.h | 2 +- src/app/tools/drawTools/vtoolpoint.cpp | 2 +- src/app/tools/drawTools/vtoolsinglepoint.cpp | 2 +- src/app/tools/nodeDetails/vnodepoint.cpp | 2 +- .../vcontrolpointspline.cpp | 0 .../{widgets => visualization}/vcontrolpointspline.h | 0 .../vgraphicssimpletextitem.cpp | 0 .../vgraphicssimpletextitem.h | 0 src/app/visualization/visualization.pri | 11 +++++++++++ src/app/{widgets => visualization}/vsimplecurve.cpp | 0 src/app/{widgets => visualization}/vsimplecurve.h | 0 .../{widgets => visualization}/vsimplesplinepath.cpp | 0 .../{widgets => visualization}/vsimplesplinepath.h | 0 src/app/widgets/widgets.pri | 12 ++---------- 16 files changed, 19 insertions(+), 15 deletions(-) rename src/app/{widgets => visualization}/vcontrolpointspline.cpp (100%) rename src/app/{widgets => visualization}/vcontrolpointspline.h (100%) rename src/app/{widgets => visualization}/vgraphicssimpletextitem.cpp (100%) rename src/app/{widgets => visualization}/vgraphicssimpletextitem.h (100%) create mode 100644 src/app/visualization/visualization.pri rename src/app/{widgets => visualization}/vsimplecurve.cpp (100%) rename src/app/{widgets => visualization}/vsimplecurve.h (100%) rename src/app/{widgets => visualization}/vsimplesplinepath.cpp (100%) rename src/app/{widgets => visualization}/vsimplesplinepath.h (100%) diff --git a/src/app/app.pro b/src/app/app.pro index 4fca1d71a..ef9c4b762 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -42,6 +42,7 @@ include(tools/tools.pri) include(widgets/widgets.pri) include(xml/xml.pri) include(undocommands/undocommands.pri) +include(visualization/visualization.pri) SOURCES += \ main.cpp \ diff --git a/src/app/tools/drawTools/vabstractspline.h b/src/app/tools/drawTools/vabstractspline.h index 89c203d68..39107bf3c 100644 --- a/src/app/tools/drawTools/vabstractspline.h +++ b/src/app/tools/drawTools/vabstractspline.h @@ -31,7 +31,7 @@ #include "vdrawtool.h" #include -#include "../../widgets/vcontrolpointspline.h" +#include "../../visualization/vcontrolpointspline.h" class VAbstractSpline:public VDrawTool, public QGraphicsPathItem { diff --git a/src/app/tools/drawTools/vtoolcut.h b/src/app/tools/drawTools/vtoolcut.h index 4121614bf..44d540b2e 100644 --- a/src/app/tools/drawTools/vtoolcut.h +++ b/src/app/tools/drawTools/vtoolcut.h @@ -30,7 +30,7 @@ #define VTOOLCUT_H #include "vtoolpoint.h" -#include "../../widgets/vsimplecurve.h" +#include "../../visualization/vsimplecurve.h" class VToolCut : public VToolPoint { diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp index 55f9ba22e..7f967652f 100644 --- a/src/app/tools/drawTools/vtoolpoint.cpp +++ b/src/app/tools/drawTools/vtoolpoint.cpp @@ -29,7 +29,7 @@ #include "vtoolpoint.h" #include #include "../../geometry/vpointf.h" -#include "../../widgets/vgraphicssimpletextitem.h" +#include "../../visualization/vgraphicssimpletextitem.h" const QString VToolPoint::TagName = QStringLiteral("point"); diff --git a/src/app/tools/drawTools/vtoolsinglepoint.cpp b/src/app/tools/drawTools/vtoolsinglepoint.cpp index 6ef6046f0..f9986fbb8 100644 --- a/src/app/tools/drawTools/vtoolsinglepoint.cpp +++ b/src/app/tools/drawTools/vtoolsinglepoint.cpp @@ -28,7 +28,7 @@ #include "vtoolsinglepoint.h" #include "../../dialogs/tools/dialogsinglepoint.h" -#include "../../widgets/vgraphicssimpletextitem.h" +#include "../../visualization/vgraphicssimpletextitem.h" #include "../../undocommands/movespoint.h" #include "../../undocommands/addpatternpiece.h" #include "../../undocommands/deletepatternpiece.h" diff --git a/src/app/tools/nodeDetails/vnodepoint.cpp b/src/app/tools/nodeDetails/vnodepoint.cpp index 278b61fef..ffca41569 100644 --- a/src/app/tools/nodeDetails/vnodepoint.cpp +++ b/src/app/tools/nodeDetails/vnodepoint.cpp @@ -30,7 +30,7 @@ #include "../../widgets/vapplication.h" #include "../../geometry/vpointf.h" -#include "../../widgets/vgraphicssimpletextitem.h" +#include "../../visualization/vgraphicssimpletextitem.h" #include #include #include diff --git a/src/app/widgets/vcontrolpointspline.cpp b/src/app/visualization/vcontrolpointspline.cpp similarity index 100% rename from src/app/widgets/vcontrolpointspline.cpp rename to src/app/visualization/vcontrolpointspline.cpp diff --git a/src/app/widgets/vcontrolpointspline.h b/src/app/visualization/vcontrolpointspline.h similarity index 100% rename from src/app/widgets/vcontrolpointspline.h rename to src/app/visualization/vcontrolpointspline.h diff --git a/src/app/widgets/vgraphicssimpletextitem.cpp b/src/app/visualization/vgraphicssimpletextitem.cpp similarity index 100% rename from src/app/widgets/vgraphicssimpletextitem.cpp rename to src/app/visualization/vgraphicssimpletextitem.cpp diff --git a/src/app/widgets/vgraphicssimpletextitem.h b/src/app/visualization/vgraphicssimpletextitem.h similarity index 100% rename from src/app/widgets/vgraphicssimpletextitem.h rename to src/app/visualization/vgraphicssimpletextitem.h diff --git a/src/app/visualization/visualization.pri b/src/app/visualization/visualization.pri new file mode 100644 index 000000000..bb1140075 --- /dev/null +++ b/src/app/visualization/visualization.pri @@ -0,0 +1,11 @@ +HEADERS += \ + visualization/vgraphicssimpletextitem.h \ + visualization/vcontrolpointspline.h \ + visualization/vsimplesplinepath.h \ + visualization/vsimplecurve.h + +SOURCES += \ + visualization/vgraphicssimpletextitem.cpp \ + visualization/vcontrolpointspline.cpp \ + visualization/vsimplesplinepath.cpp \ + visualization/vsimplecurve.cpp diff --git a/src/app/widgets/vsimplecurve.cpp b/src/app/visualization/vsimplecurve.cpp similarity index 100% rename from src/app/widgets/vsimplecurve.cpp rename to src/app/visualization/vsimplecurve.cpp diff --git a/src/app/widgets/vsimplecurve.h b/src/app/visualization/vsimplecurve.h similarity index 100% rename from src/app/widgets/vsimplecurve.h rename to src/app/visualization/vsimplecurve.h diff --git a/src/app/widgets/vsimplesplinepath.cpp b/src/app/visualization/vsimplesplinepath.cpp similarity index 100% rename from src/app/widgets/vsimplesplinepath.cpp rename to src/app/visualization/vsimplesplinepath.cpp diff --git a/src/app/widgets/vsimplesplinepath.h b/src/app/visualization/vsimplesplinepath.h similarity index 100% rename from src/app/widgets/vsimplesplinepath.h rename to src/app/visualization/vsimplesplinepath.h diff --git a/src/app/widgets/widgets.pri b/src/app/widgets/widgets.pri index 901d6341d..9f100cc0d 100644 --- a/src/app/widgets/widgets.pri +++ b/src/app/widgets/widgets.pri @@ -3,27 +3,19 @@ HEADERS += \ widgets/vmaingraphicsview.h \ widgets/vmaingraphicsscene.h \ widgets/vitem.h \ - widgets/vgraphicssimpletextitem.h \ - widgets/vcontrolpointspline.h \ widgets/vapplication.h \ widgets/doubledelegate.h \ - widgets/vsimplesplinepath.h \ widgets/textdelegate.h \ widgets/vtranslation.h \ - widgets/undoevent.h \ - widgets/vsimplecurve.h + widgets/undoevent.h SOURCES += \ widgets/vtablegraphicsview.cpp \ widgets/vmaingraphicsview.cpp \ widgets/vmaingraphicsscene.cpp \ widgets/vitem.cpp \ - widgets/vgraphicssimpletextitem.cpp \ - widgets/vcontrolpointspline.cpp \ widgets/vapplication.cpp \ widgets/doubledelegate.cpp \ - widgets/vsimplesplinepath.cpp \ widgets/textdelegate.cpp \ widgets/vtranslation.cpp \ - widgets/undoevent.cpp \ - widgets/vsimplecurve.cpp + widgets/undoevent.cpp