terminal function can be edited, edted value is applied to element

This commit is contained in:
joshua
2021-07-17 13:44:44 +02:00
parent 30dc34ebe1
commit cc6f66ad11
11 changed files with 375 additions and 60 deletions

View File

@@ -85,12 +85,28 @@ class RealTerminal
ElementData::TerminalType type() const { ElementData::TerminalType type() const {
if (m_element) { if (m_element) {
return m_element->elementData().m_terminal_type; return m_element->elementData().terminalType();
} else { } else {
return ElementData::TTGeneric; return ElementData::TTGeneric;
} }
} }
ElementData::TerminalFunction function() const {
if (m_element) {
return m_element->elementData().terminalFunction();
} else {
return ElementData::TFGeneric;
}
}
bool led() const {
if (m_element) {
return m_element->elementData().terminalLed();
} else {
return false;
}
}
/** /**
* @brief elementUuid * @brief elementUuid
* @return if this real terminal is an element * @return if this real terminal is an element
@@ -585,7 +601,9 @@ RealTerminalData TerminalStrip::realTerminalData(int real_terminal_index)
if (real_terminal->isElement()) { if (real_terminal->isElement()) {
rtd.Xref_ = autonum::AssignVariables::genericXref(real_terminal->element()); rtd.Xref_ = autonum::AssignVariables::genericXref(real_terminal->element());
} }
rtd.type_ = real_terminal->type(); rtd.type_ = real_terminal->type();
rtd.function_ = real_terminal->function();
rtd.led_ = real_terminal->led();
rtd.is_element = real_terminal->isElement(); rtd.is_element = real_terminal->isElement();
return rtd; return rtd;
@@ -632,6 +650,15 @@ QSharedPointer<PhysicalTerminal> TerminalStrip::physicalTerminal(QSharedPointer<
return pt; return pt;
} }
/**
* @brief TerminalStrip::elementForRealTerminal
* @param rt
* @return the element associated to \p rt, the returned element can be nullptr;
*/
Element *TerminalStrip::elementForRealTerminal(QSharedPointer<RealTerminal> rt) const {
return rt.data()->element();
}
/************************************************************************************/ /************************************************************************************/
/************************************************************************************/ /************************************************************************************/
/************************************************************************************/ /************************************************************************************/

View File

@@ -45,6 +45,7 @@ struct RealTerminalData
conductor_; conductor_;
ElementData::TerminalType type_; ElementData::TerminalType type_;
ElementData::TerminalFunction function_;
bool led_ = false, bool led_ = false,
is_element = false; is_element = false;
@@ -103,6 +104,7 @@ class TerminalStrip : public QObject
private: private:
QSharedPointer<RealTerminal> realTerminal(Element *terminal); QSharedPointer<RealTerminal> realTerminal(Element *terminal);
QSharedPointer<PhysicalTerminal> physicalTerminal(QSharedPointer<RealTerminal> terminal); QSharedPointer<PhysicalTerminal> physicalTerminal(QSharedPointer<RealTerminal> terminal);
Element *elementForRealTerminal(QSharedPointer<RealTerminal> rt) const;
private: private:
TerminalStripData m_data; TerminalStripData m_data;

View File

