Move classes to VWidgets.

--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2015-06-15 15:50:59 +03:00
parent 8faded8de2
commit 6132153338
53 changed files with 251 additions and 55 deletions

View file

@ -617,6 +617,15 @@ DEPENDPATH += $$PWD/../libs/vmisc
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/vmisc.lib
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vmisc/$${DESTDIR}/libvmisc.a
#VWidgets static library
unix|win32: LIBS += -L$$OUT_PWD/../libs/vwidgets/$${DESTDIR}/ -lvwidgets
INCLUDEPATH += $$PWD/../libs/vwidgets
DEPENDPATH += $$PWD/../libs/vwidgets
win32:!win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/vwidgets.lib
else:unix|win32-g++: PRE_TARGETDEPS += $$OUT_PWD/../libs/vwidgets/$${DESTDIR}/libvwidgets.a
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
# do nothing
} else {

View file

@ -31,7 +31,7 @@
#include <QApplication>
#include "../options.h"
#include "../widgets/vmaingraphicsview.h"
#include "../libs/vwidgets/vmaingraphicsview.h"
#include "../libs/vpatterndb/vtranslatevars.h"
#include "vsettings.h"

View file

@ -30,7 +30,7 @@
#include "../../../options.h"
#include "../../../core/vapplication.h"
#include "../../../core/vsettings.h"
#include "../../../widgets/vmaingraphicsview.h"
#include "../../../../libs/vwidgets/vmaingraphicsview.h"
#include <QGroupBox>
#include <QLabel>
#include <QSettings>

View file

@ -28,9 +28,9 @@
#include "dialogincrements.h"
#include "ui_dialogincrements.h"
#include "../../widgets/doubledelegate.h"
#include "../../widgets/textdelegate.h"
#include "../../widgets/vwidgetpopup.h"
#include "../../libs/vwidgets/doubledelegate.h"
#include "../../libs/vwidgets/textdelegate.h"
#include "../../libs/vwidgets/vwidgetpopup.h"
#include "../../xml/vstandardmeasurements.h"
#include "../../xml/vindividualmeasurements.h"
#include "../../core/vsettings.h"

View file

@ -30,7 +30,7 @@
#include "ui_dialogalongline.h"
#include "../../visualization/vistoolalongline.h"
#include "../../tools/vabstracttool.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "dialogeditwrongformula.h"
#include <QPushButton>

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolbisector.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
#include "dialogeditwrongformula.h"

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolcurveintersectaxis.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
#include "dialogeditwrongformula.h"

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/varc.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolcutarc.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../xml/vpattern.h"
#include "dialogeditwrongformula.h"

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolendline.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
#include "dialogeditwrongformula.h"
#include <QTimer>

View file

@ -33,7 +33,7 @@
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../tools/vabstracttool.h"
#include "../visualization/vistoolheight.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
//---------------------------------------------------------------------------------------------------------------------
/**

View file

@ -33,7 +33,7 @@
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolline.h"
#include "../../core/vapplication.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
//---------------------------------------------------------------------------------------------------------------------

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoollineintersect.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../xml/vpattern.h"
//---------------------------------------------------------------------------------------------------------------------

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoollineintersectaxis.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
#include "dialogeditwrongformula.h"

View file

@ -29,7 +29,7 @@
#include "dialognormal.h"
#include "ui_dialognormal.h"
#include "../visualization/vistoolnormal.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
#include "dialogeditwrongformula.h"

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolpointfromarcandtangent.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
//---------------------------------------------------------------------------------------------------------------------
DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *data, const quint32 &toolId,

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolpointfromcircleandtangent.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "dialogeditwrongformula.h"
//---------------------------------------------------------------------------------------------------------------------

View file

@ -31,7 +31,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolpointofcontact.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../../xml/vpattern.h"
#include "dialogeditwrongformula.h"

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolpointofintersection.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../xml/vpattern.h"
//---------------------------------------------------------------------------------------------------------------------

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolpointofintersectionarcs.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
//---------------------------------------------------------------------------------------------------------------------
DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId,

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolpointofintersectioncircles.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "dialogeditwrongformula.h"
//---------------------------------------------------------------------------------------------------------------------

View file

@ -32,7 +32,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistoolshoulderpoint.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../../tools/vabstracttool.h"
#include "dialogeditwrongformula.h"

View file

@ -30,8 +30,8 @@
#define DIALOGTOOL_H
#include "../../core/vapplication.h"
#include "../vmisc/logging.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../libs/vmisc/logging.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../../visualization/visualization.h"
#include "../../xml/vpattern.h"

View file

@ -31,7 +31,7 @@
#include "../../libs/vgeometry/vpointf.h"
#include "../../libs/vpatterndb/vcontainer.h"
#include "../../visualization/vistooltriangle.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../../xml/vpattern.h"
//---------------------------------------------------------------------------------------------------------------------

View file

@ -30,7 +30,7 @@
#define MAINWINDOW_H
#include "mainwindowsnogui.h"
#include "widgets/vmaingraphicsview.h"
#include "../libs/vwidgets/vmaingraphicsview.h"
#include "dialogs/dialogs.h"
#include "tools/vtooldetail.h"
#include "tools/vtooluniondetails.h"

View file

@ -34,7 +34,7 @@
#include <QGraphicsSceneContextMenuEvent>
#include <QGraphicsView>
#include "../../dialogs/tools/dialogtool.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../xml/vpattern.h"
/**

View file

@ -27,7 +27,7 @@
*************************************************************************/
#include "vtoolcurveintersectaxis.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../libs/vpatterndb/calculator.h"
#include "../../dialogs/tools/dialogcurveintersectaxis.h"
#include "../../dialogs/tools/dialogeditwrongformula.h"

View file

@ -30,7 +30,7 @@
#define VTOOLCUT_H
#include "vtoolpoint.h"
#include "../../visualization/vsimplecurve.h"
#include "../../libs/vwidgets/vsimplecurve.h"
#include "vabstractspline.h"
class VFormula;

View file

@ -27,7 +27,7 @@
*************************************************************************/
#include "vtoolendline.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../libs/vpatterndb/calculator.h"
#include "../../dialogs/tools/dialogendline.h"
#include "../../dialogs/tools/dialogeditwrongformula.h"

View file

@ -27,7 +27,7 @@
*************************************************************************/
#include "vtoollineintersectaxis.h"
#include "../../widgets/vmaingraphicsscene.h"
#include "../../libs/vwidgets/vmaingraphicsscene.h"
#include "../../libs/vpatterndb/calculator.h"
#include "../../dialogs/tools/dialoglineintersectaxis.h"
#include "../../dialogs/tools/dialogeditwrongformula.h"

View file

@ -37,7 +37,7 @@
#include "../core/vapplication.h"
#include "../libs/vgeometry/vpointf.h"
#include "../undocommands/savetooloptions.h"
#include "../widgets/vmaingraphicsview.h"
#include "../libs/vwidgets/vmaingraphicsview.h"
#include "../core/vsettings.h"
const QString VAbstractTool::AttrType = QStringLiteral("type");

View file

@ -32,7 +32,7 @@
#include "vdatatool.h"
#include "../xml/vpattern.h"
#include "../core/vapplication.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../visualization/visualization.h"
class QDomElement;

View file

@ -30,7 +30,7 @@
#include "nodeDetails/nodedetails.h"
#include "../libs/vgeometry/varc.h"
#include "../libs/vgeometry/vsplinepath.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../dialogs/tools/dialogtool.h"
#include "../dialogs/tools/dialogdetail.h"
#include <QKeyEvent>

View file

@ -30,8 +30,8 @@
#include "../xml/vpattern.h"
#include "../tools/vabstracttool.h"
#include "../core/vapplication.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../widgets/vmaingraphicsview.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsview.h"
//---------------------------------------------------------------------------------------------------------------------
AddToCalc::AddToCalc(const QDomElement &xml, VPattern *doc, QUndoCommand *parent)

View file

@ -33,7 +33,7 @@
#include <QGraphicsItem>
#include "../core/vapplication.h"
#include "../widgets/vmaingraphicsscene.h"
#include "../libs/vwidgets/vmaingraphicsscene.h"
#include "../vmisc/logging.h"
#include "../../libs/vpatterndb/vcontainer.h"

View file

@ -4,7 +4,6 @@
HEADERS += \
$$PWD/vgraphicssimpletextitem.h \
$$PWD/vcontrolpointspline.h \
$$PWD/vsimplecurve.h \
$$PWD/visline.h \
$$PWD/vistoolline.h \
$$PWD/vistoolendline.h \
@ -36,7 +35,6 @@ HEADERS += \
SOURCES += \
$$PWD/vgraphicssimpletextitem.cpp \
$$PWD/vcontrolpointspline.cpp \
$$PWD/vsimplecurve.cpp \
$$PWD/visline.cpp \
$$PWD/vistoolline.cpp \
$$PWD/vistoolendline.cpp \

View file

@ -2,21 +2,11 @@
# This need for corect working file translations.pro
HEADERS += \
$$PWD/vmaingraphicsview.h \
$$PWD/vmaingraphicsscene.h \
$$PWD/doubledelegate.h \
$$PWD/textdelegate.h \
$$PWD/vtooloptionspropertybrowser.h \
$$PWD/vformulapropertyeditor.h \
$$PWD/vformulaproperty.h \
$$PWD/vwidgetpopup.h
$$PWD/vformulaproperty.h
SOURCES += \
$$PWD/vmaingraphicsview.cpp \
$$PWD/vmaingraphicsscene.cpp \
$$PWD/doubledelegate.cpp \
$$PWD/textdelegate.cpp \
$$PWD/vtooloptionspropertybrowser.cpp \
$$PWD/vformulapropertyeditor.cpp \
$$PWD/vformulaproperty.cpp \
$$PWD/vwidgetpopup.cpp
$$PWD/vformulaproperty.cpp

View file

@ -7,6 +7,7 @@ SUBDIRS = \
vlayout \
vgeometry \
vpatterndb \
vmisc
vmisc \
vwidgets
vgeometry.depends = ifc

View file

@ -0,0 +1,30 @@
/************************************************************************
**
** @file stable.cpp
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date 10 12, 2014
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013-2015 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
// Build the precompiled headers.
#include "stable.h"

View file

@ -0,0 +1,52 @@
/************************************************************************
**
** @file stable.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date 10 12, 2014
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2013-2015 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef STABLE_H
#define STABLE_H
/* I like to include this pragma too, so the build log indicates if pre-compiled headers were in use. */
#ifndef __clang__
#pragma message("Compiling precompiled headers for VPatternDB library.\n")
#endif
/* Add C includes here */
#if defined __cplusplus
/* Add C++ includes here */
#ifdef QT_CORE_LIB
#include <QtCore>
#endif
#ifdef QT_GUI_LIB
# include <QtGui>
#endif
#endif/*__cplusplus*/
#endif // STABLE_H

View file

@ -28,7 +28,7 @@
#include "textdelegate.h"
#include <QLineEdit>
#include "../libs/vpatterndb/vcontainer.h"
#include "../vpatterndb/vcontainer.h"
//---------------------------------------------------------------------------------------------------------------------
/**

View file

@ -32,7 +32,7 @@
#include <QWheelEvent>
#include <QApplication>
#include <QScrollBar>
#include "../visualization/vsimplecurve.h"
#include "vsimplecurve.h"
#include <QGraphicsItem>
#include <QMouseEvent>

View file

@ -30,7 +30,7 @@
#define VSIMPLECURVE_H
#include <QGraphicsPathItem>
#include "../libs/vgeometry/vabstractcurve.h"
#include "../vgeometry/vabstractcurve.h"
#include "../vmisc/def.h"
enum class SimpleCurvePoint : char { FirstPoint, ForthPoint };

View file

@ -0,0 +1,20 @@
# ADD TO EACH PATH $$PWD VARIABLE!!!!!!
# This need for corect working file translations.pro
SOURCES += \
$$PWD/stable.cpp \
$$PWD/doubledelegate.cpp \
$$PWD/textdelegate.cpp \
$$PWD/vmaingraphicsscene.cpp \
$$PWD/vmaingraphicsview.cpp \
$$PWD/vsimplecurve.cpp \
$$PWD/vwidgetpopup.cpp
HEADERS += \
$$PWD/stable.h \
$$PWD/doubledelegate.h \
$$PWD/textdelegate.h \
$$PWD/vmaingraphicsscene.h \
$$PWD/vmaingraphicsview.h \
$$PWD/vsimplecurve.h \
$$PWD/vwidgetpopup.h

View file

@ -0,0 +1,96 @@
#-------------------------------------------------
#
# Project created by QtCreator 2015-06-15T15:24:19
#
#-------------------------------------------------
# File with common stuff for whole project
include(../../../Valentina.pri)
# Name of the library
TARGET = vwidgets
# We want create a library
TEMPLATE = lib
CONFIG += \
staticlib \# Making static library
c++11 # We use C++11 standard
# Use out-of-source builds (shadow builds)
CONFIG -= debug_and_release debug_and_release_target
# Since Qt 5.4.0 the source code location is recorded only in debug builds.
# We need this information also in release builds. For this need define QT_MESSAGELOGCONTEXT.
DEFINES += QT_MESSAGELOGCONTEXT
include(vwidgets.pri)
# This is static library so no need in "make install"
# directory for executable file
DESTDIR = bin
# files created moc
MOC_DIR = moc
# objecs files
OBJECTS_DIR = obj
# Set using ccache. Function enable_ccache() defined in Valentina.pri.
$$enable_ccache()
# Set precompiled headers. Function set_PCH() defined in Valentina.pri.
$$set_PCH()
CONFIG(debug, debug|release){
# Debug mode
unix {
#Turn on compilers warnings.
*-g++{
QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.
noAddressSanitizer{ # For enable run qmake with CONFIG+=noAddressSanitizer
# do nothing
} else {
#gccs 4.8.0 Address Sanitizer
#http://blog.qt.digia.com/blog/2013/04/17/using-gccs-4-8-0-address-sanitizer-with-qt/
QMAKE_CXXFLAGS += -fsanitize=address -fno-omit-frame-pointer
QMAKE_CFLAGS += -fsanitize=address -fno-omit-frame-pointer
QMAKE_LFLAGS += -fsanitize=address
}
}
clang*{
QMAKE_CXXFLAGS += \
# Key -isystem disable checking errors in system headers.
-isystem "$${OUT_PWD}/$${MOC_DIR}" \
$$CLANG_DEBUG_CXXFLAGS # See Valentina.pri for more details.
}
} else {
*-g++{
QMAKE_CXXFLAGS += $$GCC_DEBUG_CXXFLAGS # See Valentina.pri for more details.
}
}
}else{
# Release mode
!unix:*-g++{
QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll
}
noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols
# do nothing
} else {
!macx:!win32-msvc*{
# Turn on debug symbols in release mode on Unix systems.
# On Mac OS X temporarily disabled. TODO: find way how to strip binary file.
QMAKE_CXXFLAGS_RELEASE += -g -gdwarf-3
QMAKE_CFLAGS_RELEASE += -g -gdwarf-3
QMAKE_LFLAGS_RELEASE =
}
}
}