realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

Wip Fix preprocessor on Cmake

Browse Source
This commit is contained in:
Simon De Backer 2020-12-10 18:44:03 +01:00
parent 3fe0adc66e
commit d15443cf93
61 changed files with 253 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/ElementsCollection/ui/renamedialog.h
View File

@ -18,7 +18,7 @@
#ifndef RENAMEDIALOG_H #ifndef RENAMEDIALOG_H
#define RENAMEDIALOG_H #define RENAMEDIALOG_H
#include "../qet.h" #include "../../qet.h"
#include <QDialog> #include <QDialog>

2
sources/SearchAndReplace/ui/replaceadvanceddialog.h
View File

@ -18,7 +18,7 @@
#ifndef REPLACEADVANCEDDIALOG_H #ifndef REPLACEADVANCEDDIALOG_H
#define REPLACEADVANCEDDIALOG_H #define REPLACEADVANCEDDIALOG_H
#include "searchandreplaceworker.h" #include "../searchandreplaceworker.h"
#include <QDialog> #include <QDialog>

8
sources/SearchAndReplace/ui/searchandreplacewidget.cpp
View File

@ -22,14 +22,14 @@
#include "../../diagramcontent.h" #include "../../diagramcontent.h"
#include "../../qetapp.h" #include "../../qetapp.h"
#include "../../qetdiagrameditor.h" #include "../../qetdiagrameditor.h"
#include "../../qetgraphicsitem/conductor.h"
#include "../../qetgraphicsitem/dynamicelementtextitem.h"
#include "../../qetgraphicsitem/element.h" #include "../../qetgraphicsitem/element.h"
#include "../../qetgraphicsitem/elementtextitemgroup.h"
#include "../../qetgraphicsitem/independenttextitem.h"
#include "../../qeticons.h" #include "../../qeticons.h"
#include "../../qetinformation.h" #include "../../qetinformation.h"
#include "../../qetproject.h" #include "../../qetproject.h"
#include "conductor.h"
#include "dynamicelementtextitem.h"
#include "elementtextitemgroup.h"
#include "independenttextitem.h"
#include "replaceadvanceddialog.h" #include "replaceadvanceddialog.h"
#include "replaceconductordialog.h" #include "replaceconductordialog.h"
#include "replaceelementdialog.h" #include "replaceelementdialog.h"

4
sources/autoNum/ui/autonumberingdockwidget.h
View File

@ -18,8 +18,8 @@
#ifndef AUTONUMBERINGDOCKWIDGET_H #ifndef AUTONUMBERINGDOCKWIDGET_H
#define AUTONUMBERINGDOCKWIDGET_H #define AUTONUMBERINGDOCKWIDGET_H
#include "../projectview.h" #include "../../projectview.h"
#include "../qetproject.h" #include "../../qetproject.h"
#include <QDockWidget> #include <QDockWidget>

4
sources/dataBase/ui/elementquerywidget.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "elementquerywidget.h" #include "elementquerywidget.h"
#include "../qetapp.h" #include "../../qetapp.h"
#include "../qetinformation.h" #include "../../qetinformation.h"
#include "ui_elementquerywidget.h" #include "ui_elementquerywidget.h"
#include <QRegularExpression> #include <QRegularExpression>

4
sources/dataBase/ui/summaryquerywidget.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "summaryquerywidget.h" #include "summaryquerywidget.h"
#include "../qetapp.h" #include "../../qetapp.h"
#include "../qetinformation.h" #include "../../qetinformation.h"
#include "ui_summaryquerywidget.h" #include "ui_summaryquerywidget.h"
#include <QListWidgetItem> #include <QListWidgetItem>

2
sources/diagramevent/diagrameventaddimage.cpp
View File

@ -20,7 +20,7 @@
#include "../diagram.h" #include "../diagram.h"
#include "../diagramcommands.h" #include "../diagramcommands.h"
#include "../diagramimageitem.h" #include "../qetgraphicsitem/diagramimageitem.h"
/** /**
@brief DiagramEventAddImage::DiagramEventAddImage @brief DiagramEventAddImage::DiagramEventAddImage

2
sources/diagramevent/diagrameventaddshape.h
View File

@ -18,8 +18,8 @@
#ifndef DIAGRAMEVENTADDSHAPE_H #ifndef DIAGRAMEVENTADDSHAPE_H
#define DIAGRAMEVENTADDSHAPE_H #define DIAGRAMEVENTADDSHAPE_H
#include "../qetgraphicsitem/qetshapeitem.h"
#include "diagrameventinterface.h" #include "diagrameventinterface.h"
#include "qetshapeitem.h"
/** /**
@brief The DiagramEventAddShape class @brief The DiagramEventAddShape class

2
sources/diagramevent/diagrameventaddtext.cpp
View File

@ -20,7 +20,7 @@
#include "../diagram.h" #include "../diagram.h"
#include "../diagramcommands.h" #include "../diagramcommands.h"
#include "../independenttextitem.h" #include "../qetgraphicsitem/independenttextitem.h"
/** /**
@brief DiagramEventAddText::DiagramEventAddText @brief DiagramEventAddText::DiagramEventAddText

2
sources/editor/arceditor.cpp
View File

@ -19,7 +19,7 @@
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../QPropertyUndoCommand/qpropertyundocommand.h"
#include "elementscene.h" #include "elementscene.h"
#include "partarc.h" #include "graphicspart/partarc.h"
#include "styleeditor.h" #include "styleeditor.h"
/** /**

2
sources/editor/editorcommands.h
View File

@ -17,8 +17,8 @@
*/ */
#ifndef EDITOR_COMMANDS_H #ifndef EDITOR_COMMANDS_H
#define EDITOR_COMMANDS_H #define EDITOR_COMMANDS_H
#include "../editor/graphicspart/customelementpart.h"
#include "../qgimanager.h" #include "../qgimanager.h"
#include "customelementpart.h"
#include "elementcontent.h" #include "elementcontent.h"
#include "elementscene.h" #include "elementscene.h"
#include "elementview.h" #include "elementview.h"

