kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 16:20:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

- AlignBottom shoud be the default

Browse Source 
- move inital values to header file
This commit is contained in:
Martin Marmsoler
2020-10-06 18:44:14 +02:00
parent beeeb252b4
commit 2d21391a09
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sources/properties/xrefproperties.cpp
View File

@@ -25,14 +25,6 @@
*/
XRefProperties::XRefProperties()
{
m_show_power_ctc = true;
m_display = Cross;
m_snap_to = Bottom;
m_prefix_keys << "power" << "delay" << "switch";
m_master_label = "%f-%l%c";
m_slave_label = "(%f-%l%c)";
m_offset = 0;
m_xref_pos = Qt::AlignBottom;
}
/**
@@ -127,28 +119,29 @@ bool XRefProperties::fromXml(const QDomElement &xml_element) {
return false;
QString display;
propertyString(xml_element, "displayhas", &display, true, "cross");
display == "cross"? m_display = Cross : m_display = Contacts;
if (propertyString(xml_element, "displayhas", &display) != PropertyFlags::NotFound) {
display == "cross"? m_display = Cross : m_display = Contacts;
}
QString snap;
propertyString(xml_element, "snapto", &snap, true, "label");
snap == "bottom"? m_snap_to = Bottom : m_snap_to = Label;
if (propertyString(xml_element, "snapto", &snap) != PropertyFlags::NotFound) {
snap == "bottom"? m_snap_to = Bottom : m_snap_to = Label;
}
QString xrefpos;
if (propertyString(xml_element, "xrefpos", &xrefpos, true, "Left") == PropertyFlags::NotFound) {
if (propertyString(xml_element, "xrefpos", &xrefpos) != PropertyFlags::NotFound) {
QMetaEnum var = QMetaEnum::fromType<Qt::Alignment>();
m_xref_pos = Qt::AlignmentFlag(var.keyToValue(xrefpos.toStdString().data()));
} else
m_xref_pos = Qt::AlignBottom;
}
// TODO: why it compiles without this true??
propertyInteger(xml_element, "offset", &m_offset, true, 0);
propertyString(xml_element, "master_label", &m_master_label, true, "%f-%l%c");
propertyString(xml_element, "slave_label", &m_slave_label, true, "(%f-%l%c)");
propertyInteger(xml_element, "offset", &m_offset);
propertyString(xml_element, "master_label", &m_master_label);
propertyString(xml_element, "slave_label", &m_slave_label);
QString value;
foreach (QString key, m_prefix_keys) {
propertyString(xml_element, key + "prefix", &value);
m_prefix.insert(key, value);
if (!propertyString(xml_element, key + "prefix", &value));
m_prefix.insert(key, value);
}
return true;
}

16
sources/properties/xrefproperties.h
View File

@@ -76,15 +76,15 @@ class XRefProperties : public PropertiesInterface
void setKey(QString& key) {m_key = key;}
private:
bool m_show_power_ctc;
DisplayHas m_display;
SnapTo m_snap_to;
Qt::AlignmentFlag m_xref_pos;
bool m_show_power_ctc{true};
DisplayHas m_display{Cross};
SnapTo m_snap_to{Bottom};
Qt::AlignmentFlag m_xref_pos{Qt::AlignBottom};
QHash <QString, QString> m_prefix;
QStringList m_prefix_keys;
QString m_master_label;
QString m_slave_label;
int m_offset;
QStringList m_prefix_keys{"power","delay","switch"};
QString m_master_label{"%f-%l%c"};
QString m_slave_label{"(%f-%l%c)"};
int m_offset{0};
QString m_key;
};