Add initial support of texts group

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5117 bfdf4180-ca20-0410-9c96-a3a8aa849046
2025-12-17 20:50:34 +01:00 · 2017-11-27 19:37:39 +00:00
parent d31d360340
commit 2bf4e330f4
18 changed files with 1266 additions and 87 deletions
--- a/sources/ui/dynamicelementtextitemeditor.cpp
+++ b/sources/ui/dynamicelementtextitemeditor.cpp
@@ -24,6 +24,8 @@
 #include "undocommand/deleteqgraphicsitemcommand.h"
 #include "undocommand/addelementtextcommand.h"
 #include "QPropertyUndoCommand/qpropertyundocommand.h"
+#include "elementtextitemgroup.h"
+#include "deleteqgraphicsitemcommand.h"

 #include <QTreeView>
 #include <QUndoCommand>
@@ -33,12 +35,17 @@ DynamicElementTextItemEditor::DynamicElementTextItemEditor(Element *element, QWi
    ui(new Ui::DynamicElementTextItemEditor)
 {
    ui->setupUi(this);
+	
    m_tree_view = new QTreeView(this);
    m_tree_view->header()->setDefaultSectionSize(150);
    m_tree_view->setItemDelegate(new DynamicTextItemDelegate(m_tree_view));
 	m_tree_view->setAlternatingRowColors(true);
 	m_tree_view->setEditTriggers(QAbstractItemView::CurrentChanged);
+	m_tree_view->installEventFilter(this);
    ui->verticalLayout->addWidget(m_tree_view);
+	
+	setUpAction();
+	
    setElement(element);
 }

@@ -55,12 +62,8 @@ void DynamicElementTextItemEditor::setElement(Element *element)
     m_element = element;
    
    DynamicElementTextModel *old_model = m_model;
-    m_model = new DynamicElementTextModel(m_tree_view);
+    m_model = new DynamicElementTextModel(element, m_tree_view);
 	connect(m_model, &DynamicElementTextModel::dataForTextChanged, this, &DynamicElementTextItemEditor::dataEdited);
-    
-    for (DynamicElementTextItem *deti : m_element->dynamicTextItems())
-        m_model->addText(deti);
-    
    m_tree_view->setModel(m_model);
    
    if(old_model)
@@ -76,7 +79,14 @@ bool DynamicElementTextItemEditor::setLiveEdit(bool live_edit)
 void DynamicElementTextItemEditor::apply()
 {
 	QList <QUndoCommand *> undo_list;
-	for (DynamicElementTextItem *deti : m_element->dynamicTextItems())
+	
+		//Get all dynamic text item of the element
+	QList <DynamicElementTextItem *> deti_list;
+	deti_list << m_element.data()->dynamicTextItems();
+		for(ElementTextItemGroup *group : m_element.data()->textGroups())
+			deti_list << group->texts();
+		
+	for (DynamicElementTextItem *deti : deti_list)
 	{
 		QUndoCommand *undo = m_model->undoForEditedText(deti);

@@ -94,9 +104,6 @@ void DynamicElementTextItemEditor::apply()
 			delete undo;
 	}
 	
-	for (DynamicElementTextItem *deti : m_element->dynamicTextItems())
-		deti->blockSignals(true);
-	
 	if(!undo_list.isEmpty() && m_element->diagram())
 	{
 		if (undo_list.size() == 1)
@@ -112,9 +119,6 @@ void DynamicElementTextItemEditor::apply()
 			us.endMacro();
 		}
 	}
-	
-	for (DynamicElementTextItem *deti : m_element->dynamicTextItems())
-		deti->blockSignals(false);
 }

 /**
@@ -133,6 +137,21 @@ void DynamicElementTextItemEditor::setCurrentText(DynamicElementTextItem *text)
 	m_tree_view->setCurrentIndex(index);
 }

+/**
+ * @brief DynamicElementTextItemEditor::setCurrentGroup
+ * Expand and select the item for group @group
+ * @param group
+ */
+void DynamicElementTextItemEditor::setCurrentGroup(ElementTextItemGroup *group)
+{
+	QModelIndex index = m_model->indexFromGroup(group);
+	if(!index.isValid())
+		return;
+	
+	m_tree_view->expand(index);
+	m_tree_view->setCurrentIndex(index);
+}
+
 QUndoCommand *DynamicElementTextItemEditor::associatedUndo() const
 {
 	QUndoCommand *parent_undo = new QUndoCommand(tr("Modifier un texte d'élément"));
@@ -149,6 +168,164 @@ QUndoCommand *DynamicElementTextItemEditor::associatedUndo() const
 		return nullptr;
 }