2
sources/editor/elementprimitivedecorator.cpp
View File

@ -18,8 +18,8 @@
#include "elementprimitivedecorator.h" #include "elementprimitivedecorator.h"
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "../QetGraphicsItemModeler/qetgraphicshandleritem.h"
#include "../editor/graphicspart/customelementpart.h"
#include "../qet.h" #include "../qet.h"
#include "customelementpart.h"
#include "editorcommands.h" #include "editorcommands.h"
#include "elementscene.h" #include "elementscene.h"

16
sources/editor/elementscene.cpp
View File

@ -25,14 +25,14 @@
#include "elementcontent.h" #include "elementcontent.h"
#include "elementprimitivedecorator.h" #include "elementprimitivedecorator.h"
#include "eseventinterface.h" #include "eseventinterface.h"
#include "partarc.h" #include "graphicspart/partarc.h"
#include "partdynamictextfield.h" #include "graphicspart/partdynamictextfield.h"
#include "partellipse.h" #include "graphicspart/partellipse.h"
#include "partline.h" #include "graphicspart/partline.h"
#include "partpolygon.h" #include "graphicspart/partpolygon.h"
#include "partrectangle.h" #include "graphicspart/partrectangle.h"
#include "partterminal.h" #include "graphicspart/partterminal.h"
#include "parttext.h" #include "graphicspart/parttext.h"
#include "qetelementeditor.h" #include "qetelementeditor.h"
#include "ui/elementpropertieseditorwidget.h" #include "ui/elementpropertieseditorwidget.h"

11
sources/editor/esevent/eseventaddarc.cpp
View File

