Refactoring. Move grainline and lable to library VWidgets.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-01-19 12:23:42 +02:00
parent 84b285cbe4
commit 121f003e7c
10 changed files with 14 additions and 13 deletions

View File

@ -51,8 +51,6 @@ HEADERS += \
$$PWD/drawTools/toolcurve/vtoolcubicbezier.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.h \
$$PWD/drawTools/toolcurve/vtoolcubicbezierpath.h \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.h \
$$PWD/drawTools/operation/vtoolrotation.h \ $$PWD/drawTools/operation/vtoolrotation.h \
$$PWD/vtextgraphicsitem.h \
$$PWD/vgrainlineitem.h \
$$PWD/drawTools/operation/flipping/vtoolflippingbyline.h \ $$PWD/drawTools/operation/flipping/vtoolflippingbyline.h \
$$PWD/drawTools/operation/vabstractoperation.h \ $$PWD/drawTools/operation/vabstractoperation.h \
$$PWD/drawTools/operation/flipping/vtoolflippingbyaxis.h \ $$PWD/drawTools/operation/flipping/vtoolflippingbyaxis.h \
@ -61,8 +59,7 @@ HEADERS += \
$$PWD/drawTools/toolcurve/vtoolellipticalarc.h \ $$PWD/drawTools/toolcurve/vtoolellipticalarc.h \
$$PWD/nodeDetails/vnodeellipticalarc.h \ $$PWD/nodeDetails/vnodeellipticalarc.h \
$$PWD/vtoolseamallowance.h \ $$PWD/vtoolseamallowance.h \
$$PWD/nodeDetails/vtoolpiecepath.h \ $$PWD/nodeDetails/vtoolpiecepath.h
$$PWD/vpieceitem.h
SOURCES += \ SOURCES += \
$$PWD/vtooldetail.cpp \ $$PWD/vtooldetail.cpp \
@ -111,8 +108,6 @@ SOURCES += \
$$PWD/drawTools/toolcurve/vtoolcubicbezier.cpp \ $$PWD/drawTools/toolcurve/vtoolcubicbezier.cpp \
$$PWD/drawTools/toolcurve/vtoolcubicbezierpath.cpp \ $$PWD/drawTools/toolcurve/vtoolcubicbezierpath.cpp \
$$PWD/drawTools/operation/vtoolrotation.cpp \ $$PWD/drawTools/operation/vtoolrotation.cpp \
$$PWD/vtextgraphicsitem.cpp \
$$PWD/vgrainlineitem.cpp \
$$PWD/drawTools/operation/flipping/vtoolflippingbyline.cpp \ $$PWD/drawTools/operation/flipping/vtoolflippingbyline.cpp \
$$PWD/drawTools/operation/vabstractoperation.cpp \ $$PWD/drawTools/operation/vabstractoperation.cpp \
$$PWD/drawTools/operation/flipping/vtoolflippingbyaxis.cpp \ $$PWD/drawTools/operation/flipping/vtoolflippingbyaxis.cpp \
@ -121,5 +116,4 @@ SOURCES += \
$$PWD/drawTools/toolcurve/vtoolellipticalarc.cpp \ $$PWD/drawTools/toolcurve/vtoolellipticalarc.cpp \
$$PWD/nodeDetails/vnodeellipticalarc.cpp \ $$PWD/nodeDetails/vnodeellipticalarc.cpp \
$$PWD/vtoolseamallowance.cpp \ $$PWD/vtoolseamallowance.cpp \
$$PWD/nodeDetails/vtoolpiecepath.cpp \ $$PWD/nodeDetails/vtoolpiecepath.cpp
$$PWD/vpieceitem.cpp

View File

@ -53,6 +53,7 @@
#include "../undocommands/savepieceoptions.h" #include "../undocommands/savepieceoptions.h"
#include "../undocommands/togglepieceinlayout.h" #include "../undocommands/togglepieceinlayout.h"
#include "../vwidgets/vmaingraphicsview.h" #include "../vwidgets/vmaingraphicsview.h"
#include "../vwidgets/vnobrushscalepathitem.h"
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QGraphicsView> #include <QGraphicsView>

View File

@ -34,14 +34,14 @@
#include <QObject> #include <QObject>
#include <QGraphicsPathItem> #include <QGraphicsPathItem>
#include "../vwidgets/vnobrushscalepathitem.h"
#include "vabstracttool.h" #include "vabstracttool.h"
#include "vtextgraphicsitem.h" #include "../vwidgets/vtextgraphicsitem.h"
#include "vgrainlineitem.h" #include "../vwidgets/vgrainlineitem.h"
class VMainGraphicsScene; class VMainGraphicsScene;
class DialogTool; class DialogTool;
class VPiece; class VPiece;
class VNoBrushScalePathItem;
class VToolSeamAllowance : public VAbstractTool, public QGraphicsPathItem class VToolSeamAllowance : public VAbstractTool, public QGraphicsPathItem
{ {

View File

@ -11,7 +11,10 @@ SOURCES += \
$$PWD/vabstractsimple.cpp \ $$PWD/vabstractsimple.cpp \
$$PWD/vnobrushscalepathitem.cpp \ $$PWD/vnobrushscalepathitem.cpp \
$$PWD/vsimplecurve.cpp \ $$PWD/vsimplecurve.cpp \
$$PWD/vabstractmainwindow.cpp $$PWD/vabstractmainwindow.cpp \
$$PWD/vtextgraphicsitem.cpp \
$$PWD/vgrainlineitem.cpp \
$$PWD/vpieceitem.cpp
win32-msvc*:SOURCES += $$PWD/stable.cpp win32-msvc*:SOURCES += $$PWD/stable.cpp
@ -26,4 +29,7 @@ HEADERS += \
$$PWD/vabstractsimple.h \ $$PWD/vabstractsimple.h \
$$PWD/vnobrushscalepathitem.h \ $$PWD/vnobrushscalepathitem.h \
$$PWD/vsimplecurve.h \ $$PWD/vsimplecurve.h \
$$PWD/vabstractmainwindow.h $$PWD/vabstractmainwindow.h \
$$PWD/vtextgraphicsitem.h \
$$PWD/vgrainlineitem.h \
$$PWD/vpieceitem.h