kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-04-05 03:39:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fix : Conductor text with formula that contain %id isn't good when open project (variable %id is replaced by 0 in each folio)

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4746 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-10-17 14:26:13 +00:00
parent ccf7e1dbde
commit 6ea169e1f7
6 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sources/qetgraphicsitem/conductor.h
View File

@@ -95,6 +95,7 @@ class Conductor : public QObject, public QGraphicsPathItem
QString text() const;
QString assignVariables(QString) ;
void setText(const QString &);
void refreshText();
QString assignSeq (QString, Conductor*);
void setSequential ();
void setOthersSequential (Conductor *);
@@ -131,9 +132,7 @@ class Conductor : public QObject, public QGraphicsPathItem
QStringList seq_hundred;
QStringList seq_hundredfolio;
bool setSeq;
bool freeze_label;
void freezeLabel();
void unfreezeLabel();
void setFreezeLabel(bool freeze);
QString m_frozen_label;
public slots:
@@ -153,32 +152,33 @@ class Conductor : public QObject, public QGraphicsPathItem
private:
QetGraphicsHandlerUtility m_handler;
/// Functional properties
/// Functional properties
ConductorProperties properties_;
/// Text input for non simple, non-singleline conductors
/// Text input for non simple, non-singleline conductors
ConductorTextItem *text_item;
/// Segments composing the conductor
/// Segments composing the conductor
ConductorSegment *segments;
/// Attributs related to mouse interaction
/// Attributs related to mouse interaction
bool moving_segment;
int moved_point;
qreal previous_z_value;
ConductorSegment *moved_segment;
QPointF before_mov_text_pos_;
/// Whether the conductor was manually modified by users
/// Whether the conductor was manually modified by users
bool modified_path;
/// Whether the current profile should be saved as soon as possible
/// Whether the current profile should be saved as soon as possible
bool has_to_save_profile;
/// conductor profile: "photography" of what the conductor is supposed to look
/// like - there is one profile per kind of traject
/// conductor profile: "photography" of what the conductor is supposed to look
/// like - there is one profile per kind of traject
ConductorProfilesGroup conductor_profiles;
/// QPen et QBrush objects used to draw conductors
/// QPen et QBrush objects used to draw conductors
static QPen conductor_pen;
static QBrush conductor_brush;
static bool pen_and_brush_initialized;
/// Define whether and how the conductor should be highlighted
/// Define whether and how the conductor should be highlighted
Highlight must_highlight_;
bool m_valid;
bool m_freeze_label = false;
private:
void segmentsToPath();