@ -15,13 +15,14 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QObject>
#include "elementscene.h"
#include "partarc.h"
#include "editorcommands.h"
#include "eseventaddarc.h" #include "eseventaddarc.h"
#include "../editorcommands.h"
#include "../elementscene.h"
#include "../graphicspart/partarc.h"
#include <QObject>
/** /**
@brief ESEventAddArc::ESEventAddArc @brief ESEventAddArc::ESEventAddArc
@param scene @param scene

7
sources/editor/esevent/eseventadddynamictextfield.cpp
View File

@ -16,9 +16,10 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "eseventadddynamictextfield.h" #include "eseventadddynamictextfield.h"
#include "elementscene.h"
#include "editorcommands.h" #include "../editorcommands.h"
#include "partdynamictextfield.h" #include "../elementscene.h"
#include "../graphicspart/partdynamictextfield.h"
#include <QUndoStack> #include <QUndoStack>

11
sources/editor/esevent/eseventaddellipse.cpp
View File

@ -15,12 +15,13 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QObject>
#include "eseventaddellipse.h" #include "eseventaddellipse.h"
#include "partellipse.h"
#include "editorcommands.h" #include "../editorcommands.h"
#include "elementscene.h" #include "../elementscene.h"
#include "../graphicspart/partellipse.h"
#include <QObject>
/** /**
@brief ESEventAddEllipse::ESEventAddEllipse @brief ESEventAddEllipse::ESEventAddEllipse

13
sources/editor/esevent/eseventaddline.cpp
View File

@ -15,15 +15,16 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "eseventaddline.h"
#include "../editorcommands.h"
#include "../elementscene.h"
#include "../graphicspart/partline.h"
#include "../qetelementeditor.h"
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
#include <QObject> #include <QObject>
#include "eseventaddline.h"
#include "elementscene.h"
#include "qetelementeditor.h"
#include "partline.h"
#include "editorcommands.h"
/** /**
@brief ESEventAddLine::ESEventAddLine @brief ESEventAddLine::ESEventAddLine
Constructor Constructor

11
sources/editor/esevent/eseventaddpolygon.cpp
View File

@ -15,12 +15,13 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QObject>
#include "eseventaddpolygon.h" #include "eseventaddpolygon.h"
#include "elementscene.h"
#include "partpolygon.h" #include "../editorcommands.h"
#include "editorcommands.h" #include "../elementscene.h"
#include "../graphicspart/partpolygon.h"
#include <QObject>
/** /**
@brief ESEventAddPolygon::ESEventAddPolygon @brief ESEventAddPolygon::ESEventAddPolygon

11
sources/editor/esevent/eseventaddrect.cpp
View File

@ -15,12 +15,13 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QObject>
#include "eseventaddrect.h" #include "eseventaddrect.h"
#include "elementscene.h"
#include "partrectangle.h" #include "../editorcommands.h"
#include "editorcommands.h" #include "../elementscene.h"
#include "../graphicspart/partrectangle.h"
#include <QObject>
/** /**
@brief ESEventAddRect::ESEventAddRect @brief ESEventAddRect::ESEventAddRect

11
sources/editor/esevent/eseventaddterminal.cpp
View File

@ -15,13 +15,14 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QObject>
#include "partterminal.h"
#include "editorcommands.h"
#include "elementscene.h"
#include "eseventaddterminal.h" #include "eseventaddterminal.h"
#include "../editorcommands.h"
#include "../elementscene.h"
#include "../graphicspart/partterminal.h"
#include <QObject>
/** /**
@brief ESEventAddTerminal::ESEventAddTerminal @brief ESEventAddTerminal::ESEventAddTerminal
@param scene @param scene

11
sources/editor/esevent/eseventaddtext.cpp
View File

@ -15,12 +15,13 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <QObject>
#include "eseventaddtext.h" #include "eseventaddtext.h"
#include "parttext.h"
#include "editorcommands.h" #include "../editorcommands.h"
#include "elementscene.h" #include "../elementscene.h"
#include "../graphicspart/parttext.h"
#include <QObject>
/** /**
@brief ESEventAddText::ESEventAddText @brief ESEventAddText::ESEventAddText

6
sources/editor/esevent/eseventinterface.cpp
View File

@ -16,8 +16,10 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "eseventinterface.h" #include "eseventinterface.h"
#include "elementscene.h"
#include "qetelementeditor.h" #include "../elementscene.h"
#include "../qetelementeditor.h"
#include <QGraphicsSceneMouseEvent> #include <QGraphicsSceneMouseEvent>
ESEventInterface::ESEventInterface(ElementScene *scene) : ESEventInterface::ESEventInterface(ElementScene *scene) :

4
sources/editor/graphicspart/customelementgraphicpart.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "customelementgraphicpart.h" #include "customelementgraphicpart.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "elementscene.h" #include "../elementscene.h"
#include <QRegularExpression> #include <QRegularExpression>

3
sources/editor/graphicspart/customelementpart.cpp
View File

@ -16,7 +16,8 @@
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>. along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "customelementpart.h" #include "customelementpart.h"
#include "qetelementeditor.h"
#include "../qetelementeditor.h"
/// @return le QETElementEditor auquel cet editeur appartient /// @return le QETElementEditor auquel cet editeur appartient
QETElementEditor *CustomElementPart::elementEditor() const QETElementEditor *CustomElementPart::elementEditor() const

2
sources/editor/graphicspart/customelementpart.h
View File

@ -18,7 +18,7 @@
#ifndef CUSTOM_ELEMENT_PART_H #ifndef CUSTOM_ELEMENT_PART_H
#define CUSTOM_ELEMENT_PART_H #define CUSTOM_ELEMENT_PART_H
#include "../qet.h" #include "../../qet.h"
class CustomElement; class CustomElement;
class ElementPrimitiveDecorator; class ElementPrimitiveDecorator;

8
sources/editor/graphicspart/partarc.cpp
View File

@ -17,10 +17,10 @@
*/ */
#include "partarc.h" #include "partarc.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
#include "elementscene.h" #include "../elementscene.h"
/** /**
@brief PartArc::PartArc @brief PartArc::PartArc

6
sources/editor/graphicspart/partdynamictextfield.cpp
View File

@ -17,9 +17,9 @@
*/ */
#include "partdynamictextfield.h" #include "partdynamictextfield.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../qetapp.h" #include "../../qetapp.h"
#include "elementscene.h" #include "../elementscene.h"
#include <QColor> #include <QColor>
#include <QFont> #include <QFont>

8
sources/editor/graphicspart/partellipse.cpp
View File

@ -17,10 +17,10 @@
*/ */
#include "partellipse.h" #include "partellipse.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
#include "elementscene.h" #include "../elementscene.h"
/** /**
@brief PartEllipse::PartEllipse @brief PartEllipse::PartEllipse

6
sources/editor/graphicspart/partline.cpp
View File

@ -17,9 +17,9 @@
*/ */
#include "partline.h" #include "partline.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
#include "elementscene.h" #include "../elementscene.h"
#include <cmath> #include <cmath>

2
sources/editor/graphicspart/partline.h
View File

@ -18,7 +18,7 @@
#ifndef PART_LINE_H #ifndef PART_LINE_H
#define PART_LINE_H #define PART_LINE_H
#include "../qet.h" #include "../../qet.h"
#include "customelementgraphicpart.h" #include "customelementgraphicpart.h"
class QPropertyUndoCommand; class QPropertyUndoCommand;

12
sources/editor/graphicspart/partpolygon.cpp
View File

