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

User can edit the label of terminal inside the terminal strip editor

Browse Source
This commit is contained in:
joshua 2021-09-10 21:01:03 +02:00
parent 4dd2dc259f
commit b08c2bd90b
5 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sources/TerminalStrip/ui/terminalstripeditor.cpp
View File

@ -442,6 +442,7 @@ void TerminalStripEditor::on_m_dialog_button_box_clicked(QAbstractButton *button
current_data.setTerminalType(modified_data.type_);
current_data.setTerminalFunction(modified_data.function_);
current_data.setTerminalLED(modified_data.led_);
current_data.m_informations.addValue(QStringLiteral("label"), modified_data.label_);
m_project->undoStack()->push(new ChangeElementDataCommand(element, current_data));
}

10
sources/TerminalStrip/ui/terminalstripmodel.cpp
View File

@ -154,6 +154,13 @@ bool TerminalStripModel::setData(const QModelIndex &index, const QVariant &value
modified_ = true;
modified_cell = FUNCTION_CELL;
}
else if (column_ == LABEL_CELL &&
role == Qt::EditRole)
{
rtd.label_ = value.toString();
modified_ = true;
modified_cell = LABEL_CELL;
}
//Set the modification to the terminal data
if (modified_)
@ -384,5 +391,8 @@ void TerminalStripModelDelegate::setModelData(QWidget *editor, QAbstractItemMode
model->setData(index, qcb->currentData(), Qt::EditRole);
}
}
else {
QStyledItemDelegate::setModelData(editor, model, index);
}
}
}

20
sources/qetgraphicsitem/element.cpp
View File

@ -1327,6 +1327,26 @@ ElementData Element::elementData() const
return m_data;
}
/**
* @brief Element::setElementData
* Set new data for this element.
* If m_information of \p data is changed, emit elementInfoChange
* @param data
*/
void Element::setElementData(ElementData data)
{
auto old_info = m_data.m_informations;
m_data = data;
if (old_info != m_data.m_informations) {
m_data.m_informations.addValue(QStringLiteral("label"), actualLabel()); //Update the label if there is a formula
if (diagram()) {
diagram()->project()->dataBase()->elementInfoChanged(this);
}
emit elementInfoChange(old_info, m_data.m_informations);
}
}
/**
@brief comparPos
Compare position of the two elements. Compare 3 points:

2
sources/qetgraphicsitem/element.h
View File

@ -42,7 +42,6 @@ class ElementTextItemGroup;
class Element : public QetGraphicsItem
{
friend class DiagramEventAddElement;
friend class ChangeElementDataCommand;
Q_OBJECT
public:
@ -106,6 +105,7 @@ class Element : public QetGraphicsItem
virtual void setElementInformations(DiagramContext dc);
ElementData elementData() const;
void setElementData (ElementData data);
/**
* @brief kindInformations

4
sources/undocommand/changeelementdatacommand.cpp
View File

@ -28,12 +28,12 @@ ChangeElementDataCommand::ChangeElementDataCommand(Element *element, ElementData
void ChangeElementDataCommand::undo() {
if (m_element) {
m_element.data()->m_data = m_old_data;
m_element.data()->setElementData(m_old_data);
}
}
void ChangeElementDataCommand::redo() {
if (m_element) {
m_element.data()->m_data = m_new_data;
m_element.data()->setElementData(m_new_data);
}
}