+/**
+ * @brief DynamicElementTextItemEditor::eventFilter
+ * Reimplemented for intercept the context menu event of the tree view
+ * @param watched
+ * @param event
+ * @return 
+ */
+bool DynamicElementTextItemEditor::eventFilter(QObject *watched, QEvent *event)
+{
+	if(watched == m_tree_view && event->type() == QEvent::ContextMenu)
+	{
+		QContextMenuEvent *qcme = static_cast<QContextMenuEvent *>(event);
+		QModelIndex index = m_tree_view->currentIndex();
+		
+		if(index.isValid())
+		{
+			for(QAction *action : m_actions_list)
+				m_context_menu->removeAction(action);
+			m_add_to_group->menu()->clear();
+			
+				//Pop up a context menu for a group or a text in a group
+			if(m_model->indexIsInGroup(index))
+			{
+				QStandardItem *item = m_model->itemFromIndex(index);
+				if(item)
+				{
+					if(m_model->textFromItem(item)) //User click on a text or a child item of a text
+					{
+						m_context_menu->addAction(m_remove_text_from_group);
+						m_context_menu->addAction(m_remove_current_text);
+					}
+					else//User click on a group item
+						m_context_menu->addAction(m_remove_current_group);
+				}
+			}
+			else //Popup a context menu for a text not owned by a group
+			{
+				if(m_element.data()->textGroups().isEmpty())
+					m_context_menu->addAction(m_new_group);
+				else
+				{
+					m_context_menu->addAction(m_add_to_group);
+					m_context_menu->addAction(m_new_group);
+					m_context_menu->addAction(m_remove_current_text);
+					
+					for(ElementTextItemGroup *grp : m_element.data()->textGroups())
+					{
+						QAction *action = m_add_to_group->menu()->addAction(grp->name());
+						connect(action, &QAction::triggered, m_signal_mapper, static_cast<void (QSignalMapper::*)()>(&QSignalMapper::map));
+						m_signal_mapper->setMapping(action, grp->name());
+					}
+				}
+			}
+			
+			m_context_menu->popup(qcme->globalPos());
+			return true;
+		}
+	}
+	return AbstractElementPropertiesEditorWidget::eventFilter(watched, event);
+}
+
+void DynamicElementTextItemEditor::setUpAction()
+{
+	m_context_menu = new QMenu(this);
+	
+		//Action add text to a group
+	m_add_to_group = new QAction(tr("Ajouter au groupe"), m_context_menu);
+	m_add_to_group->setMenu(new QMenu(m_context_menu));
+	
+	m_signal_mapper = new QSignalMapper(this);
+	connect(m_signal_mapper, static_cast<void (QSignalMapper::*)(const QString &)>(&QSignalMapper::mapped), this, &DynamicElementTextItemEditor::addCurrentTextToGroup);
+	
+		//Action remove text from a group
+	m_remove_text_from_group = new QAction(tr("Supprimer le texte de ce groupe"), m_context_menu);
+	connect(m_remove_text_from_group, &QAction::triggered, [this]()
+	{
+		QAbstractItemModel *m = this->m_tree_view->model();
+		if(m == nullptr)
+			return;
+		
+		DynamicElementTextModel *model = static_cast<DynamicElementTextModel *>(m);
+		if(model->indexIsInGroup(m_tree_view->currentIndex()))
+		{
+			DynamicElementTextItem *deti = m_model->textFromIndex(m_tree_view->currentIndex());
+			if(deti && deti->parentGroup())
+				m_element.data()->removeTextFromGroup(deti, deti->parentGroup());
+		}
+	});
+	
+		//Action create new group and the connection for open a dialog to edit the name
+		//of the new group
+	m_new_group = new QAction(tr("Nouveau groupe"), m_context_menu);
+	connect(m_new_group, &QAction::triggered, [this]()
+	{
+		QAbstractItemModel *m = this->m_tree_view->model();
+		if(m == nullptr)
+			return;
+		
+		DynamicElementTextModel *model = static_cast<DynamicElementTextModel *>(m);
+		if(model->indexIsInGroup(m_tree_view->currentIndex()))
+			return;
+		
+		DynamicElementTextItem *deti = model->textFromIndex(m_tree_view->currentIndex());
+		if(deti)
+		{
+			Element *element = deti->parentElement();
+			QString name = QInputDialog::getText(this, tr("Nom du groupe"), tr("Entrer le nom du nouveau groupe"));
+			
+			if(name.isEmpty())
+				return;
+			else
+				element->addTextGroup(name);
+		}
+	});
+	
+		//Action remove the selected text
+	m_remove_current_text = new QAction(tr("Supprimer le texte"), m_context_menu);
+	connect(m_remove_current_text, &QAction::triggered, [this]()
+	{
+		QAbstractItemModel *m = this->m_tree_view->model();
+		if(m == nullptr)
+			return;
+		
+		DynamicElementTextModel *model = static_cast<DynamicElementTextModel *>(m);
+		if(DynamicElementTextItem *deti = model->textFromIndex(m_tree_view->currentIndex()))
+		{
+			if(m_element.data()->diagram() && m_element.data()->diagram()->project())
+			{
+				QUndoStack *us =m_element.data()->diagram()->project()->undoStack();
+				DiagramContent dc;
+				dc.m_element_texts << deti;
+				us->push((new DeleteQGraphicsItemCommand(m_element.data()->diagram(), dc)));
+			}
+		}
+	});
+	
+		//Action remove the selected group
+	m_remove_current_group = new QAction(tr("Supprimer le groupe"), m_context_menu);
+	connect(m_remove_current_group, &QAction::triggered, [this]()
+	{
+		QAbstractItemModel *m = this->m_tree_view->model();
+		if(m == nullptr)
+			return;
+		
+		DynamicElementTextModel *model = static_cast<DynamicElementTextModel *>(m);
+		QModelIndex index = m_tree_view->currentIndex();
+		if(model->indexIsInGroup(index) && !model->textFromIndex(index)) //Item is in group and is not a text, so item is the group
+			m_element.data()->removeTextGroup(model->groupFromIndex(index));
+	});
+	
+	m_actions_list << m_add_to_group \
+				   << m_remove_text_from_group \
+				   << m_new_group \
+				   << m_remove_current_text \
+				   << m_remove_current_group;
+	
+}
+
 void DynamicElementTextItemEditor::dataEdited(DynamicElementTextItem *deti)
 {
 	Q_UNUSED(deti)
@@ -156,6 +333,30 @@ void DynamicElementTextItemEditor::dataEdited(DynamicElementTextItem *deti)
 		apply();
 }