@ -17,12 +17,12 @@
*/ */
#include "partpolygon.h" #include "partpolygon.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
#include "../qeticons.h" #include "../../qeticons.h"
#include "elementscene.h" #include "../elementscene.h"
#include "qetelementeditor.h" #include "../qetelementeditor.h"
/** /**
@brief PartPolygon::PartPolygon @brief PartPolygon::PartPolygon

8
sources/editor/graphicspart/partrectangle.cpp
View File

@ -17,10 +17,10 @@
*/ */
#include "partrectangle.h" #include "partrectangle.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../QetGraphicsItemModeler/qetgraphicshandleritem.h" #include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
#include "../QetGraphicsItemModeler/qetgraphicshandlerutility.h" #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
#include "elementscene.h" #include "../elementscene.h"
/** /**
@brief PartRectangle::PartRectangle @brief PartRectangle::PartRectangle

2
sources/editor/graphicspart/partterminal.cpp
View File

@ -17,7 +17,7 @@
*/ */
#include "partterminal.h" #include "partterminal.h"
#include "../qetgraphicsitem/terminal.h" #include "../../qetgraphicsitem/terminal.h"
/** /**
@brief PartTerminal::PartTerminal @brief PartTerminal::PartTerminal

4
sources/editor/graphicspart/partterminal.h
View File

@ -18,10 +18,10 @@
#ifndef PART_TERMINAL_H #ifndef PART_TERMINAL_H
#define PART_TERMINAL_H #define PART_TERMINAL_H
#include "../../properties/terminaldata.h"
#include "customelementgraphicpart.h" #include "customelementgraphicpart.h"
#include "QUuid"
#include "terminaldata.h"
#include <QUuid>
/** /**
This class represents a terminal which may be used to compose the drawing of This class represents a terminal which may be used to compose the drawing of

10
sources/editor/graphicspart/parttext.cpp
View File

@ -17,11 +17,11 @@
*/ */
#include "parttext.h" #include "parttext.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../qetapp.h" #include "../../qetapp.h"
#include "elementprimitivedecorator.h" #include "../elementprimitivedecorator.h"
#include "elementscene.h" #include "../elementscene.h"
#include "texteditor.h" #include "../ui/texteditor.h"
/** /**
Constructeur Constructeur

2
sources/editor/graphicspart/parttext.h
View File

@ -17,7 +17,7 @@
*/ */
#ifndef PART_TEXT_H #ifndef PART_TEXT_H
#define PART_TEXT_H #define PART_TEXT_H
#include "../qetapp.h" #include "../../qetapp.h"
#include "customelementpart.h" #include "customelementpart.h"
#include <QtWidgets> #include <QtWidgets>

2
sources/editor/qetelementeditor.cpp
View File

@ -17,6 +17,7 @@
*/ */
#include "qetelementeditor.h" #include "qetelementeditor.h"
#include "../editor/graphicspart/customelementpart.h"
#include "../elementdialog.h" #include "../elementdialog.h"
#include "../newelementwizard.h" #include "../newelementwizard.h"
#include "../qet.h" #include "../qet.h"
@ -24,7 +25,6 @@
#include "../qeticons.h" #include "../qeticons.h"
#include "../qetmessagebox.h" #include "../qetmessagebox.h"
#include "../recentfiles.h" #include "../recentfiles.h"
#include "customelementpart.h"
#include "editorcommands.h" #include "editorcommands.h"
#include "elementitemeditor.h" #include "elementitemeditor.h"
#include "elementscene.h" #include "elementscene.h"

2
sources/editor/styleeditor.cpp
View File

@ -18,8 +18,8 @@
#include "styleeditor.h" #include "styleeditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../editor/graphicspart/customelementgraphicpart.h"
#include "../qeticons.h" #include "../qeticons.h"
#include "customelementgraphicpart.h"
#include <QCheckBox> #include <QCheckBox>
#include <QComboBox> #include <QComboBox>

2
sources/editor/terminaleditor.cpp
View File

@ -18,8 +18,8 @@
#include "terminaleditor.h" #include "terminaleditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../editor/graphicspart/partterminal.h"
#include "../qeticons.h" #include "../qeticons.h"
#include "partterminal.h"
#include <QComboBox> #include <QComboBox>
#include <QDoubleSpinBox> #include <QDoubleSpinBox>

10
sources/editor/ui/dynamictextfieldeditor.cpp
View File

@ -17,14 +17,14 @@
*/ */
#include "dynamictextfieldeditor.h" #include "dynamictextfieldeditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../qetapp.h" #include "../../editor/graphicspart/customelementpart.h"
#include "../qetinformation.h" #include "../../qetapp.h"
#include "../../qetinformation.h"
#include "../qetelementeditor.h"
#include "alignmenttextdialog.h" #include "alignmenttextdialog.h"
#include "compositetexteditdialog.h" #include "compositetexteditdialog.h"
#include "customelementpart.h"
#include "partdynamictextfield.h" #include "partdynamictextfield.h"
#include "qetelementeditor.h"
#include "ui_dynamictextfieldeditor.h" #include "ui_dynamictextfieldeditor.h"
#include <QColorDialog> #include <QColorDialog>

