mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-13 10:04:13 +02:00
Merge pull request #669 from Kellermorph/fix-plc-editor
PLC Fix scroll sync, data persistence, font defaults, copy/paste, and layout fixes
This commit is contained in:
Laurent Trinques
@@ -267,6 +267,211 @@ QDomElement ElementData::kindInfoToXml(QDomDocument &document)
|
||||
return returned_elmt;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief ElementData::plcMasterDataToXml
|
||||
* Serialize PLC master data to XML (used by Element::toXml for diagram instances)
|
||||
*/
|
||||
QDomElement ElementData::plcMasterDataToXml(QDomDocument &document) const
|
||||
{
|
||||
auto xml_plc = document.createElement(QStringLiteral("plcMasterData"));
|
||||
xml_plc.setAttribute(QStringLiteral("rowHeight"),
|
||||
QString::number(m_plc_master_data.rowHeight, 'f', 2));
|
||||
|
||||
// Save break positions
|
||||
{
|
||||
auto xml_breaks = document.createElement(QStringLiteral("breakPositions"));
|
||||
for (int bp : m_plc_master_data.breakPositions) {
|
||||
auto xml_bp = document.createElement(QStringLiteral("break"));
|
||||
xml_bp.appendChild(document.createTextNode(QString::number(bp)));
|
||||
xml_breaks.appendChild(xml_bp);
|
||||
}
|
||||
xml_plc.appendChild(xml_breaks);
|
||||
}
|
||||
|
||||
// Save column widths
|
||||
auto xml_col_widths = document.createElement(QStringLiteral("columnWidths"));
|
||||
for (auto it = m_plc_master_data.colWidths.constBegin();
|
||||
it != m_plc_master_data.colWidths.constEnd(); ++it) {
|
||||
auto xml_col = document.createElement(QStringLiteral("column"));
|
||||
xml_col.setAttribute(QStringLiteral("index"), it.key());
|
||||
xml_col.setAttribute(QStringLiteral("width"), QString::number(it.value(), 'f', 2));
|
||||
xml_col_widths.appendChild(xml_col);
|
||||
}
|
||||
xml_plc.appendChild(xml_col_widths);
|
||||
|
||||
// Save column visibility
|
||||
auto xml_col_vis = document.createElement(QStringLiteral("columnVisibility"));
|
||||
for (auto it = m_plc_master_data.colVisible.constBegin();
|
||||
it != m_plc_master_data.colVisible.constEnd(); ++it) {
|
||||
auto xml_col = document.createElement(QStringLiteral("column"));
|
||||
xml_col.setAttribute(QStringLiteral("index"), it.key());
|
||||
xml_col.setAttribute(QStringLiteral("visible"), it.value() ? "true" : "false");
|
||||
xml_col_vis.appendChild(xml_col);
|
||||
}
|
||||
xml_plc.appendChild(xml_col_vis);
|
||||
|
||||
// Save fonts
|
||||
if (!m_plc_master_data.headerFont.family().isEmpty()) {
|
||||
auto xml_hfont = document.createElement(QStringLiteral("headerFont"));
|
||||
xml_hfont.setAttribute(QStringLiteral("family"), m_plc_master_data.headerFont.family());
|
||||
xml_hfont.setAttribute(QStringLiteral("size"), m_plc_master_data.headerFont.pointSize());
|
||||
xml_hfont.setAttribute(QStringLiteral("bold"), m_plc_master_data.headerFont.bold() ? "true" : "false");
|
||||
xml_plc.appendChild(xml_hfont);
|
||||
}
|
||||
if (!m_plc_master_data.cellFont.family().isEmpty()) {
|
||||
auto xml_cfont = document.createElement(QStringLiteral("cellFont"));
|
||||
xml_cfont.setAttribute(QStringLiteral("family"), m_plc_master_data.cellFont.family());
|
||||
xml_cfont.setAttribute(QStringLiteral("size"), m_plc_master_data.cellFont.pointSize());
|
||||
xml_cfont.setAttribute(QStringLiteral("bold"), m_plc_master_data.cellFont.bold() ? "true" : "false");
|
||||
xml_plc.appendChild(xml_cfont);
|
||||
}
|
||||
|
||||
// Save custom column names
|
||||
if (!m_plc_master_data.columnNames.isEmpty()) {
|
||||
auto xml_names = document.createElement(QStringLiteral("columnNames"));
|
||||
for (int i = 0; i < m_plc_master_data.columnNames.size(); ++i) {
|
||||
auto xml_name = document.createElement(QStringLiteral("column"));
|
||||
xml_name.setAttribute(QStringLiteral("index"), i);
|
||||
xml_name.appendChild(document.createTextNode(m_plc_master_data.columnNames.at(i)));
|
||||
xml_names.appendChild(xml_name);
|
||||
}
|
||||
xml_plc.appendChild(xml_names);
|
||||
}
|
||||
|
||||
// Save column order
|
||||
if (!m_plc_master_data.columnOrder.isEmpty()) {
|
||||
auto xml_order = document.createElement(QStringLiteral("columnOrder"));
|
||||
QString order_str;
|
||||
for (int i = 0; i < m_plc_master_data.columnOrder.size(); ++i) {
|
||||
if (i > 0) order_str += QStringLiteral(",");
|
||||
order_str += QString::number(m_plc_master_data.columnOrder.at(i));
|
||||
}
|
||||
xml_order.appendChild(document.createTextNode(order_str));
|
||||
xml_plc.appendChild(xml_order);
|
||||
}
|
||||
|
||||
// Save showHeaders
|
||||
{
|
||||
auto xml_sh = document.createElement(QStringLiteral("showHeaders"));
|
||||
xml_sh.appendChild(document.createTextNode(
|
||||
m_plc_master_data.showHeaders ? QStringLiteral("1") : QStringLiteral("0")));
|
||||
xml_plc.appendChild(xml_sh);
|
||||
}
|
||||
|
||||
// Save IO entries
|
||||
auto xml_ios = document.createElement(QStringLiteral("plcIOs"));
|
||||
for (const auto &io : m_plc_master_data.ios) {
|
||||
auto xml_io = document.createElement(QStringLiteral("plcIO"));
|
||||
xml_io.setAttribute(QStringLiteral("type"), plcIOTypeToString(io.type));
|
||||
xml_io.setAttribute(QStringLiteral("address"), io.address);
|
||||
xml_io.setAttribute(QStringLiteral("functionText"), io.functionText);
|
||||
xml_io.setAttribute(QStringLiteral("comment"), io.comment);
|
||||
xml_io.setAttribute(QStringLiteral("crossRef"), io.crossRef);
|
||||
xml_io.setAttribute(QStringLiteral("terminalCount"), io.terminalCount);
|
||||
for (const auto &t : io.terminals) {
|
||||
auto xml_term = document.createElement(QStringLiteral("terminal"));
|
||||
xml_term.appendChild(document.createTextNode(t));
|
||||
xml_io.appendChild(xml_term);
|
||||
}
|
||||
xml_ios.appendChild(xml_io);
|
||||
}
|
||||
xml_plc.appendChild(xml_ios);
|
||||
|
||||
return xml_plc;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief ElementData::plcMasterDataFromXml
|
||||
* Deserialize PLC master data from XML
|
||||
*/
|
||||
void ElementData::plcMasterDataFromXml(const QDomElement &xml_plc)
|
||||
{
|
||||
if (xml_plc.isNull())
|
||||
return;
|
||||
|
||||
// Reset PLC data before loading to avoid appending to existing data
|
||||
m_plc_master_data = PlcMasterData();
|
||||
|
||||
m_plc_master_data.rowHeight = xml_plc.attribute(
|
||||
QStringLiteral("rowHeight"), QStringLiteral("8.0")).toDouble();
|
||||
|
||||
// Load break positions
|
||||
auto xml_breaks = xml_plc.firstChildElement(QStringLiteral("breakPositions"));
|
||||
for (const auto &xml_bp : QETXML::findInDomElement(xml_breaks, QStringLiteral("break"))) {
|
||||
m_plc_master_data.breakPositions.append(xml_bp.text().toInt());
|
||||
}
|
||||
|
||||
// Load column widths
|
||||
auto xml_col_widths = xml_plc.firstChildElement(QStringLiteral("columnWidths"));
|
||||
for (const auto &xml_col : QETXML::findInDomElement(xml_col_widths, QStringLiteral("column"))) {
|
||||
int idx = xml_col.attribute(QStringLiteral("index")).toInt();
|
||||
qreal w = xml_col.attribute(QStringLiteral("width")).toDouble();
|
||||
m_plc_master_data.colWidths.insert(idx, w);
|
||||
}
|
||||
|
||||
// Load column visibility
|
||||
auto xml_col_vis = xml_plc.firstChildElement(QStringLiteral("columnVisibility"));
|
||||
for (const auto &xml_col : QETXML::findInDomElement(xml_col_vis, QStringLiteral("column"))) {
|
||||
int idx = xml_col.attribute(QStringLiteral("index")).toInt();
|
||||
bool vis = xml_col.attribute(QStringLiteral("visible")) == QLatin1String("true");
|
||||
m_plc_master_data.colVisible.insert(idx, vis);
|
||||
}
|
||||
|
||||
// Load fonts
|
||||
auto xml_hfont = xml_plc.firstChildElement(QStringLiteral("headerFont"));
|
||||
if (!xml_hfont.isNull()) {
|
||||
m_plc_master_data.headerFont.setFamily(xml_hfont.attribute(QStringLiteral("family")));
|
||||
m_plc_master_data.headerFont.setPointSize(xml_hfont.attribute(QStringLiteral("size")).toInt());
|
||||
m_plc_master_data.headerFont.setBold(xml_hfont.attribute(QStringLiteral("bold")) == QLatin1String("true"));
|
||||
}
|
||||
auto xml_cfont = xml_plc.firstChildElement(QStringLiteral("cellFont"));
|
||||
if (!xml_cfont.isNull()) {
|
||||
m_plc_master_data.cellFont.setFamily(xml_cfont.attribute(QStringLiteral("family")));
|
||||
m_plc_master_data.cellFont.setPointSize(xml_cfont.attribute(QStringLiteral("size")).toInt());
|
||||
m_plc_master_data.cellFont.setBold(xml_cfont.attribute(QStringLiteral("bold")) == QLatin1String("true"));
|
||||
}
|
||||
|
||||
// Load custom column names
|
||||
auto xml_names = xml_plc.firstChildElement(QStringLiteral("columnNames"));
|
||||
for (const auto &xml_col : QETXML::findInDomElement(xml_names, QStringLiteral("column"))) {
|
||||
int idx = xml_col.attribute(QStringLiteral("index")).toInt();
|
||||
while (m_plc_master_data.columnNames.size() <= idx)
|
||||
m_plc_master_data.columnNames.append(QString());
|
||||
m_plc_master_data.columnNames.replace(idx, xml_col.text());
|
||||
}
|
||||
|
||||
// Load column order
|
||||
auto xml_order = xml_plc.firstChildElement(QStringLiteral("columnOrder"));
|
||||
if (!xml_order.isNull()) {
|
||||
QStringList order_str_list = xml_order.text().split(',');
|
||||
for (const auto &s : order_str_list) {
|
||||
m_plc_master_data.columnOrder.append(s.trimmed().toInt());
|
||||
}
|
||||
}
|
||||
|
||||
// Load showHeaders
|
||||
auto xml_sh = xml_plc.firstChildElement(QStringLiteral("showHeaders"));
|
||||
if (!xml_sh.isNull()) {
|
||||
m_plc_master_data.showHeaders = xml_sh.text() == QLatin1String("1");
|
||||
}
|
||||
|
||||
// Load IO entries
|
||||
auto xml_ios = xml_plc.firstChildElement(QStringLiteral("plcIOs"));
|
||||
for (const auto &xml_io : QETXML::findInDomElement(xml_ios, QStringLiteral("plcIO"))) {
|
||||
PlcIO io;
|
||||
io.type = plcIOTypeFromString(xml_io.attribute(QStringLiteral("type")));
|
||||
io.address = xml_io.attribute(QStringLiteral("address"));
|
||||
io.functionText = xml_io.attribute(QStringLiteral("functionText"));
|
||||
io.comment = xml_io.attribute(QStringLiteral("comment"));
|
||||
io.crossRef = xml_io.attribute(QStringLiteral("crossRef"));
|
||||
io.terminalCount = xml_io.attribute(QStringLiteral("terminalCount")).toInt();
|
||||
for (const auto &xml_term : QETXML::findInDomElement(xml_io, QStringLiteral("terminal"))) {
|
||||
io.terminals.append(xml_term.text());
|
||||
}
|
||||
m_plc_master_data.ios.append(io);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief ElementData::setTerminalType
|
||||
* Override the terminal type by \p t_type
|
||||
|
||||
@@ -130,6 +130,11 @@ class ElementData : public PropertiesInterface
|
||||
QList<int> columnOrder; ///< Column display order (logical indices)
|
||||
bool showHeaders = true; ///< Show column headers on sheet
|
||||
|
||||
PlcMasterData() {
|
||||
headerFont.setFamily(QString());
|
||||
cellFont.setFamily(QString());
|
||||
}
|
||||
|
||||
bool operator==(const PlcMasterData &other) const {
|
||||
return ios == other.ios
|
||||
&& breakPositions == other.breakPositions
|
||||
@@ -201,6 +206,8 @@ class ElementData : public PropertiesInterface
|
||||
QDomElement toXml(QDomDocument &xml_element) const override;
|
||||
bool fromXml(const QDomElement &xml_element) override;
|
||||
QDomElement kindInfoToXml(QDomDocument &document);
|
||||
QDomElement plcMasterDataToXml(QDomDocument &document) const;
|
||||
void plcMasterDataFromXml(const QDomElement &xml_plc);
|
||||
|
||||
void setTerminalType(ElementData::TerminalType t_type);
|
||||
ElementData::TerminalType terminalType() const;
|
||||
|
||||
Reference in New Issue
Block a user