| [qet] [3471] Element editor : add text is managed by esevent |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3471
Author: blacksun
Date: 2014-11-10 00:11:17 +0100 (Mon, 10 Nov 2014)
Log Message:
-----------
Element editor : add text is managed by esevent
Modified Paths:
--------------
trunk/sources/editor/elementscene.cpp
trunk/sources/editor/elementscene.h
trunk/sources/editor/qetelementeditor.cpp
trunk/sources/editor/qetelementeditor.h
Added Paths:
-----------
trunk/sources/editor/esevent/eseventaddtext.cpp
trunk/sources/editor/esevent/eseventaddtext.h
Modified: trunk/sources/editor/elementscene.cpp
===================================================================
--- trunk/sources/editor/elementscene.cpp 2014-11-09 21:58:46 UTC (rev 3470)
+++ trunk/sources/editor/elementscene.cpp 2014-11-09 23:11:17 UTC (rev 3471)
@@ -72,22 +72,6 @@
}
/**
- Passe la scene en mode "ajout de cercle"
-*/
-void ElementScene::slot_addCircle() {
- behavior = Circle;
- if (m_event_interface) delete m_event_interface; m_event_interface = nullptr;
-}
-
-/**
- Passe la scene en mode "ajout de texte statique"
-*/
-void ElementScene::slot_addText() {
- behavior = Text;
- if (m_event_interface) delete m_event_interface; m_event_interface = nullptr;
-}
-
-/**
Passe la scene en mode "ajout de borne"
*/
void ElementScene::slot_addTerminal() {
@@ -147,8 +131,6 @@
return;
}
}
- QPointF event_pos = e -> scenePos();
- if (mustSnapToGrid(e)) event_pos = snapToGrid(event_pos);
QGraphicsScene::mousePressEvent(e);
}
@@ -173,7 +155,6 @@
if (mustSnapToGrid(e)) event_pos = snapToGrid(event_pos);
PartTerminal *terminal;
- PartText *text;
PartTextField *textfield;
if (behavior == PasteArea) {
@@ -193,13 +174,6 @@
emit(partsAdded());
endCurrentBehavior(e);
break;
- case Text:
- text = new PartText(element_editor, 0, this);
- text -> setPos(event_pos);
- undo_stack.push(new AddPartCommand(tr("texte"), this, text));
- emit(partsAdded());
- endCurrentBehavior(e);
- break;
case TextField:
textfield = new PartTextField(element_editor, 0, this);
textfield -> setPos(event_pos);
Modified: trunk/sources/editor/elementscene.h
===================================================================
--- trunk/sources/editor/elementscene.h 2014-11-09 21:58:46 UTC (rev 3470)
+++ trunk/sources/editor/elementscene.h 2014-11-09 23:11:17 UTC (rev 3471)
@@ -41,7 +41,7 @@
// enum
public:
- enum Behavior { Normal, Circle, Text, Terminal, TextField, PasteArea };
+ enum Behavior { Normal, Terminal, TextField, PasteArea };
enum ItemOption {
SortByZValue = 1,
IncludeTerminals = 2,
@@ -161,8 +161,6 @@
public slots:
void slot_move();
- void slot_addCircle();
- void slot_addText();
void slot_addTerminal();
void slot_addTextField();
void slot_select(const ElementContent &);
Added: trunk/sources/editor/esevent/eseventaddtext.cpp
===================================================================
--- trunk/sources/editor/esevent/eseventaddtext.cpp (rev 0)
+++ trunk/sources/editor/esevent/eseventaddtext.cpp 2014-11-09 23:11:17 UTC (rev 3471)
@@ -0,0 +1,76 @@
+/*
+ Copyright 2006-2014 The QElectroTech Team
+ This file is part of QElectroTech.
+
+ QElectroTech 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 2 of the License, or
+ (at your option) any later version.
+
+ QElectroTech 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 QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+*/
+#include <QObject>
+
+#include "eseventaddtext.h"
+#include "parttext.h"
+#include "editorcommands.h"
+#include "elementscene.h"
+
+/**
+ * @brief ESEventAddText::ESEventAddText
+ * @param scene
+ */
+ESEventAddText::ESEventAddText(ElementScene *scene) :
+ ESEventInterface(scene)
+{
+ m_text = new PartText(m_editor, 0, m_scene);
+ m_running = true;
+}
+
+/**
+ * @brief ESEventAddText::~ESEventAddText
+ */
+ESEventAddText::~ESEventAddText() {
+ delete m_text;
+}
+
+/**
+ * @brief ESEventAddText::mouseMoveEvent
+ * @param event
+ * @return
+ */
+bool ESEventAddText::mouseMoveEvent(QGraphicsSceneMouseEvent *event) {
+ QPointF pos = m_scene -> snapToGrid(event -> scenePos());
+ updateHelpCross(pos);
+ m_text->setPos(pos);
+ return true;
+}
+
+/**
+ * @brief ESEventAddText::mouseReleaseEvent
+ * @param event
+ * @return
+ */
+bool ESEventAddText::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
+ if (event->button() == Qt::LeftButton) {
+ m_scene -> undoStack().push(new AddPartCommand(QObject::tr("Texte"), m_scene, m_text));
+
+ //Set new text
+ m_text = new PartText(m_editor, 0, m_scene);
+ m_text -> setPos(m_scene -> snapToGrid(event -> scenePos()));
+
+ return true;
+ }
+ else if (event->button() == Qt::RightButton) {
+ m_running = false;
+ return true;
+ }
+
+ return false;
+}
Added: trunk/sources/editor/esevent/eseventaddtext.h
===================================================================
--- trunk/sources/editor/esevent/eseventaddtext.h (rev 0)
+++ trunk/sources/editor/esevent/eseventaddtext.h 2014-11-09 23:11:17 UTC (rev 3471)
@@ -0,0 +1,44 @@
+/*
+ Copyright 2006-2014 The QElectroTech Team
+ This file is part of QElectroTech.
+
+ QElectroTech 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 2 of the License, or
+ (at your option) any later version.
+
+ QElectroTech 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 QElectroTech. If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef ESEVENTADDTEXT_H
+#define ESEVENTADDTEXT_H
+
+#include "eseventinterface.h"
+
+class ElementScene;
+class PartText;
+class QGraphicsSceneMouseEvent;
+
+/**
+ * @brief The ESEventAddText class
+ * This ESEvent manage creation of text in an ElementScene
+ */
+class ESEventAddText : public ESEventInterface
+{
+ public:
+ ESEventAddText(ElementScene *scene);
+ virtual ~ESEventAddText();
+
+ virtual bool mouseMoveEvent (QGraphicsSceneMouseEvent *event);
+ virtual bool mouseReleaseEvent (QGraphicsSceneMouseEvent *event);
+
+ private:
+ PartText *m_text;
+};
+
+#endif // ESEVENTADDTEXT_H
Modified: trunk/sources/editor/qetelementeditor.cpp
===================================================================
--- trunk/sources/editor/qetelementeditor.cpp 2014-11-09 21:58:46 UTC (rev 3470)
+++ trunk/sources/editor/qetelementeditor.cpp 2014-11-09 23:11:17 UTC (rev 3471)
@@ -46,6 +46,7 @@
#include "eseventaddellipse.h"
#include "eseventaddpolygon.h"
#include "eseventaddarc.h"
+#include "eseventaddtext.h"
#include <QMessageBox>
/*
@@ -254,7 +255,7 @@
connect(add_rectangle, SIGNAL(triggered()), this, SLOT(addRect()));
connect(add_ellipse, SIGNAL(triggered()), this, SLOT(addEllipse()));
connect(add_polygon, SIGNAL(triggered()), this, SLOT(addPolygon()));
- connect(add_text, SIGNAL(triggered()), ce_scene, SLOT(slot_addText()));
+ connect(add_text, SIGNAL(triggered()), this, SLOT(addText()));
connect(add_arc, SIGNAL(triggered()), this, SLOT(addArc()));
connect(add_terminal, SIGNAL(triggered()), ce_scene, SLOT(slot_addTerminal()));
connect(add_textfield, SIGNAL(triggered()), ce_scene, SLOT(slot_addTextField()));
@@ -967,6 +968,14 @@
}
/**
+ * @brief QETElementEditor::addText
+ * Set text creation interface to scene
+ */
+void QETElementEditor::addText() {
+ ce_scene -> setEventInterface(new ESEventAddText(ce_scene));
+}
+
+/**
Lance l'assistant de creation d'un nouvel element.
*/
void QETElementEditor::slot_new() {
Modified: trunk/sources/editor/qetelementeditor.h
===================================================================
--- trunk/sources/editor/qetelementeditor.h 2014-11-09 21:58:46 UTC (rev 3470)
+++ trunk/sources/editor/qetelementeditor.h 2014-11-09 23:11:17 UTC (rev 3471)
@@ -133,6 +133,7 @@
void addEllipse();
void addPolygon();
void addArc();
+ void addText();
void slot_new();
void slot_open();