4
sources/editor/ui/dynamictextfieldeditor.h
View File

@ -18,8 +18,8 @@
#ifndef DYNAMICTEXTFIELDEDITOR_H #ifndef DYNAMICTEXTFIELDEDITOR_H
#define DYNAMICTEXTFIELDEDITOR_H #define DYNAMICTEXTFIELDEDITOR_H
#include "elementitemeditor.h" #include "../elementitemeditor.h"
#include "partdynamictextfield.h" #include "../graphicspart/partdynamictextfield.h"
namespace Ui { namespace Ui {
class DynamicTextFieldEditor; class DynamicTextFieldEditor;

4
sources/editor/ui/elementpropertieseditorwidget.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "elementpropertieseditorwidget.h" #include "elementpropertieseditorwidget.h"
#include "../qetapp.h" #include "../../qetapp.h"
#include "../qetinformation.h" #include "../../qetinformation.h"
#include "ui_elementpropertieseditorwidget.h" #include "ui_elementpropertieseditorwidget.h"
#include <QItemDelegate> #include <QItemDelegate>

2
sources/editor/ui/elementpropertieseditorwidget.h
View File

@ -18,7 +18,7 @@
#ifndef ELEMENTPROPERTIESEDITORWIDGET_H #ifndef ELEMENTPROPERTIESEDITORWIDGET_H
#define ELEMENTPROPERTIESEDITORWIDGET_H #define ELEMENTPROPERTIESEDITORWIDGET_H
#include "../diagramcontext.h" #include "../../diagramcontext.h"
#include <QAbstractButton> #include <QAbstractButton>
#include <QDialog> #include <QDialog>

8
sources/editor/ui/ellipseeditor.cpp
View File

@ -17,10 +17,10 @@
*/ */
#include "ellipseeditor.h" #include "ellipseeditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "elementscene.h" #include "../elementscene.h"
#include "partellipse.h" #include "../graphicspart/partellipse.h"
#include "styleeditor.h" #include "../styleeditor.h"
#include "ui_ellipseeditor.h" #include "ui_ellipseeditor.h"
/** /**

2
sources/editor/ui/ellipseeditor.h
View File

@ -18,7 +18,7 @@
#ifndef ELLIPSEEDITOR_H #ifndef ELLIPSEEDITOR_H
#define ELLIPSEEDITOR_H #define ELLIPSEEDITOR_H
#include "elementitemeditor.h" #include "../elementitemeditor.h"
namespace Ui { namespace Ui {
class EllipseEditor; class EllipseEditor;

6
sources/editor/ui/lineeditor.cpp
View File

@ -17,9 +17,9 @@
*/ */
#include "lineeditor.h" #include "lineeditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../qeticons.h" #include "../../qeticons.h"
#include "elementitemeditor.h" #include "../elementitemeditor.h"
#include "elementscene.h" #include "elementscene.h"
#include "partline.h" #include "partline.h"
#include "styleeditor.h" #include "styleeditor.h"

2
sources/editor/ui/lineeditor.h
View File

@ -18,7 +18,7 @@
#ifndef LINEEDITOR_H #ifndef LINEEDITOR_H
#define LINEEDITOR_H #define LINEEDITOR_H
#include "elementitemeditor.h" #include "../elementitemeditor.h"
namespace Ui { namespace Ui {
class LineEditor; class LineEditor;

10
sources/editor/ui/polygoneditor.cpp
View File

@ -17,11 +17,11 @@
*/ */
#include "polygoneditor.h" #include "polygoneditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../qetmessagebox.h" #include "../../qetmessagebox.h"
#include "elementscene.h" #include "../elementscene.h"
#include "partpolygon.h" #include "../graphicspart/partpolygon.h"
#include "styleeditor.h" #include "../styleeditor.h"
#include "ui_polygoneditor.h" #include "ui_polygoneditor.h"
/** /**

2
sources/editor/ui/polygoneditor.h
View File

@ -18,7 +18,7 @@
#ifndef POLYGONEDITOR_H #ifndef POLYGONEDITOR_H
#define POLYGONEDITOR_H #define POLYGONEDITOR_H
#include "elementitemeditor.h" #include "../elementitemeditor.h"
class StyleEditor; class StyleEditor;
class PartPolygon; class PartPolygon;

10
sources/editor/ui/rectangleeditor.cpp
View File

@ -17,11 +17,11 @@
*/ */
#include "rectangleeditor.h" #include "rectangleeditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "../qeticons.h" #include "../../qeticons.h"
#include "elementscene.h" #include "../elementscene.h"
#include "partrectangle.h" #include "../graphicspart/partrectangle.h"
#include "styleeditor.h" #include "../styleeditor.h"
#include "ui_rectangleeditor.h" #include "ui_rectangleeditor.h"
/** /**

3
sources/editor/ui/rectangleeditor.h
View File

@ -18,7 +18,8 @@
#ifndef RECTANGLEEDITOR_H #ifndef RECTANGLEEDITOR_H
#define RECTANGLEEDITOR_H #define RECTANGLEEDITOR_H
#include "elementitemeditor.h" #include "../elementitemeditor.h"
#include <QWidget> #include <QWidget>
class StyleEditor; class StyleEditor;

4
sources/editor/ui/texteditor.cpp
View File

@ -17,8 +17,8 @@
*/ */
#include "texteditor.h" #include "texteditor.h"
#include "../QPropertyUndoCommand/qpropertyundocommand.h" #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
#include "parttext.h" #include "../graphicspart/parttext.h"
#include "ui_texteditor.h" #include "ui_texteditor.h"
#include <cassert> #include <cassert>

4
sources/editor/ui/texteditor.h
View File

@ -18,10 +18,10 @@
#ifndef TEXTEDITOR_H #ifndef TEXTEDITOR_H
#define TEXTEDITOR_H #define TEXTEDITOR_H
#include "elementitemeditor.h" #include "../elementitemeditor.h"
#include <QWidget>
#include <QPointer> #include <QPointer>
#include <QWidget>
class PartText; class PartText;

164
sources/projectconfigpages.cpp
View File

@ -30,7 +30,8 @@
#include "ui/reportpropertiewidget.h" #include "ui/reportpropertiewidget.h"
#include "ui/titleblockpropertieswidget.h" #include "ui/titleblockpropertieswidget.h"
#include "ui/xrefpropertieswidget.h" #include "ui/xrefpropertieswidget.h"
#include "ui_autonumberingmanagementw.h"
//#include "ui_autonumberingmanagementw.h"
#include <QtWidgets> #include <QtWidgets>
@ -530,93 +531,94 @@ void ProjectAutoNumConfigPage::applyAutoNum()
*/ */
void ProjectAutoNumConfigPage::applyManagement() void ProjectAutoNumConfigPage::applyManagement()
{ {
int from; // int from;
int to; // int to;
//Apply to Entire Project // //Apply to Entire Project
if (m_amw->ui->m_apply_project_rb->isChecked()) { // if (m_amw->ui->m_apply_project_rb->isChecked()) {
from = 0; // from = 0;
to = project()->diagrams().size() - 1; // to = project()->diagrams().size() - 1;
} // }
//Apply to selected Folios // //Apply to selected Folios
else { // else {
from = m_amw->ui->m_from_folios_cb->itemData(m_amw->ui->m_from_folios_cb->currentIndex()).toInt(); // from =
to = m_amw->ui->m_to_folios_cb->itemData(m_amw->ui->m_to_folios_cb->currentIndex()).toInt(); //m_amw->ui->m_from_folios_cb->itemData(m_amw->ui->m_from_folios_cb->currentIndex()).toInt();
} // to =
//m_amw->ui->m_to_folios_cb->itemData(m_amw->ui->m_to_folios_cb->currentIndex()).toInt();
// }
//Conductor Autonumbering Update Policy // //Conductor Autonumbering Update Policy
//Allow Both Existent and New Conductors // //Allow Both Existent and New Conductors
if (m_amw->ui->m_both_conductor_rb->isChecked()) { // if (m_amw->ui->m_both_conductor_rb->isChecked()) {
//Unfreeze Existent and New Conductors // //Unfreeze Existent and New Conductors
project()->freezeExistentConductorLabel(false, from,to); // project()->freezeExistentConductorLabel(false, from,to);
project()->freezeNewConductorLabel(false, from,to); // project()->freezeNewConductorLabel(false, from,to);
project()->setFreezeNewConductors(false); // project()->setFreezeNewConductors(false);
} // }
//Allow Only New // //Allow Only New
else if (m_amw->ui->m_new_conductor_rb->isChecked()) { // else if (m_amw->ui->m_new_conductor_rb->isChecked()) {
//Freeze Existent and Unfreeze New Conductors // //Freeze Existent and Unfreeze New Conductors
project()->freezeExistentConductorLabel(true, from,to); // project()->freezeExistentConductorLabel(true, from,to);
project()->freezeNewConductorLabel(false, from,to); // project()->freezeNewConductorLabel(false, from,to);
project()->setFreezeNewConductors(false); // project()->setFreezeNewConductors(false);
} // }
//Allow Only Existent // //Allow Only Existent
else if (m_amw->ui->m_existent_conductor_rb->isChecked()) { // else if (m_amw->ui->m_existent_conductor_rb->isChecked()) {
//Freeze Existent and Unfreeze New Conductors // //Freeze Existent and Unfreeze New Conductors
project()->freezeExistentConductorLabel(false, from,to); // project()->freezeExistentConductorLabel(false, from,to);
project()->freezeNewConductorLabel(true, from,to); // project()->freezeNewConductorLabel(true, from,to);
project()->setFreezeNewConductors(true); // project()->setFreezeNewConductors(true);
} // }
//Disable // //Disable
else if (m_amw->ui->m_disable_conductor_rb->isChecked()) { // else if (m_amw->ui->m_disable_conductor_rb->isChecked()) {
//Freeze Existent and New Elements, Set Freeze Element Project Wide // //Freeze Existent and New Elements, Set Freeze Element Project Wide
project()->freezeExistentConductorLabel(true, from,to); // project()->freezeExistentConductorLabel(true, from,to);
project()->freezeNewConductorLabel(true, from,to); // project()->freezeNewConductorLabel(true, from,to);
project()->setFreezeNewConductors(true); // project()->setFreezeNewConductors(true);
} // }
//Element Autonumbering Update Policy // //Element Autonumbering Update Policy
//Allow Both Existent and New Elements // //Allow Both Existent and New Elements
if (m_amw->ui->m_both_element_rb->isChecked()) { // if (m_amw->ui->m_both_element_rb->isChecked()) {
//Unfreeze Existent and New Elements // //Unfreeze Existent and New Elements
project()->freezeExistentElementLabel(false, from,to); // project()->freezeExistentElementLabel(false, from,to);
project()->freezeNewElementLabel(false, from,to); // project()->freezeNewElementLabel(false, from,to);
project()->setFreezeNewElements(false); // project()->setFreezeNewElements(false);
} // }
//Allow Only New // //Allow Only New
else if (m_amw->ui->m_new_element_rb->isChecked()) { // else if (m_amw->ui->m_new_element_rb->isChecked()) {
//Freeze Existent and Unfreeze New Elements // //Freeze Existent and Unfreeze New Elements
project()->freezeExistentElementLabel(true, from,to); // project()->freezeExistentElementLabel(true, from,to);
project()->freezeNewElementLabel(false, from,to); // project()->freezeNewElementLabel(false, from,to);
project()->setFreezeNewElements(false); // project()->setFreezeNewElements(false);
} // }
//Allow Only Existent // //Allow Only Existent
else if (m_amw->ui->m_existent_element_rb->isChecked()) { // else if (m_amw->ui->m_existent_element_rb->isChecked()) {
//Freeze New and Unfreeze Existent Elements, Set Freeze Element Project Wide // //Freeze New and Unfreeze Existent Elements, Set Freeze Element
project()->freezeExistentElementLabel(false, from,to); //Project Wide project()->freezeExistentElementLabel(false, from,to);
project()->freezeNewElementLabel(true, from,to); // project()->freezeNewElementLabel(true, from,to);
project()->setFreezeNewElements(true); // project()->setFreezeNewElements(true);
} // }
//Disable // //Disable
else if (m_amw->ui->m_disable_element_rb->isChecked()) { // else if (m_amw->ui->m_disable_element_rb->isChecked()) {
//Freeze Existent and New Elements, Set Freeze Element Project Wide // //Freeze Existent and New Elements, Set Freeze Element Project Wide
project()->freezeExistentElementLabel(true, from,to); // project()->freezeExistentElementLabel(true, from,to);
project()->freezeNewElementLabel(true, from,to); // project()->freezeNewElementLabel(true, from,to);
project()->setFreezeNewElements(true); // project()->setFreezeNewElements(true);
} // }
//Folio Autonumbering Status // //Folio Autonumbering Status
if (m_amw->ui->m_both_folio_rb->isChecked()) { // if (m_amw->ui->m_both_folio_rb->isChecked()) {
} // }
else if (m_amw->ui->m_new_folio_rb->isChecked()) { // else if (m_amw->ui->m_new_folio_rb->isChecked()) {
} // }
else if (m_amw->ui->m_existent_folio_rb->isChecked()) { // else if (m_amw->ui->m_existent_folio_rb->isChecked()) {
} // }
else if (m_amw->ui->m_disable_folio_rb->isChecked()) { // else if (m_amw->ui->m_disable_folio_rb->isChecked()) {
}
// }
} }
/** /**

2
sources/projectview.cpp
View File

@ -27,7 +27,7 @@
#include "qeticons.h" #include "qeticons.h"
#include "qetmessagebox.h" #include "qetmessagebox.h"
#include "qetproject.h" #include "qetproject.h"
#include "qettemplateeditor.h" #include "titleblock/qettemplateeditor.h"
#include "ui/borderpropertieswidget.h" #include "ui/borderpropertieswidget.h"
#include "ui/conductorpropertieswidget.h" #include "ui/conductorpropertieswidget.h"
#include "ui/dialogwaiting.h" #include "ui/dialogwaiting.h"

6
sources/qetapp.cpp
View File

@ -17,24 +17,24 @@
*/ */
#include "qetapp.h" #include "qetapp.h"
#include "aboutqetdialog.h"
#include "configdialog.h" #include "configdialog.h"
#include "configpages.h" #include "configpages.h"
#include "editor/qetelementeditor.h" #include "editor/qetelementeditor.h"
#include "elementscollectioncache.h" #include "elementscollectioncache.h"
#include "factory/elementfactory.h" #include "factory/elementfactory.h"
#include "factory/elementpicturefactory.h" #include "factory/elementpicturefactory.h"
#include "generalconfigurationpage.h"
#include "projectview.h" #include "projectview.h"
#include "qetdiagrameditor.h" #include "qetdiagrameditor.h"
#include "qeticons.h" #include "qeticons.h"
#include "qetmessagebox.h" #include "qetmessagebox.h"
#include "qetproject.h" #include "qetproject.h"
#include "qettemplateeditor.h"
#include "qtextorientationspinboxwidget.h" #include "qtextorientationspinboxwidget.h"
#include "recentfiles.h" #include "recentfiles.h"
#include "titleblock/qettemplateeditor.h"
#include "titleblock/templatescollection.h" #include "titleblock/templatescollection.h"
#include "titleblocktemplate.h" #include "titleblocktemplate.h"
#include "ui/aboutqetdialog.h"
#include "ui/configpage/generalconfigurationpage.h"
#include <cstdlib> #include <cstdlib>
#include <iostream> #include <iostream>

14
sources/qetdiagrameditor.cpp
View File

@ -17,20 +17,18 @@
*/ */
#include "qetdiagrameditor.h" #include "qetdiagrameditor.h"
#include "ElementsCollection/elementscollectionwidget.h"
#include "QWidgetAnimation/qwidgetanimation.h" #include "QWidgetAnimation/qwidgetanimation.h"
#include "autoNum/ui/autonumberingdockwidget.h" #include "autoNum/ui/autonumberingdockwidget.h"
#include "conductornumexport.h" #include "conductornumexport.h"
#include "diagramcommands.h" #include "diagramcommands.h"
#include "diagrameventaddimage.h" #include "diagramevent/diagrameventaddimage.h"
#include "diagrameventaddshape.h" #include "diagramevent/diagrameventaddshape.h"
#include "diagrameventaddtext.h" #include "diagramevent/diagrameventaddtext.h"
#include "diagrampropertieseditordockwidget.h"
#include "diagramview.h" #include "diagramview.h"
#include "dialogwaiting.h"
#include "elementscollectionwidget.h"
#include "elementspanelwidget.h" #include "elementspanelwidget.h"
#include "factory/qetgraphicstablefactory.h" #include "factory/qetgraphicstablefactory.h"
#include "projectprintwindow.h" #include "print/projectprintwindow.h"
#include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h" #include "qetgraphicsitem/ViewItem/qetgraphicstableitem.h"
#include "qetgraphicsitem/conductortextitem.h" #include "qetgraphicsitem/conductortextitem.h"
#include "qetgraphicsitem/dynamicelementtextitem.h" #include "qetgraphicsitem/dynamicelementtextitem.h"
@ -38,6 +36,8 @@
#include "qetmessagebox.h" #include "qetmessagebox.h"
#include "recentfiles.h" #include "recentfiles.h"
#include "ui/bomexportdialog.h" #include "ui/bomexportdialog.h"
#include "ui/diagrampropertieseditordockwidget.h"
#include "ui/dialogwaiting.h"
#include "undocommand/addelementtextcommand.h" #include "undocommand/addelementtextcommand.h"
#include "undocommand/rotateselectioncommand.h" #include "undocommand/rotateselectioncommand.h"
#include "undocommand/rotatetextscommand.h" #include "undocommand/rotatetextscommand.h"

2
sources/qetgraphicsitem/diagramimageitem.cpp
View File

@ -19,7 +19,7 @@
#include "../PropertiesEditor/propertieseditordialog.h" #include "../PropertiesEditor/propertieseditordialog.h"
#include "../diagram.h" #include "../diagram.h"
#include "imagepropertieswidget.h" #include "../ui/imagepropertieswidget.h"
/** /**
@brief DiagramImageItem::DiagramImageItem @brief DiagramImageItem::DiagramImageItem

2
sources/qetgraphicsitem/qetshapeitem.cpp
View File

@ -26,7 +26,7 @@
#include "../qet.h" #include "../qet.h"
#include "../qeticons.h" #include "../qeticons.h"
#include "../qetxml.h" #include "../qetxml.h"
#include "../shapegraphicsitempropertieswidget.h" #include "../ui/shapegraphicsitempropertieswidget.h"
/** /**
@brief QetShapeItem::QetShapeItem @brief QetShapeItem::QetShapeItem

2
sources/qetgraphicsitem/terminal.cpp
View File

@ -20,10 +20,10 @@
#include "../conductorautonumerotation.h" #include "../conductorautonumerotation.h"
#include "../diagram.h" #include "../diagram.h"
#include "../diagramcommands.h" #include "../diagramcommands.h"
#include "../properties/terminaldata.h"
#include "../qetgraphicsitem/conductor.h" #include "../qetgraphicsitem/conductor.h"
#include "../qetgraphicsitem/element.h" #include "../qetgraphicsitem/element.h"
#include "conductortextitem.h" #include "conductortextitem.h"
#include "terminaldata.h"
#include <utility> #include <utility>

2
sources/ui/configpage/generalconfigurationpage.h
View File

@ -18,7 +18,7 @@
#ifndef GENERALCONFIGURATIONPAGE_H #ifndef GENERALCONFIGURATIONPAGE_H
#define GENERALCONFIGURATIONPAGE_H #define GENERALCONFIGURATIONPAGE_H
#include "../configpage.h" #include "../../configpage.h"
#include <QWidget> #include <QWidget>