kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-01-28 13:49:58 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge commits "r4999, r500, r5001" to branch 0.60

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.60@5033 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2017-08-27 13:55:10 +00:00
parent fad7ba8347
commit 9b4b317d7f
39 changed files with 2571 additions and 1862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sources/conductorproperties.h
View File

@@ -77,18 +77,28 @@ class ConductorProperties
//Attributes
ConductorType type;
QColor color;
QColor color,
m_color_2;
QString text,
m_function,
m_tension_protocol,
m_formula;
int text_size;
double cond_size;
double verti_rotate_text;
double horiz_rotate_text;
bool m_show_text;
bool m_one_text_per_folio;
int text_size,
m_dash_size = 1;
double cond_size,
verti_rotate_text,
horiz_rotate_text;
bool m_show_text,
m_one_text_per_folio,
m_bicolor = false;
Qt::PenStyle style;
SingleLineProperties singleLineProperties;
// methods