From 49fc5c61e324f6c370674bb766d6c5e37dab8818 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Fri, 5 Aug 2016 12:15:59 +0000 Subject: [PATCH] Add ability conductor size less than 1, thank Timbul Widodo git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4605 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/conductorproperties.cpp | 2 +- sources/conductorproperties.h | 2 +- sources/ui/conductorpropertieswidget.ui | 14 ++++++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/sources/conductorproperties.cpp b/sources/conductorproperties.cpp index b697e0dda..4d2ed0ee0 100644 --- a/sources/conductorproperties.cpp +++ b/sources/conductorproperties.cpp @@ -296,7 +296,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(); + cond_size = e.attribute("condsize", QString::number(1)).toDouble(); 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(); diff --git a/sources/conductorproperties.h b/sources/conductorproperties.h index d4184b24e..99af1fe26 100644 --- a/sources/conductorproperties.h +++ b/sources/conductorproperties.h @@ -82,7 +82,7 @@ class ConductorProperties m_function, m_tension_protocol; int text_size; - int cond_size; + double cond_size; double verti_rotate_text; double horiz_rotate_text; bool m_show_text; diff --git a/sources/ui/conductorpropertieswidget.ui b/sources/ui/conductorpropertieswidget.ui index b4d38192c..0d5b1ecd0 100644 --- a/sources/ui/conductorpropertieswidget.ui +++ b/sources/ui/conductorpropertieswidget.ui @@ -17,7 +17,7 @@ - 0 + 1 @@ -378,12 +378,18 @@ - + - 1 + 0.400000000000000 - 10 + 10.000000000000000 + + + 0.200000000000000 + + + 1.000000000000000