+/**
+ * @brief DynamicElementTextItemEditor::addCurrentTextToGroup
+ * Add the current selected text to the group named @name
+ * @param name
+ */
+void DynamicElementTextItemEditor::addCurrentTextToGroup(QString name)
+{
+	QModelIndex index = m_tree_view->currentIndex();
+	DynamicElementTextModel *model = static_cast<DynamicElementTextModel *>(m_tree_view->model());
+	
+	DynamicElementTextItem *deti = model->textFromIndex(index);
+	ElementTextItemGroup *group = m_element.data()->textGroup(name);
+	
+	if(deti && group)
+	{
+		if(deti->isSelected())
+		{
+			deti->setSelected(false);
+			group->setSelected(true);
+		}
+		m_element.data()->addTextToGroup(deti, group);
+	}
+}
+
 /**
 * @brief DynamicElementTextItemEditor::on_m_add_text_clicked
 * Add a new dynamic text
@@ -169,8 +370,6 @@ void DynamicElementTextItemEditor::on_m_add_text_clicked()
 	if (m_element->diagram())
 	{
 		m_element->diagram()->undoStack().push(new AddElementTextCommand(m_element, deti));
-		m_model->addText(deti);
-		
 		setCurrentText(deti);
 	}
 	else
@@ -193,7 +392,12 @@ void DynamicElementTextItemEditor::on_m_remove_text_clicked()
 			DiagramContent dc;
 			dc.m_element_texts << deti;
 			m_element->diagram()->undoStack().push(new DeleteQGraphicsItemCommand(m_element->diagram(), dc));
-			m_model->removeText(deti);
 		}
+		return;
    }
+	ElementTextItemGroup *group = m_model->groupFromIndex(m_tree_view->currentIndex());
+	if(group)
+	{
+		m_element.data()->removeTextGroup(group);
+	}
 }