From ed4e16657f6a59bf0b57e93b170189f48e1ff68b Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Wed, 23 Dec 2015 18:41:13 +0000 Subject: [PATCH] Improve Conductor Properties size function git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4288 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/conductorproperties.cpp | 6 ++++++ sources/conductorproperties.h | 1 + sources/qetgraphicsitem/conductor.cpp | 2 +- sources/ui/conductorpropertieswidget.cpp | 8 +++++--- sources/ui/conductorpropertieswidget.ui | 23 ++++++++++++++++++++--- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/sources/conductorproperties.cpp b/sources/conductorproperties.cpp index 49aca3dce..650a56ac1 100644 --- a/sources/conductorproperties.cpp +++ b/sources/conductorproperties.cpp @@ -222,6 +222,7 @@ ConductorProperties::ConductorProperties() : color(Qt::black), text("_"), text_size(9), + cond_size(1), verti_rotate_text(270), horiz_rotate_text(0), m_show_text(true), @@ -255,6 +256,7 @@ void ConductorProperties::toXml(QDomElement &e) const e.setAttribute("function", m_function); e.setAttribute("tension-protocol", m_tension_protocol); e.setAttribute("numsize", text_size); + e.setAttribute("condsize", cond_size); e.setAttribute("displaytext", m_show_text); e.setAttribute("onetextperfolio", m_one_text_per_folio); e.setAttribute("vertirotatetext", verti_rotate_text); @@ -293,6 +295,7 @@ void ConductorProperties::fromXml(QDomElement &e) m_function = e.attribute("function"); m_tension_protocol = e.attribute("tension-protocol"); text_size = e.attribute("numsize", QString::number(9)).toInt(); + cond_size = e.attribute("condsize", QString::number(1)).toInt(); m_show_text = e.attribute("displaytext", QString::number(1)).toInt(); m_one_text_per_folio = e.attribute("onetextperfolio", QString::number(0)).toInt(); verti_rotate_text = e.attribute("vertirotatetext").toDouble(); @@ -317,6 +320,7 @@ void ConductorProperties::toSettings(QSettings &settings, const QString &prefix) settings.setValue(prefix + "function", m_function); settings.setValue(prefix + "tension-protocol", m_tension_protocol); settings.setValue(prefix + "textsize", QString::number(text_size)); + settings.setValue(prefix + "size", QString::number(cond_size)); settings.setValue(prefix + "displaytext", m_show_text); settings.setValue(prefix + "onetextperfolio", m_one_text_per_folio); settings.setValue(prefix + "vertirotatetext", QString::number(verti_rotate_text)); @@ -342,6 +346,7 @@ void ConductorProperties::fromSettings(QSettings &settings, const QString &prefi m_function = settings.value(prefix + "function", "").toString(); m_tension_protocol = settings.value(prefix + "tension-protocol", "").toString(); text_size = settings.value(prefix + "textsize", "7").toInt(); + cond_size = settings.value(prefix + "size", "1").toInt(); m_show_text = settings.value(prefix + "displaytext", true).toBool(); m_one_text_per_folio = settings.value(prefix + "onetextperfolio", false).toBool(); verti_rotate_text = settings.value((prefix + "vertirotatetext"), "270").toDouble(); @@ -389,6 +394,7 @@ bool ConductorProperties::operator==(const ConductorProperties &other) const{ other.m_tension_protocol == m_tension_protocol &&\ other.m_show_text == m_show_text &&\ other.text_size == text_size &&\ + other.cond_size == cond_size &&\ other.verti_rotate_text == verti_rotate_text &&\ other.horiz_rotate_text == horiz_rotate_text &&\ other.singleLineProperties == singleLineProperties &&\ diff --git a/sources/conductorproperties.h b/sources/conductorproperties.h index f8681047f..90a32c2ea 100644 --- a/sources/conductorproperties.h +++ b/sources/conductorproperties.h @@ -82,6 +82,7 @@ class ConductorProperties m_function, m_tension_protocol; int text_size; + int cond_size; double verti_rotate_text; double horiz_rotate_text; bool m_show_text; diff --git a/sources/qetgraphicsitem/conductor.cpp b/sources/qetgraphicsitem/conductor.cpp index d3add368d..85f7a3836 100644 --- a/sources/qetgraphicsitem/conductor.cpp +++ b/sources/qetgraphicsitem/conductor.cpp @@ -455,7 +455,7 @@ void Conductor::paint(QPainter *qp, const QStyleOptionGraphicsItem *options, QWi } //Draw the conductor bigger when is hovered - conductor_pen.setWidth(bMouseOver? 5 : 1); + conductor_pen.setWidth(bMouseOver? 5 : (properties_.cond_size)); // affectation du QPen et de la QBrush modifies au QPainter qp -> setBrush(conductor_brush); diff --git a/sources/ui/conductorpropertieswidget.cpp b/sources/ui/conductorpropertieswidget.cpp index 1238b9b4e..7bb1c8a3f 100644 --- a/sources/ui/conductorpropertieswidget.cpp +++ b/sources/ui/conductorpropertieswidget.cpp @@ -76,9 +76,10 @@ void ConductorPropertiesWidget::setProperties(const ConductorProperties &propert if (index != -1) ui -> m_line_style_cb -> setCurrentIndex(index); ui->m_text_le -> setText (m_properties.text); - ui->m_function_le ->setText (m_properties.m_function); - ui->m_tension_protocol_le ->setText (m_properties.m_tension_protocol); + ui->m_function_le -> setText (m_properties.m_function); + ui->m_tension_protocol_le -> setText (m_properties.m_tension_protocol); ui->m_text_size_sb -> setValue (m_properties.text_size); + ui->m_cond_size_sb -> setValue (m_properties.cond_size); ui->m_show_text_cb -> setChecked (m_properties.m_show_text); ui->m_one_text_per_folio_cb -> setChecked (m_properties.m_one_text_per_folio); ui->m_earth_cb -> setChecked (m_properties.singleLineProperties.hasGround); @@ -110,6 +111,7 @@ ConductorProperties ConductorPropertiesWidget::properties() const properties_.m_function = ui -> m_function_le->text(); properties_.m_tension_protocol = ui -> m_tension_protocol_le->text(); properties_.text_size = ui -> m_text_size_sb -> value(); + properties_.cond_size = ui -> m_cond_size_sb -> value(); properties_.m_show_text = ui -> m_show_text_cb -> isChecked(); properties_.m_one_text_per_folio = ui -> m_one_text_per_folio_cb -> isChecked(); properties_.verti_rotate_text = m_verti_select -> value(); @@ -250,7 +252,7 @@ void ConductorPropertiesWidget::on_m_earth_cb_toggled(bool checked) { void ConductorPropertiesWidget::on_m_neutral_cb_toggled(bool checked) { if (checked && ui -> m_earth_cb -> isChecked()) ui -> m_pen_cb -> setEnabled(true); - else ui -> m_pen_cb -> setDisabled(true); + else ui -> m_pen_cb -> setDisabled(true); } /** diff --git a/sources/ui/conductorpropertieswidget.ui b/sources/ui/conductorpropertieswidget.ui index 3796d7e8e..8534313d6 100644 --- a/sources/ui/conductorpropertieswidget.ui +++ b/sources/ui/conductorpropertieswidget.ui @@ -7,7 +7,7 @@ 0 0 504 - 420 + 480 @@ -17,7 +17,7 @@ - 0 + 1 @@ -357,7 +357,7 @@ - + Qt::Vertical @@ -370,6 +370,23 @@ + + + + size: + + + + + + + 1 + + + 10 + + +