@@ -25,6 +25,7 @@
#include "../UndoCommand/addterminalstripcommand.h" #include "../UndoCommand/addterminalstripcommand.h"
#include "../UndoCommand/addterminaltostripcommand.h" #include "../UndoCommand/addterminaltostripcommand.h"
#include "../UndoCommand/changeterminalstripdata.h" #include "../UndoCommand/changeterminalstripdata.h"
#include "../undocommand/changeelementdatacommand.h"
#include "terminalstriptreewidget.h" #include "terminalstriptreewidget.h"
#include "../../qeticons.h" #include "../../qeticons.h"
#include "terminalstripmodel.h" #include "terminalstripmodel.h"
@@ -392,9 +393,12 @@ void TerminalStripEditor::on_m_dialog_button_box_clicked(QAbstractButton *button
auto role = ui->m_dialog_button_box->buttonRole(button); auto role = ui->m_dialog_button_box->buttonRole(button);
if (role == QDialogButtonBox::ApplyRole) { if (role == QDialogButtonBox::ApplyRole)
{
if (m_current_strip) if (m_current_strip)
{ {
m_project->undoStack()->beginMacro(tr("Modifier des propriétés de borniers"));
TerminalStripData data; TerminalStripData data;
data.m_installation = ui->m_installation_le->text(); data.m_installation = ui->m_installation_le->text();
data.m_location = ui->m_location_le->text(); data.m_location = ui->m_location_le->text();
@@ -403,6 +407,16 @@ void TerminalStripEditor::on_m_dialog_button_box_clicked(QAbstractButton *button
data.m_description = ui->m_description_te->toPlainText(); data.m_description = ui->m_description_te->toPlainText();
m_project->undoStack()->push(new ChangeTerminalStripData(m_current_strip, data, nullptr)); m_project->undoStack()->push(new ChangeTerminalStripData(m_current_strip, data, nullptr));
if (m_model)
{
auto modified_data = m_model->editedTerminalsData();
for (auto elmt : modified_data.keys()) {
m_project->undoStack()->push(new ChangeElementDataCommand(elmt, modified_data.value(elmt)));
}
}
m_project->undoStack()->endMacro();
} }
} }

View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>901</width> <width>1260</width>
<height>465</height> <height>579</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">

View File

@@ -17,6 +17,7 @@
*/ */
#include "terminalstripmodel.h" #include "terminalstripmodel.h"
#include "../terminalstrip.h" #include "../terminalstrip.h"
#include "../../qetgraphicsitem/element.h"
#include <QDebug> #include <QDebug>
#include <QBrush> #include <QBrush>
#include <QVector> #include <QVector>
@@ -33,8 +34,13 @@ const int XREF_CELL = 3;
const int CABLE_CELL = 4; const int CABLE_CELL = 4;
const int CABLE_WIRE_CELL = 5; const int CABLE_WIRE_CELL = 5;
const int TYPE_CELL = 6; const int TYPE_CELL = 6;
const int LED_CELL = 7; const int FUNCTION_CELL = 7;
const int CONDUCTOR_CELL = 8; const int LED_CELL = 8;
const int CONDUCTOR_CELL = 9;
const int ROW_COUNT = 9;
static QVector<bool> UNMODIFIED_CELL_VECTOR{false, false, false, false, false, false, false, false, false, false};
/** /**
* @brief TerminalStripModel::TerminalStripModel * @brief TerminalStripModel::TerminalStripModel
@@ -62,7 +68,7 @@ int TerminalStripModel::rowCount(const QModelIndex &parent) const
int TerminalStripModel::columnCount(const QModelIndex &parent) const int TerminalStripModel::columnCount(const QModelIndex &parent) const
{ {
Q_UNUSED(parent) Q_UNUSED(parent)
return 8; return ROW_COUNT;
} }
QVariant TerminalStripModel::data(const QModelIndex &index, int role) const QVariant TerminalStripModel::data(const QModelIndex &index, int role) const
@@ -77,21 +83,21 @@ QVariant TerminalStripModel::data(const QModelIndex &index, int role) const
if (role == Qt::DisplayRole) if (role == Qt::DisplayRole)
{ {
switch (index.column()) { switch (index.column()) {
case POS_CELL : return rtd.pos_; case POS_CELL : return rtd.pos_;
case LEVEL_CELL : return rtd.level_; case LEVEL_CELL : return rtd.level_;
case LABEL_CELL : return rtd.label_; case LABEL_CELL : return rtd.label_;
case XREF_CELL : return rtd.Xref_; case XREF_CELL : return rtd.Xref_;
case CABLE_CELL : return rtd.cable_; case CABLE_CELL : return rtd.cable_;
case CABLE_WIRE_CELL : return rtd.cable_wire_; case CABLE_WIRE_CELL : return rtd.cable_wire_;
case TYPE_CELL : return ElementData::translatedTerminalType(rtd.type_); case TYPE_CELL : return ElementData::translatedTerminalType(rtd.type_);
case CONDUCTOR_CELL : return rtd.conductor_; case FUNCTION_CELL : return ElementData::translatedTerminalFunction(rtd.function_);
default : return QVariant(); case CONDUCTOR_CELL : return rtd.conductor_;
default : return QVariant();
} }
} }
else if (role == Qt::EditRole) else if (role == Qt::EditRole)
{ {
switch (index.column()) { switch (index.column()) {
// case LEVEL_CELL : return rtd.level_;
case LABEL_CELL : return rtd.label_; case LABEL_CELL : return rtd.label_;
default: return QVariant(); default: return QVariant();
@@ -135,13 +141,13 @@ bool TerminalStripModel::setData(const QModelIndex &index, const QVariant &value
modified_ = true; modified_ = true;
modified_cell = TYPE_CELL; modified_cell = TYPE_CELL;
} }
// else if (column_ == LEVEL_CELL && else if (column_ == FUNCTION_CELL &&
// role == Qt::EditRole) role == Qt::EditRole)
// { {
// rtd.level_ = value.toInt(); rtd.function_ = value.value<ElementData::TerminalFunction>();
// modified_ = true; modified_ = true;
// modified_cell = LEVEL_CELL; modified_cell = FUNCTION_CELL;
// } }
//Set the modification to the terminal data //Set the modification to the terminal data
if (modified_) if (modified_)
@@ -154,7 +160,7 @@ bool TerminalStripModel::setData(const QModelIndex &index, const QVariant &value
if (m_modified_cell.contains(rtd.m_real_terminal)) { if (m_modified_cell.contains(rtd.m_real_terminal)) {
vector_ = m_modified_cell.value(rtd.m_real_terminal); vector_ = m_modified_cell.value(rtd.m_real_terminal);
} else { } else {
vector_ = QVector<bool>({false, false, false, false, false, false, false, false, false}); vector_ = UNMODIFIED_CELL_VECTOR;
} }
vector_.replace(modified_cell, true); vector_.replace(modified_cell, true);
@@ -173,20 +179,19 @@ QVariant TerminalStripModel::headerData(int section, Qt::Orientation orientation
if (orientation == Qt::Horizontal) if (orientation == Qt::Horizontal)
{ {
switch (section) { switch (section) {
case POS_CELL: return tr("Position"); case POS_CELL: return tr("Position");
case LEVEL_CELL: return tr("Étage"); case LEVEL_CELL: return tr("Étage");
case LABEL_CELL: return tr("Label"); case LABEL_CELL: return tr("Label");
case XREF_CELL: return tr("Référence croisé"); case XREF_CELL: return tr("Référence croisé");
case CABLE_CELL: return tr("Câble"); case CABLE_CELL: return tr("Câble");
case CABLE_WIRE_CELL: return tr("Couleur / numéro de fil câble"); case CABLE_WIRE_CELL: return tr("Couleur / numéro de fil câble");
case TYPE_CELL: return tr("Type"); case TYPE_CELL: return tr("Type");
case LED_CELL: return tr("led"); case FUNCTION_CELL : return tr("Fonction");
case CONDUCTOR_CELL: return tr("Numéro de conducteur"); case LED_CELL: return tr("led");
case CONDUCTOR_CELL: return tr("Numéro de conducteur");
default : return QVariant(); default : return QVariant();
} }
} /*else { }
return QString::number(++section);
}*/
} }
return QVariant(); return QVariant();
@@ -197,7 +202,7 @@ Qt::ItemFlags TerminalStripModel::flags(const QModelIndex &index) const
Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable; Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
auto c = index.column(); auto c = index.column();
if (/*c == LEVEL_CELL || */c == LABEL_CELL || c == TYPE_CELL) if (c == LABEL_CELL || c == TYPE_CELL || c == FUNCTION_CELL)
flags = flags | Qt::ItemIsEditable; flags = flags | Qt::ItemIsEditable;
if (c == LED_CELL) { if (c == LED_CELL) {
flags = flags | Qt::ItemIsUserCheckable; flags = flags | Qt::ItemIsUserCheckable;
@@ -205,6 +210,35 @@ Qt::ItemFlags TerminalStripModel::flags(const QModelIndex &index) const
return flags; return flags;
} }
/**
* @brief TerminalStripModel::editedTerminals
* @return a hash with for keys the edited element and for value the ElementData with modified properties
*/
QHash<Element *, ElementData> TerminalStripModel::editedTerminalsData() const
{
QHash<Element *, ElementData> returned_hash;
QVector<RealTerminalData> rtd_vector = m_real_terminal_data;
const auto modified_real_terminal = m_modified_cell.keys();
for (auto const &rt : modified_real_terminal) //loop over modified real terminal
{
for (auto const &rtd : rtd_vector) //loop over real terminal data to retrieve the data associated with real terminal
{
if (rtd.m_real_terminal == rt)
{
auto element = m_terminal_strip->elementForRealTerminal(rt);
if (element) {
returned_hash.insert(element, modifiedData(element->elementData(), rtd));
}
break;
}
}
}
return returned_hash;
}
void TerminalStripModel::fillRealTerminalData() void TerminalStripModel::fillRealTerminalData()
{ {
if (m_terminal_strip) { if (m_terminal_strip) {
@@ -214,6 +248,23 @@ void TerminalStripModel::fillRealTerminalData()
} }
} }
/**
* @brief TerminalStripModel::modifiedData
* @param previous_data
* @param edited_data
* @return an ElementData with the change made in \p edited_data applied to \p original_data
*/
ElementData TerminalStripModel::modifiedData(const ElementData &original_data, const RealTerminalData &edited_data)
{
ElementData returned_data = original_data;
returned_data.setTerminalType(edited_data.type_);
returned_data.setTerminalFunction(edited_data.function_);
returned_data.setTerminalLED(edited_data.led_);
return returned_data;
}
/*********************************************************** /***********************************************************
* Alittle delegate for add a combobox to edit type * Alittle delegate for add a combobox to edit type
* and a spinbox to edit the level of a terminal * and a spinbox to edit the level of a terminal
@@ -236,13 +287,15 @@ QWidget *TerminalStripModelDelegate::createEditor(QWidget *parent, const QStyleO
return qcb; return qcb;
} }
// if (index.column() == LEVEL_CELL) { if (index.column() == FUNCTION_CELL) {
// auto qsb = new QSpinBox(parent); auto qcb = new QComboBox(parent);
// qsb->setObjectName("terminal_level"); qcb->setObjectName("terminal_function");
// qsb->setRange(0, 3); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFGeneric), ElementData::TFGeneric);
// qsb->setValue(index.data(Qt::EditRole).toInt()); qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFPhase), ElementData::TFPhase);
// return qsb; qcb->addItem(ElementData::translatedTerminalFunction(ElementData::TFNeutral), ElementData::TFNeutral);
// }
return qcb;
}
return QStyledItemDelegate::createEditor(parent, option, index); return QStyledItemDelegate::createEditor(parent, option, index);
} }
@@ -257,11 +310,11 @@ void TerminalStripModelDelegate::setModelData(QWidget *editor, QAbstractItemMode
model->setData(index, qcb->currentData(), Qt::EditRole); model->setData(index, qcb->currentData(), Qt::EditRole);
} }
} }
// else if (editor->objectName() == QLatin1String("terminal_level")) else if (editor->objectName() == QLatin1String("terminal_function"))
// { {
// if (auto qsb = dynamic_cast<QSpinBox *>(editor)) { if (auto qcb = dynamic_cast<QComboBox *>(editor)) {
// model->setData(index, qsb->value(), Qt::EditRole); model->setData(index, qcb->currentData(), Qt::EditRole);
// } }
// } }
} }
} }

View File

@@ -40,8 +40,11 @@ class TerminalStripModel : public QAbstractTableModel
virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
virtual Qt::ItemFlags flags (const QModelIndex &index) const override; virtual Qt::ItemFlags flags (const QModelIndex &index) const override;
QHash<Element *, ElementData> editedTerminalsData() const;
private: private:
void fillRealTerminalData(); void fillRealTerminalData();
static ElementData modifiedData(const ElementData &original_data, const RealTerminalData &edited_data);
private: private:
QPointer<TerminalStrip> m_terminal_strip; QPointer<TerminalStrip> m_terminal_strip;
@@ -64,9 +67,6 @@ class TerminalStripModelDelegate : public QStyledItemDelegate
QWidget *editor, QWidget *editor,
QAbstractItemModel *model, QAbstractItemModel *model,
const QModelIndex &index) const override; const QModelIndex &index) const override;
// protected:
// bool eventFilter(QObject *object, QEvent *event) override;
}; };
#endif // TERMINALSTRIPMODEL_H #endif // TERMINALSTRIPMODEL_H

View File

@@ -122,6 +122,84 @@ QDomElement ElementData::kindInfoToXml(QDomDocument &document)
return returned_elmt; return returned_elmt;
} }
/**
* @brief ElementData::setTerminalType
* Override the terminal type by \p t_type
* @param t_type
*/
void ElementData::setTerminalType(ElementData::TerminalType t_type)
{
if (t_type == m_terminal_type) {
m_terminal_type_is_override = false;
} else {
m_override_terminal_type = t_type;
m_terminal_type_is_override = true;
}
}
/**
* @brief ElementData::terminalType
* @return the terminal type or overrided terminal type if set
*/
ElementData::TerminalType ElementData::terminalType() const
{
return m_terminal_type_is_override ?
m_override_terminal_type :
m_terminal_type;
}
/**
* @brief ElementData::setTerminalFunction
* Override the terminal function by \p t_function
* @param t_function
*/
void ElementData::setTerminalFunction(ElementData::TerminalFunction t_function)
{
if (t_function == m_terminal_function) {
m_terminal_function_is_override = false;
} else {
m_override_terminal_function = t_function;
m_terminal_function_is_override = true;
}
}
/**
* @brief ElementData::terminalFunction
* @return the terminal function or overrided terminal function if set
*/
ElementData::TerminalFunction ElementData::terminalFunction() const
{
return m_terminal_function_is_override ?
m_override_terminal_function :
m_terminal_function;
}
/**
* @brief ElementData::setTerminalLED
* Override the terminal led by \p led
* @param led
*/
void ElementData::setTerminalLED(bool led)
{
if (led == m_terminal_led) {
m_terminal_led_is_override = false;
} else {
m_override_terminal_led = led;
m_terminal_led_is_override = true;
}
}
/**
* @brief ElementData::terminalLed
* @return if terminal have led or overrided led if set
*/
bool ElementData::terminalLed() const
{
return m_terminal_led_is_override ?
m_override_terminal_led :
m_terminal_led;
}
bool ElementData::operator==(const ElementData &data) const bool ElementData::operator==(const ElementData &data) const
{ {
if (data.m_type != m_type) { if (data.m_type != m_type) {
@@ -141,8 +219,41 @@ bool ElementData::operator==(const ElementData &data) const
} }
} }
else if (data.m_type == ElementData::Terminale) { else if (data.m_type == ElementData::Terminale) {
if (data.m_terminal_type != m_terminal_type || //Check terminal type or overrided terminal type
data.m_terminal_function != m_terminal_function) { if (data.m_terminal_type_is_override != m_terminal_type_is_override) {
return false;
}
if (m_terminal_type_is_override) {
if(data.m_override_terminal_type != m_override_terminal_type) {
return false;
}
} else if (data.m_terminal_type != m_terminal_type) {
return false;
}
//Check terminal led or override terminal led
if (data.m_terminal_led_is_override != m_terminal_led_is_override) {
return false;
}
if (m_terminal_led_is_override) {
if (data.m_override_terminal_led != m_override_terminal_led) {
return false;
}
} else if (data.m_terminal_led != m_terminal_led) {
return false;
}
//Check terminal function or overrided terminal function
if (data.m_terminal_function_is_override != m_terminal_function_is_override) {
return false;
}
if (m_terminal_function_is_override) {
if (data.m_override_terminal_function != m_override_terminal_function) {
return false;
}
}
else if (data.m_terminal_function != m_terminal_function) {
return false; return false;
} }
} }
@@ -343,15 +454,15 @@ QString ElementData::translatedTerminalType(ElementData::TerminalType type)
{ {
switch (type) { switch (type) {
case ElementData::TTGeneric : case ElementData::TTGeneric :
return QObject::tr("generique", "generic terminal element type"); return QObject::tr("Générique", "generic terminal element type");
case ElementData::TTFuse : case ElementData::TTFuse :
return QObject::tr("fusible", "fuse terminal element type"); return QObject::tr("Fusible", "fuse terminal element type");
case ElementData::TTSectional: case ElementData::TTSectional:
return QObject::tr("sectionable", "sectional terminal element type"); return QObject::tr("Sectionable", "sectional terminal element type");
case ElementData::TTDiode: case ElementData::TTDiode:
return QObject::tr("diode", "diode terminal element type"); return QObject::tr("Diode", "diode terminal element type");
case ElementData::TTGround: case ElementData::TTGround:
return QObject::tr("terre", "ground terminal element type"); return QObject::tr("Terre", "ground terminal element type");
} }
} }
@@ -383,6 +494,15 @@ ElementData::TerminalFunction ElementData::terminalFunctionFromString(const QStr
return ElementData::TFGeneric; return ElementData::TFGeneric;
} }
QString ElementData::translatedTerminalFunction(ElementData::TerminalFunction function)
{
switch (function) {
case TFGeneric : return QObject::tr("Générique", "generic terminal element function");
case TFPhase : return QObject::tr("Phase", "phase terminal element function" );
case TFNeutral : return QObject::tr("Neutre", "neutral terminal element function");
}
}
void ElementData::kindInfoFromXml(const QDomElement &xml_element) void ElementData::kindInfoFromXml(const QDomElement &xml_element)
{ {
if (m_type == ElementData::Master || if (m_type == ElementData::Master ||

View File

@@ -91,6 +91,15 @@ class ElementData : public PropertiesInterface
bool fromXml(const QDomElement &xml_element) override; bool fromXml(const QDomElement &xml_element) override;
QDomElement kindInfoToXml(QDomDocument &document); QDomElement kindInfoToXml(QDomDocument &document);
void setTerminalType(ElementData::TerminalType t_type);
ElementData::TerminalType terminalType() const;
void setTerminalFunction(ElementData::TerminalFunction t_function);
ElementData::TerminalFunction terminalFunction() const;
void setTerminalLED(bool led);
bool terminalLed() const;
bool operator==(const ElementData &data) const; bool operator==(const ElementData &data) const;
bool operator!=(const ElementData &data) const; bool operator!=(const ElementData &data) const;
@@ -112,6 +121,7 @@ class ElementData : public PropertiesInterface
static QString terminalFunctionToString(ElementData::TerminalFunction function); static QString terminalFunctionToString(ElementData::TerminalFunction function);
static ElementData::TerminalFunction terminalFunctionFromString(const QString &string); static ElementData::TerminalFunction terminalFunctionFromString(const QString &string);
static QString translatedTerminalFunction(ElementData::TerminalFunction function);
// must be public, because this class is a private member // must be public, because this class is a private member
// of Element/ element editor and they must access this data // of Element/ element editor and they must access this data
@@ -130,6 +140,17 @@ class ElementData : public PropertiesInterface
NamesList m_names_list; NamesList m_names_list;
QString m_drawing_information; QString m_drawing_information;
private:
ElementData::TerminalType m_override_terminal_type = ElementData::TTGeneric;
bool m_terminal_type_is_override = false;
ElementData::TerminalFunction m_override_terminal_function = ElementData::TFGeneric;
bool m_terminal_function_is_override = false;
bool m_terminal_led = false;
bool m_terminal_led_is_override = false;
bool m_override_terminal_led = false;
private: private:
void kindInfoFromXml(const QDomElement &xml_element); void kindInfoFromXml(const QDomElement &xml_element);
}; };

View File

@@ -42,6 +42,7 @@ class ElementTextItemGroup;
class Element : public QetGraphicsItem class Element : public QetGraphicsItem
{ {
friend class DiagramEventAddElement; friend class DiagramEventAddElement;
friend class ChangeElementDataCommand;
Q_OBJECT Q_OBJECT
public: public:

View File

@@ -0,0 +1,39 @@
/*
Copyright 2006-2021 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 "changeelementdatacommand.h"
#include "../qetgraphicsitem/element.h"
ChangeElementDataCommand::ChangeElementDataCommand(Element *element, ElementData new_data) :
m_element(element),
m_old_data(element->elementData()),
m_new_data(new_data)
{
setText(QObject::tr("Modifier les propriétés d'un élement"));
}
void ChangeElementDataCommand::undo() {
if (m_element) {
m_element.data()->m_data = m_old_data;
}
}
void ChangeElementDataCommand::redo() {
if (m_element) {
m_element.data()->m_data = m_new_data;
}
}

View File

@@ -0,0 +1,38 @@
/*
Copyright 2006-2021 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 CHANGEELEMENTDATACOMMAND_H
#define CHANGEELEMENTDATACOMMAND_H
#include <../properties/elementdata.h>
#include <QUndoCommand>
class Element;
class ChangeElementDataCommand : public QUndoCommand
{
public:
ChangeElementDataCommand(Element *element, ElementData new_data);
void undo() override;
void redo() override;
private:
QPointer<Element> m_element;
ElementData m_old_data, m_new_data;
};
#endif // CHANGEELEMENTDATACOMMAND_H