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-14 20:33:05 +02:00
Code Packages Releases 1 Activity

add font color of the conductors

Browse Source
This commit is contained in:
Simon De Backer 2020-06-20 16:27:25 +02:00 committed by Laurent Trinques
parent 53447b41c9
commit ddf88bbed7
5 changed files with 225 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sources/conductorproperties.cpp
View File

@ -222,6 +222,7 @@ void SingleLineProperties::fromXml(QDomElement &e) {
ConductorProperties::ConductorProperties() : ConductorProperties::ConductorProperties() :
type(Multi), type(Multi),
color(Qt::black), color(Qt::black),
text_color(Qt::black),
text("_"), text("_"),
text_size(9), text_size(9),
cond_size(1), cond_size(1),
@ -259,6 +260,7 @@ void ConductorProperties::toXml(QDomElement &e) const
singleLineProperties.toXml(e); singleLineProperties.toXml(e);
e.setAttribute("num", text); e.setAttribute("num", text);
e.setAttribute("text_color", text_color.name());
e.setAttribute("formula", m_formula); e.setAttribute("formula", m_formula);
e.setAttribute("function", m_function); e.setAttribute("function", m_function);
e.setAttribute("tension-protocol", m_tension_protocol); e.setAttribute("tension-protocol", m_tension_protocol);
@ -313,6 +315,9 @@ void ConductorProperties::fromXml(QDomElement &e)
type = Multi; type = Multi;
text = e.attribute("num"); text = e.attribute("num");
// get text color
QColor xml_text_color= QColor(e.attribute("text_color"));
text_color = (xml_text_color.isValid()? xml_text_color : QColor(Qt::black));
m_formula = e.attribute("formula"); m_formula = e.attribute("formula");
m_function = e.attribute("function"); m_function = e.attribute("function");
m_tension_protocol = e.attribute("tension-protocol"); m_tension_protocol = e.attribute("tension-protocol");
@ -348,6 +353,7 @@ void ConductorProperties::toSettings(QSettings &settings, const QString &prefix)
settings.setValue(prefix + "style", writeStyle()); settings.setValue(prefix + "style", writeStyle());
settings.setValue(prefix + "type", typeToString(type)); settings.setValue(prefix + "type", typeToString(type));
settings.setValue(prefix + "text", text); settings.setValue(prefix + "text", text);
settings.setValue(prefix + "text_color", text_color.name());
settings.setValue(prefix + "formula", m_formula); settings.setValue(prefix + "formula", m_formula);
settings.setValue(prefix + "function", m_function); settings.setValue(prefix + "function", m_function);
settings.setValue(prefix + "tension-protocol", m_tension_protocol); settings.setValue(prefix + "tension-protocol", m_tension_protocol);
@ -388,6 +394,8 @@ void ConductorProperties::fromSettings(QSettings &settings, const QString &prefi
singleLineProperties.fromSettings(settings, prefix); singleLineProperties.fromSettings(settings, prefix);
text = settings.value(prefix + "text", "_").toString(); text = settings.value(prefix + "text", "_").toString();
QColor settings_text_color = QColor(settings.value(prefix + "text_color").toString());
text_color = (settings_text_color.isValid()? settings_text_color : QColor(Qt::black));
m_formula = settings.value(prefix + "formula", "").toString(); m_formula = settings.value(prefix + "formula", "").toString();
m_function = settings.value(prefix + "function", "").toString(); m_function = settings.value(prefix + "function", "").toString();
m_tension_protocol = settings.value(prefix + "tension-protocol", "").toString(); m_tension_protocol = settings.value(prefix + "tension-protocol", "").toString();
@ -441,6 +449,7 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
m_color_2 = cp.m_color_2; m_color_2 = cp.m_color_2;
m_dash_size = cp.m_dash_size; m_dash_size = cp.m_dash_size;
text = cp.text; text = cp.text;
text_color = cp.text_color;
m_formula = cp.m_formula; m_formula = cp.m_formula;
m_function = cp.m_function; m_function = cp.m_function;
m_tension_protocol = cp.m_tension_protocol; m_tension_protocol = cp.m_tension_protocol;
@ -521,6 +530,17 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
text = s_value; text = s_value;
equal = true; equal = true;
//text color
c_value = clist.first().text_color;
for(ConductorProperties cp : clist)
{
if (cp.text_color != c_value)
equal = false;
}
if (equal)
text_color = c_value;
equal = true;
//formula //formula
s_value = clist.first().m_formula; s_value = clist.first().m_formula;
for(ConductorProperties cp : clist) for(ConductorProperties cp : clist)
@ -695,6 +715,7 @@ bool ConductorProperties::operator==(const ConductorProperties &other) const
other.m_dash_size == m_dash_size &&\ other.m_dash_size == m_dash_size &&\
other.style == style &&\ other.style == style &&\
other.text == text &&\ other.text == text &&\
other.text_color == text_color &&\
other.m_formula == m_formula &&\ other.m_formula == m_formula &&\
other.m_function == m_function &&\ other.m_function == m_function &&\
other.m_tension_protocol == m_tension_protocol &&\ other.m_tension_protocol == m_tension_protocol &&\

3
sources/conductorproperties.h
View File

@ -80,7 +80,8 @@ class ConductorProperties
ConductorType type; ConductorType type;
QColor color, QColor color,
m_color_2; m_color_2,
text_color;
QString text, QString text,
m_function, m_function,

1
sources/qetgraphicsitem/conductor.cpp
View File

@ -1552,6 +1552,7 @@ void Conductor::setProperties(const ConductorProperties &property)
QFont font = m_text_item->font(); QFont font = m_text_item->font();
font.setPointSize(m_properties.text_size); font.setPointSize(m_properties.text_size);
m_text_item->setFont(font); m_text_item->setFont(font);
m_text_item->setColor(m_properties.text_color);
if (m_properties.type != ConductorProperties::Multi) if (m_properties.type != ConductorProperties::Multi)
m_text_item->setVisible(false); m_text_item->setVisible(false);

2
sources/ui/conductorpropertieswidget.cpp
View File

@ -95,6 +95,7 @@ void ConductorPropertiesWidget::setProperties(const ConductorProperties &propert
ui->m_phase_slider -> setValue (m_properties.singleLineProperties.phasesCount()); ui->m_phase_slider -> setValue (m_properties.singleLineProperties.phasesCount());
ui->m_color_kpb -> setColor(m_properties.color); ui->m_color_kpb -> setColor(m_properties.color);
ui->m_color_2_kpb -> setColor(m_properties.m_color_2); ui->m_color_2_kpb -> setColor(m_properties.m_color_2);
ui->m_text_color_kpb -> setColor(m_properties.text_color);
ui->m_horiz_cb->setCurrentIndex(m_properties.m_horizontal_alignment == Qt::AlignTop? 0 : 1); ui->m_horiz_cb->setCurrentIndex(m_properties.m_horizontal_alignment == Qt::AlignTop? 0 : 1);
ui->m_verti_cb->setCurrentIndex(m_properties.m_vertical_alignment == Qt::AlignLeft? 0 : 1); ui->m_verti_cb->setCurrentIndex(m_properties.m_vertical_alignment == Qt::AlignLeft? 0 : 1);
@ -122,6 +123,7 @@ ConductorProperties ConductorPropertiesWidget::properties() const
properties_.style = ui -> m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value<QPen>().style(); properties_.style = ui -> m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value<QPen>().style();
properties_.m_formula = ui->m_formula_le->text(); properties_.m_formula = ui->m_formula_le->text();
properties_.text = ui -> m_text_le -> text(); properties_.text = ui -> m_text_le -> text();
properties_.text_color = ui -> m_text_color_kpb->color();
properties_.m_function = ui -> m_function_le->text(); properties_.m_function = ui -> m_function_le->text();
properties_.m_tension_protocol = ui -> m_tension_protocol_le->text(); properties_.m_tension_protocol = ui -> m_tension_protocol_le->text();
properties_.m_wire_color = ui -> m_wire_color_le->text(); properties_.m_wire_color = ui -> m_wire_color_le->text();

272
sources/ui/conductorpropertieswidget.ui
View File

@ -7,14 +7,14 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>662</width> <width>662</width>
<height>346</height> <height>372</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout_9">
<item> <item row="0" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
@ -51,82 +51,14 @@
<property name="checked"> <property name="checked">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_6">
<item row="1" column="0">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="4" column="0"> <item row="0" column="0" colspan="3">
<widget class="QLabel" name="m_autonum_label"> <widget class="QCheckBox" name="m_one_text_per_folio_cb">
<property name="text">
<string>Autonumérotation</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Tension / Protocole :</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLineEdit" name="m_tension_protocol_le">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Fonction :</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QCheckBox" name="m_show_text_cb">
<property name="toolTip"> <property name="toolTip">
<string>Texte visible</string> <string>activer l'option un texte par potentiel</string>
</property> </property>
<property name="text"> <property name="text">
<string/> <string>Afficher un texte de potentiel par folio. </string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="m_function_le">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Texte :</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Formule du texte :</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QPushButton" name="m_edit_autonum_pb">
<property name="toolTip">
<string>éditer les numérotations</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/configure.png</normaloff>:/ico/16x16/configure.png</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -137,16 +69,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Couleur du conducteur</string>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QLineEdit" name="m_wire_color_le"/>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="m_text_size_sb"> <widget class="QSpinBox" name="m_text_size_sb">
<property name="toolTip"> <property name="toolTip">
@ -169,11 +91,50 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3">
<widget class="QLabel" name="label_8">
<property name="text">
<string>Fonction :</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLineEdit" name="m_function_le">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Formule du texte :</string>
</property>
</widget>
</item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QLineEdit" name="m_formula_le"/> <widget class="QLineEdit" name="m_formula_le"/>
</item> </item>
<item row="4" column="4"> <item row="2" column="3">
<widget class="QLineEdit" name="m_wire_section_le"/> <widget class="QLabel" name="label_9">
<property name="text">
<string>Tension / Protocole :</string>
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLineEdit" name="m_tension_protocol_le">
<property name="clearButtonEnabled">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Texte :</string>
</property>
</widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="m_text_le"> <widget class="QLineEdit" name="m_text_le">
@ -185,6 +146,39 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2">
<widget class="QCheckBox" name="m_show_text_cb">
<property name="toolTip">
<string>Texte visible</string>
</property>
<property name="text">
<string/>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Couleur du conducteur</string>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QLineEdit" name="m_wire_color_le"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Text color:</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="KColorButton" name="m_text_color_kpb"/>
</item>
<item row="4" column="3"> <item row="4" column="3">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
@ -192,12 +186,34 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="4" column="4">
<widget class="QLineEdit" name="m_wire_section_le"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="m_autonum_label">
<property name="text">
<string>Autonumérotation</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="m_available_autonum_cb"/> <widget class="QComboBox" name="m_available_autonum_cb"/>
</item> </item>
</layout> <item row="5" column="2">
<widget class="QPushButton" name="m_edit_autonum_pb">
<property name="toolTip">
<string>éditer les numérotations</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/configure.png</normaloff>:/ico/16x16/configure.png</iconset>
</property>
</widget>
</item> </item>
<item row="3" column="0"> <item row="7" column="0" colspan="5">
<layout class="QGridLayout" name="m_text_angle_gl"> <layout class="QGridLayout" name="m_text_angle_gl">
<item row="1" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="m_horiz_cb"> <widget class="QComboBox" name="m_horiz_cb">
@ -239,19 +255,9 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="6" column="0" colspan="2">
<layout class="QVBoxLayout" name="m_autonum_layout"/> <layout class="QVBoxLayout" name="m_autonum_layout"/>
</item> </item>
<item row="0" column="0">
<widget class="QCheckBox" name="m_one_text_per_folio_cb">
<property name="toolTip">
<string>activer l'option un texte par potentiel</string>
</property>
<property name="text">
<string>Afficher un texte de potentiel par folio. </string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -405,7 +411,17 @@
<string>Apparence</string> <string>Apparence</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_4">
<item row="4" column="0"> <item row="0" column="1">
<widget class="KColorButton" name="m_color_kpb"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Taille :</string>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -418,29 +434,13 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_7">
<property name="toolTip"> <property name="toolTip">
<string>Couleur du conducteur</string> <string>Style du conducteur</string>
</property> </property>
<property name="text"> <property name="text">
<string>Couleur :</string> <string>Style :</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QDoubleSpinBox" name="m_cond_size_sb">
<property name="minimum">
<double>0.400000000000000</double>
</property>
<property name="maximum">
<double>20.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
@ -489,10 +489,19 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="1">
<widget class="QLabel" name="label_10"> <widget class="QDoubleSpinBox" name="m_cond_size_sb">
<property name="text"> <property name="minimum">
<string>Taille :</string> <double>0.400000000000000</double>
</property>
<property name="maximum">
<double>20.000000000000000</double>
</property>
<property name="singleStep">
<double>0.200000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
</property> </property>
</widget> </widget>
</item> </item>
@ -503,19 +512,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_7"> <widget class="QLabel" name="label_6">
<property name="toolTip"> <property name="toolTip">
<string>Style du conducteur</string> <string>Couleur du conducteur</string>
</property> </property>
<property name="text"> <property name="text">
<string>Style :</string> <string>Couleur :</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1">
<widget class="KColorButton" name="m_color_kpb"/>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>