diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp index b2e406c23..0ae4a9d39 100644 --- a/sources/diagramview.cpp +++ b/sources/diagramview.cpp @@ -48,11 +48,14 @@ @param diagram Schema a afficher ; si diagram vaut 0, un nouveau Diagram est utilise @param parent Le QWidget parent de cette vue de schema */ -DiagramView::DiagramView(Diagram *diagram, QWidget *parent) : QGraphicsView(parent) { +DiagramView::DiagramView(Diagram *diagram, QWidget *parent) : + QGraphicsView (parent), + scene (diagram), + m_event_interface (nullptr) +{ grabGesture(Qt::PinchGesture); setAttribute(Qt::WA_DeleteOnClose, true); setInteractive(true); - m_event_interface = nullptr; QString whatsthis = tr( "Ceci est la zone dans laquelle vous concevez vos sch\351mas en y ajoutant" @@ -67,7 +70,6 @@ DiagramView::DiagramView(Diagram *diagram, QWidget *parent) : QGraphicsView(pare setRenderHint(QPainter::TextAntialiasing, true); setRenderHint(QPainter::SmoothPixmapTransform, true); - scene = diagram ? diagram : new Diagram(this); setScene(scene); scene -> undoStack().setClean(); setWindowIcon(QET::Icons::QETLogo); diff --git a/sources/diagramview.h b/sources/diagramview.h index cd50905b8..69c111991 100644 --- a/sources/diagramview.h +++ b/sources/diagramview.h @@ -33,28 +33,29 @@ class DVEventInterface; class DiagramView : public QGraphicsView { Q_OBJECT - // constructors, destructor + // constructors, destructor public: - DiagramView(Diagram * = 0, QWidget * = 0); - virtual ~DiagramView(); + DiagramView(Diagram *diagram, QWidget * = 0); + virtual ~DiagramView(); private: - DiagramView(const DiagramView &); - - // attributes - private: - Diagram *scene; - QMenu *context_menu; - QAction *paste_here; - QAction *find_element_; - QPoint paste_here_pos; - bool fresh_focus_in_; ///< Indicate the focus was freshly gained - ElementsLocation next_location_; - QPoint next_position_; - QPointF center_view_; - QPointF rubber_band_origin; - DVEventInterface *m_event_interface; + DiagramView(const DiagramView &); + // attributes + + Diagram *scene; + DVEventInterface *m_event_interface; + QMenu *context_menu; + QAction *paste_here; + QAction *find_element_; + QPoint paste_here_pos; + QPoint next_position_; + QPointF center_view_; + QPointF rubber_band_origin; + bool fresh_focus_in_; ///< Indicate the focus was freshly gained + ElementsLocation next_location_; + + // methods public: QString title() const;