mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 20:50:34 +01:00
Improvement: Use anticipate class declaration instead of include header
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@3224 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
@@ -19,6 +19,7 @@
|
|||||||
#include "conductorautonumerotationwidget.h"
|
#include "conductorautonumerotationwidget.h"
|
||||||
#include "diagramcommands.h"
|
#include "diagramcommands.h"
|
||||||
#include "numerotationcontextcommands.h"
|
#include "numerotationcontextcommands.h"
|
||||||
|
#include "qetdiagrameditor.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*Constructor
|
*Constructor
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
#include "conductorprofile.h"
|
#include "conductorprofile.h"
|
||||||
#include "qetgraphicsitem/conductor.h"
|
#include "qetgraphicsitem/conductor.h"
|
||||||
#include "conductorsegmentprofile.h"
|
#include "conductorsegmentprofile.h"
|
||||||
|
#include "terminal.h"
|
||||||
|
|
||||||
/// Constructeur
|
/// Constructeur
|
||||||
ConductorProfile::ConductorProfile() {
|
ConductorProfile::ConductorProfile() {
|
||||||
|
|||||||
@@ -33,6 +33,7 @@
|
|||||||
#include "qetapp.h"
|
#include "qetapp.h"
|
||||||
#include "qetgraphicsitem/diagramimageitem.h"
|
#include "qetgraphicsitem/diagramimageitem.h"
|
||||||
#include "qetgraphicsitem/qetshapeitem.h"
|
#include "qetgraphicsitem/qetshapeitem.h"
|
||||||
|
#include "terminal.h"
|
||||||
|
|
||||||
const int Diagram::xGrid = 10;
|
const int Diagram::xGrid = 10;
|
||||||
const int Diagram::yGrid = 10;
|
const int Diagram::yGrid = 10;
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
#include "titleblockproperties.h"
|
#include "titleblockproperties.h"
|
||||||
#include "qet.h"
|
#include "qet.h"
|
||||||
#include "qetgraphicsitem/qetshapeitem.h"
|
#include "qetgraphicsitem/qetshapeitem.h"
|
||||||
|
#include "conductorprofile.h"
|
||||||
class Diagram;
|
class Diagram;
|
||||||
class DiagramTextItem;
|
class DiagramTextItem;
|
||||||
class Element;
|
class Element;
|
||||||
|
|||||||
@@ -20,6 +20,8 @@
|
|||||||
#include "elementscategory.h"
|
#include "elementscategory.h"
|
||||||
#include "elementdefinition.h"
|
#include "elementdefinition.h"
|
||||||
#include "factory/elementfactory.h"
|
#include "factory/elementfactory.h"
|
||||||
|
#include "element.h"
|
||||||
|
#include <QImageWriter>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Construct a cache for elements collections.
|
Construct a cache for elements collections.
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
#include "qeticons.h"
|
#include "qeticons.h"
|
||||||
#include "templatescollection.h"
|
#include "templatescollection.h"
|
||||||
#include "treecoloranimation.h"
|
#include "treecoloranimation.h"
|
||||||
|
#include "element.h"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Lorsque le flag ENABLE_PANEL_DND_CHECKS est defini, le panel d'elements
|
Lorsque le flag ENABLE_PANEL_DND_CHECKS est defini, le panel d'elements
|
||||||
|
|||||||
@@ -19,7 +19,10 @@
|
|||||||
#define ELEMENTFACTORY_H
|
#define ELEMENTFACTORY_H
|
||||||
|
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
#include "qetgraphicsitem/element.h"
|
class Element;
|
||||||
|
class ElementsLocation;
|
||||||
|
class QGraphicsItem;
|
||||||
|
class Diagram;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The ElementFactory class
|
* @brief The ElementFactory class
|
||||||
|
|||||||
@@ -24,6 +24,8 @@
|
|||||||
#include "diagram.h"
|
#include "diagram.h"
|
||||||
#include "diagramcommands.h"
|
#include "diagramcommands.h"
|
||||||
#include "conductorautonumerotation.h"
|
#include "conductorautonumerotation.h"
|
||||||
|
#include "qetdiagrameditor.h"
|
||||||
|
#include "terminal.h"
|
||||||
#define PR(x) qDebug() << #x " = " << x;
|
#define PR(x) qDebug() << #x " = " << x;
|
||||||
|
|
||||||
bool Conductor::pen_and_brush_initialized = false;
|
bool Conductor::pen_and_brush_initialized = false;
|
||||||
|
|||||||
@@ -17,14 +17,17 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef CONDUCTOR_H
|
#ifndef CONDUCTOR_H
|
||||||
#define CONDUCTOR_H
|
#define CONDUCTOR_H
|
||||||
#include <QtGui>
|
|
||||||
#include "terminal.h"
|
|
||||||
#include "conductorprofile.h"
|
|
||||||
#include "conductorproperties.h"
|
#include "conductorproperties.h"
|
||||||
#include "qetdiagrameditor.h"
|
|
||||||
|
class ConductorProfile;
|
||||||
|
class ConductorSegmentProfile;
|
||||||
|
class Diagram;
|
||||||
|
class Terminal;
|
||||||
class ConductorSegment;
|
class ConductorSegment;
|
||||||
class ConductorTextItem;
|
class ConductorTextItem;
|
||||||
class Element;
|
class Element;
|
||||||
|
class QETDiagramEditor;
|
||||||
typedef QPair<QPointF, Qt::Corner> ConductorBend;
|
typedef QPair<QPointF, Qt::Corner> ConductorBend;
|
||||||
typedef QHash<Qt::Corner, ConductorProfile> ConductorProfilesGroup;
|
typedef QHash<Qt::Corner, ConductorProfile> ConductorProfilesGroup;
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
#include "conductortextitem.h"
|
#include "conductortextitem.h"
|
||||||
#include "conductor.h"
|
#include "conductor.h"
|
||||||
#include "diagramcommands.h"
|
#include "diagramcommands.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructeur
|
Constructeur
|
||||||
|
|||||||
@@ -20,6 +20,7 @@
|
|||||||
#include "qetapp.h"
|
#include "qetapp.h"
|
||||||
#include "diagramposition.h"
|
#include "diagramposition.h"
|
||||||
#include "elementtextitem.h"
|
#include "elementtextitem.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
//define the height of the header.
|
//define the height of the header.
|
||||||
#define header 5
|
#define header 5
|
||||||
|
|||||||
@@ -18,9 +18,11 @@
|
|||||||
#ifndef CROSSREFITEM_H
|
#ifndef CROSSREFITEM_H
|
||||||
#define CROSSREFITEM_H
|
#define CROSSREFITEM_H
|
||||||
|
|
||||||
#include "qetgraphicsitem/qetgraphicsitem.h"
|
#include <QGraphicsObject>
|
||||||
#include"properties/xrefproperties.h"
|
#include"properties/xrefproperties.h"
|
||||||
class element;
|
#include <QPicture>
|
||||||
|
|
||||||
|
class Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The CrossRefItem class
|
* @brief The CrossRefItem class
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include "partline.h"
|
#include "partline.h"
|
||||||
#include "elementdefinition.h"
|
#include "elementdefinition.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
#include "terminal.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructeur de la classe CustomElement. Permet d'instancier un element
|
Constructeur de la classe CustomElement. Permet d'instancier un element
|
||||||
|
|||||||
@@ -18,11 +18,13 @@
|
|||||||
#ifndef CUSTOM_ELEMENT_H
|
#ifndef CUSTOM_ELEMENT_H
|
||||||
#define CUSTOM_ELEMENT_H
|
#define CUSTOM_ELEMENT_H
|
||||||
#include "fixedelement.h"
|
#include "fixedelement.h"
|
||||||
#include <QtGui>
|
|
||||||
#include "nameslist.h"
|
#include "nameslist.h"
|
||||||
#include "elementslocation.h"
|
#include "elementslocation.h"
|
||||||
|
#include <QPicture>
|
||||||
|
|
||||||
class ElementTextItem;
|
class ElementTextItem;
|
||||||
class Terminal;
|
class Terminal;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This class represents an electrical element; it may be used like a fixed
|
This class represents an electrical element; it may be used like a fixed
|
||||||
element, the difference being that the CustomElement reads its description
|
element, the difference being that the CustomElement reads its description
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "diagramimageitem.h"
|
#include "diagramimageitem.h"
|
||||||
#include "diagramcommands.h"
|
#include "diagramcommands.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief DiagramImageItem::DiagramImageItem
|
* @brief DiagramImageItem::DiagramImageItem
|
||||||
|
|||||||
@@ -17,9 +17,12 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef DIAGRAM_IMAGE_ITEM_H
|
#ifndef DIAGRAM_IMAGE_ITEM_H
|
||||||
#define DIAGRAM_IMAGE_ITEM_H
|
#define DIAGRAM_IMAGE_ITEM_H
|
||||||
#include <QtGui>
|
|
||||||
#include "qetgraphicsitem.h"
|
#include "qetgraphicsitem.h"
|
||||||
|
|
||||||
|
class QDomElement;
|
||||||
|
class QDomDocument;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This class represents a selectable, movable and editable image on a
|
This class represents a selectable, movable and editable image on a
|
||||||
diagram.
|
diagram.
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
#include "diagramcommands.h"
|
#include "diagramcommands.h"
|
||||||
#include "qet.h"
|
#include "qet.h"
|
||||||
#include "qetapp.h"
|
#include "qetapp.h"
|
||||||
|
|
||||||
#include "richtext/richtexteditor_p.h"
|
#include "richtext/richtexteditor_p.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructeur
|
Constructeur
|
||||||
|
|||||||
@@ -17,8 +17,13 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef DIAGRAM_TEXT_ITEM_H
|
#ifndef DIAGRAM_TEXT_ITEM_H
|
||||||
#define DIAGRAM_TEXT_ITEM_H
|
#define DIAGRAM_TEXT_ITEM_H
|
||||||
#include <QtGui>
|
|
||||||
#include "diagram.h"
|
#include <QGraphicsTextItem>
|
||||||
|
|
||||||
|
class Diagram;
|
||||||
|
class QDomElement;
|
||||||
|
class QDomDocument;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This class represents a selectable, movable and editable text field on a
|
This class represents a selectable, movable and editable text field on a
|
||||||
diagram.
|
diagram.
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
#include <ui/elementpropertieswidget.h>
|
#include <ui/elementpropertieswidget.h>
|
||||||
#include "elementprovider.h"
|
#include "elementprovider.h"
|
||||||
#include "diagramposition.h"
|
#include "diagramposition.h"
|
||||||
|
#include "terminal.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Constructeur pour un element sans scene ni parent
|
Constructeur pour un element sans scene ni parent
|
||||||
|
|||||||
@@ -17,13 +17,16 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef ELEMENT_H
|
#ifndef ELEMENT_H
|
||||||
#define ELEMENT_H
|
#define ELEMENT_H
|
||||||
#include <QtGui>
|
|
||||||
#include "terminal.h"
|
#include "qet.h"
|
||||||
#include "qetgraphicsitem.h"
|
#include "qetgraphicsitem.h"
|
||||||
#include <QUuid>
|
#include "diagramcontext.h"
|
||||||
|
|
||||||
class Diagram;
|
class Diagram;
|
||||||
class ElementTextItem;
|
class ElementTextItem;
|
||||||
|
class QETProject;
|
||||||
|
class Terminal;
|
||||||
|
class Conductor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This is the base class for electrical elements.
|
This is the base class for electrical elements.
|
||||||
|
|||||||
@@ -17,10 +17,12 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef ELEMENT_TEXT_ITEM_H
|
#ifndef ELEMENT_TEXT_ITEM_H
|
||||||
#define ELEMENT_TEXT_ITEM_H
|
#define ELEMENT_TEXT_ITEM_H
|
||||||
|
|
||||||
#include "diagramtextitem.h"
|
#include "diagramtextitem.h"
|
||||||
#include <QtXml>
|
|
||||||
class Diagram;
|
class Diagram;
|
||||||
class Element;
|
class Element;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This class represents a text item attached to an element. Users can change its
|
This class represents a text item attached to an element. Users can change its
|
||||||
value, adjust its position (defined relatively to its parent element), and
|
value, adjust its position (defined relatively to its parent element), and
|
||||||
|
|||||||
@@ -17,8 +17,9 @@
|
|||||||
*/
|
*/
|
||||||
#ifndef INDEPENDENT_TEXT_ITEM_H
|
#ifndef INDEPENDENT_TEXT_ITEM_H
|
||||||
#define INDEPENDENT_TEXT_ITEM_H
|
#define INDEPENDENT_TEXT_ITEM_H
|
||||||
#include <QtGui>
|
|
||||||
#include "diagramtextitem.h"
|
#include "diagramtextitem.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
This class represents an independent text field on a particular diagram.
|
This class represents an independent text field on a particular diagram.
|
||||||
It may be moved, edited, and rotated.
|
It may be moved, edited, and rotated.
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include "masterelement.h"
|
#include "masterelement.h"
|
||||||
|
#include "crossrefitem.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief MasterElement::MasterElement
|
* @brief MasterElement::MasterElement
|
||||||
|
|||||||
@@ -19,7 +19,8 @@
|
|||||||
#define MASTERELEMENT_H
|
#define MASTERELEMENT_H
|
||||||
|
|
||||||
#include "customelement.h"
|
#include "customelement.h"
|
||||||
#include "crossrefitem.h"
|
|
||||||
|
class CrossRefItem;
|
||||||
|
|
||||||
class MasterElement : public CustomElement
|
class MasterElement : public CustomElement
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
along with QElectroTech. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
#include "qetgraphicsitem.h"
|
#include "qetgraphicsitem.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief QetGraphicsItem::QetGraphicsItem Default constructor
|
* @brief QetGraphicsItem::QetGraphicsItem Default constructor
|
||||||
|
|||||||
@@ -18,7 +18,9 @@
|
|||||||
#ifndef QETGRAPHICSITEM_H
|
#ifndef QETGRAPHICSITEM_H
|
||||||
#define QETGRAPHICSITEM_H
|
#define QETGRAPHICSITEM_H
|
||||||
|
|
||||||
#include "diagram.h"
|
#include <QGraphicsObject>
|
||||||
|
|
||||||
|
class Diagram;
|
||||||
|
|
||||||
class QetGraphicsItem : public QGraphicsObject {
|
class QetGraphicsItem : public QGraphicsObject {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
@@ -29,7 +31,7 @@ class QetGraphicsItem : public QGraphicsObject {
|
|||||||
virtual ~QetGraphicsItem() = 0;
|
virtual ~QetGraphicsItem() = 0;
|
||||||
|
|
||||||
//public methode
|
//public methode
|
||||||
Diagram* diagram() const;
|
Diagram * diagram() const;
|
||||||
virtual void setPos(const QPointF &p);
|
virtual void setPos(const QPointF &p);
|
||||||
virtual void setPos(qreal x, qreal y);
|
virtual void setPos(qreal x, qreal y);
|
||||||
virtual void rotateBy(const qreal &);
|
virtual void rotateBy(const qreal &);
|
||||||
|
|||||||
@@ -20,6 +20,9 @@
|
|||||||
|
|
||||||
#include "qetgraphicsitem.h"
|
#include "qetgraphicsitem.h"
|
||||||
|
|
||||||
|
class QDomElement;
|
||||||
|
class QDomDocument;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The QetShapeItem class
|
* @brief The QetShapeItem class
|
||||||
* this class is used to draw a basic shape (line, rectangle, ellipse)
|
* this class is used to draw a basic shape (line, rectangle, ellipse)
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
#include "elementtextitem.h"
|
#include "elementtextitem.h"
|
||||||
#include "diagramposition.h"
|
#include "diagramposition.h"
|
||||||
#include "qetproject.h"
|
#include "qetproject.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
ReportElement::ReportElement(const ElementsLocation &location, QString link_type,QGraphicsItem *qgi, Diagram *s, int *state) :
|
ReportElement::ReportElement(const ElementsLocation &location, QString link_type,QGraphicsItem *qgi, Diagram *s, int *state) :
|
||||||
CustomElement(location, qgi, s, state)
|
CustomElement(location, qgi, s, state)
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
#include "diagramposition.h"
|
#include "diagramposition.h"
|
||||||
#include "qetapp.h"
|
#include "qetapp.h"
|
||||||
#include "elementtextitem.h"
|
#include "elementtextitem.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief SlaveElement::SlaveElement
|
* @brief SlaveElement::SlaveElement
|
||||||
|
|||||||
@@ -19,6 +19,8 @@
|
|||||||
#include "ui_elementselectorwidget.h"
|
#include "ui_elementselectorwidget.h"
|
||||||
#include "diagramposition.h"
|
#include "diagramposition.h"
|
||||||
#include "qeticons.h"
|
#include "qeticons.h"
|
||||||
|
#include "diagram.h"
|
||||||
|
#include "element.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief ElementSelectorWidget::ElementSelectorWidget
|
* @brief ElementSelectorWidget::ElementSelectorWidget
|
||||||
|
|||||||
@@ -19,7 +19,8 @@
|
|||||||
#define ELEMENTSELECTORWIDGET_H
|
#define ELEMENTSELECTORWIDGET_H
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include "qetgraphicsitem/element.h"
|
class Element;
|
||||||
|
class QSignalMapper;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class ElementSelectorWidget;
|
class ElementSelectorWidget;
|
||||||
|
|||||||
@@ -18,9 +18,9 @@
|
|||||||
#include "linksingleelementwidget.h"
|
#include "linksingleelementwidget.h"
|
||||||
#include "ui_linksingleelementwidget.h"
|
#include "ui_linksingleelementwidget.h"
|
||||||
#include "diagram.h"
|
#include "diagram.h"
|
||||||
#include "element.h"
|
|
||||||
#include "elementprovider.h"
|
#include "elementprovider.h"
|
||||||
#include "diagramcommands.h"
|
#include "diagramcommands.h"
|
||||||
|
#include "elementselectorwidget.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief LinkSingleElementWidget::LinkSingleElementWidget
|
* @brief LinkSingleElementWidget::LinkSingleElementWidget
|
||||||
|
|||||||
@@ -19,10 +19,11 @@
|
|||||||
#define LINKSINGLEELEMENTWIDGET_H
|
#define LINKSINGLEELEMENTWIDGET_H
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include "elementselectorwidget.h"
|
#include "element.h"
|
||||||
|
|
||||||
class Element;
|
|
||||||
class Diagram;
|
class Diagram;
|
||||||
|
class QLineEdit;
|
||||||
|
class ElementSelectorWidget;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class LinkSingleElementWidget;
|
class LinkSingleElementWidget;
|
||||||
|
|||||||
@@ -19,7 +19,9 @@
|
|||||||
#define MASTERPROPERTIESWIDGET_H
|
#define MASTERPROPERTIESWIDGET_H
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
#include <qetgraphicsitem/element.h>
|
#include "element.h"
|
||||||
|
|
||||||
|
class QListWidgetItem;
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class MasterPropertiesWidget;
|
class MasterPropertiesWidget;
|
||||||
|
|||||||
Reference in New Issue
Block a user