kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 05:00:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert and merge rev 4823.

Browse Source 
Fix : in old projects without the conductors formula, the conductors texts aren't loaded and displayed
Fix it in method void Conductor::refreshText()


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4825 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2016-12-28 10:03:47 +00:00
parent 52f911887d
commit 14f02d4ed1
10 changed files with 189 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/ui/potentialselectordialog.h
View File

@@ -20,6 +20,7 @@
#include <QDialog>
#include "conductorproperties.h"
#include "assignvariables.h"
class Conductor;
class QUndoCommand;
class Element;
@@ -32,6 +33,7 @@ class AbstractPotentialSelector
virtual bool isValid() const = 0;
ConductorProperties m_properties_1, m_properties_2;
autonum::sequentialNumbers m_seq_num_1, m_seq_num_2;
int m_conductor_number_1, m_conductor_number_2;
};
@@ -72,6 +74,7 @@ class PotentialSelectorDialog : public QDialog
Element *m_report;
QUndoCommand *m_parent_undo;
ConductorProperties m_selected_properties;
autonum::sequentialNumbers m_sequential_num;
AbstractPotentialSelector *m_potential_selector;
};
#endif // POTENTIALSELECTORDIALOG_H