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

Conductor properties widget : minor change

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4164 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-08-26 21:46:47 +00:00
parent fd8382d842
commit 94c3526d2f
4 changed files with 327 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sources/ui/conductorpropertiesdialog.cpp
View File

@@ -40,7 +40,7 @@ ConductorPropertiesDialog::ConductorPropertiesDialog(Conductor *conductor, QWidg
conductor -> relatedPotentialConductors().size()) { conductor -> relatedPotentialConductors().size()) {
m_cpw->setDisabledShowText(); m_cpw->setDisabledShowText();
} }
ui -> main_layout -> insertWidget(1, m_cpw); ui -> main_layout -> insertWidget(0, m_cpw);
} }
/** /**

17
sources/ui/conductorpropertiesdialog.ui
View File

@@ -6,27 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>430</width> <width>485</width>
<height>300</height> <height>66</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Éditer les propriétés d'un conducteur</string> <string>Éditer les propriétés d'un conducteur</string>
</property> </property>
<layout class="QVBoxLayout" name="main_layout"> <layout class="QVBoxLayout" name="main_layout">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QCheckBox" name="m_apply_all_cb"> <widget class="QCheckBox" name="m_apply_all_cb">
<property name="text"> <property name="text">

18
sources/ui/conductorpropertieswidget.cpp
View File

@@ -97,8 +97,8 @@ void ConductorPropertiesWidget::setProperties(const ConductorProperties &propert
*/ */
ConductorProperties ConductorPropertiesWidget::properties() const { ConductorProperties ConductorPropertiesWidget::properties() const {
ConductorProperties properties_; ConductorProperties properties_;
if (ui -> m_multi_rb -> isChecked()) properties_.type = ConductorProperties::Multi; if (ui -> m_multiwires_gb -> isChecked()) properties_.type = ConductorProperties::Multi;
else if (ui -> m_single_rb -> isChecked()) properties_.type = ConductorProperties::Single; else if (ui -> m_singlewire_gb -> isChecked()) properties_.type = ConductorProperties::Single;
properties_.color = ui -> m_color_pb->palette().color(QPalette::Button); properties_.color = ui -> m_color_pb->palette().color(QPalette::Button);
properties_.style = ui -> m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value<QPen>().style(); properties_.style = ui -> m_line_style_cb->itemData(ui->m_line_style_cb->currentIndex()).value<QPen>().style();
@@ -177,9 +177,11 @@ void ConductorPropertiesWidget::initWidget() {
ui -> m_line_style_cb -> addItem(tr("Traits et points", "conductor style: dashed and dotted line"), QPen(Qt::DashDotLine)); ui -> m_line_style_cb -> addItem(tr("Traits et points", "conductor style: dashed and dotted line"), QPen(Qt::DashDotLine));
ui -> m_update_preview_pb -> setHidden(true); ui -> m_update_preview_pb -> setHidden(true);
//Check this checkbox for init the associated groupbox
ui -> m_single_rb -> setChecked(true); connect(ui->m_multiwires_gb, &QGroupBox::toggled, [this](bool toggle) {this->ui->m_singlewire_gb->setChecked(!toggle);});
ui -> m_multi_rb -> setChecked(true); connect(ui->m_singlewire_gb, &QGroupBox::toggled, [this](bool toggle) {this->ui->m_multiwires_gb->setChecked(!toggle);});
ui->m_multiwires_gb->setChecked(true);
ui->m_singlewire_gb->setChecked(true);
} }
/** /**
@@ -190,13 +192,13 @@ void ConductorPropertiesWidget::initWidget() {
void ConductorPropertiesWidget::setConductorType(ConductorProperties::ConductorType type) { void ConductorPropertiesWidget::setConductorType(ConductorProperties::ConductorType type) {
switch (type) { switch (type) {
case ConductorProperties::Multi: case ConductorProperties::Multi:
ui -> m_multi_rb -> setChecked(true); ui -> m_multiwires_gb -> setChecked(true);
break; break;
case ConductorProperties::Single: case ConductorProperties::Single:
ui -> m_single_rb -> setChecked(true); ui -> m_singlewire_gb -> setChecked(true);
break; break;
default: default:
ui -> m_multi_rb -> setChecked(true); ui -> m_multiwires_gb -> setChecked(true);
break; break;
} }
} }

673
sources/ui/conductorpropertieswidget.ui
View File

@@ -6,348 +6,335 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>633</width> <width>354</width>
<height>470</height> <height>329</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QGroupBox" name="m_type_gb"> <widget class="QTabWidget" name="tabWidget">
<property name="title"> <property name="currentIndex">
<string>Type de conducteur</string> <number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <widget class="QWidget" name="type">
<item> <attribute name="title">
<widget class="QRadioButton" name="m_multi_rb"> <string>Type</string>
<property name="toolTip"> </attribute>
<string>Multifilaire</string> <layout class="QVBoxLayout" name="verticalLayout_5">
</property> <item>
<property name="text"> <widget class="QGroupBox" name="m_multiwires_gb">
<string>Multifilaire</string> <property name="title">
</property> <string>Multifilaire</string>
</widget>
</item>
<item>
<widget class="QGroupBox" name="m_multi_gb">
<property name="title">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="topMargin">
<number>0</number>
</property> </property>
<property name="rightMargin"> <property name="checkable">
<number>0</number> <bool>true</bool>
</property> </property>
<property name="bottomMargin"> <property name="checked">
<number>0</number> <bool>false</bool>
</property> </property>
<item> <layout class="QVBoxLayout" name="verticalLayout_3">
<layout class="QHBoxLayout" name="horizontalLayout"> <item>
<item> <layout class="QGridLayout" name="gridLayout_3">
<widget class="QLabel" name="label"> <item row="0" column="0">
<property name="text"> <widget class="QLabel" name="label">
<string>Texte :</string> <property name="text">
</property> <string>Texte :</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QLineEdit" name="m_text_le"> <item row="0" column="3">
<property name="toolTip"> <widget class="QSpinBox" name="m_text_size_sb">
<string>Texte</string> <property name="toolTip">
</property> <string>Taille du texte</string>
<property name="clearButtonEnabled"> </property>
<bool>true</bool> <property name="minimum">
</property> <number>5</number>
</widget> </property>
</item> <property name="maximum">
<item> <number>9</number>
<widget class="QLabel" name="label_2"> </property>
<property name="text"> </widget>
<string>Taille :</string> </item>
</property> <item row="0" column="2">
</widget> <widget class="QLabel" name="label_2">
</item> <property name="text">
<item> <string>Taille :</string>
<widget class="QSpinBox" name="m_text_size_sb"> </property>
<property name="toolTip"> </widget>
<string>Taille du texte</string> </item>
</property> <item row="0" column="1">
<property name="minimum"> <widget class="QLineEdit" name="m_text_le">
<number>5</number> <property name="toolTip">
</property> <string>Texte</string>
<property name="maximum"> </property>
<number>9</number> <property name="clearButtonEnabled">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QCheckBox" name="m_show_text_cb"> <item row="0" column="4">
<property name="toolTip"> <widget class="QCheckBox" name="m_show_text_cb">
<string>Texte visible</string> <property name="toolTip">
</property> <string>Texte visible</string>
<property name="text"> </property>
<string>Visible</string> <property name="text">
</property> <string>Visible</string>
<property name="checked"> </property>
<bool>true</bool> <property name="checked">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
</layout> </item>
</item> </layout>
<item> </item>
<layout class="QVBoxLayout" name="m_autonum_layout"> <item>
<item> <layout class="QVBoxLayout" name="m_autonum_layout">
<widget class="QCheckBox" name="m_one_text_per_folio_cb"> <item>
<property name="toolTip"> <widget class="QCheckBox" name="m_one_text_per_folio_cb">
<string>activer l'option un texte par potentiel</string> <property name="toolTip">
</property> <string>activer l'option un texte par potentiel</string>
<property name="text"> </property>
<string>Afficher un texte de potentiel par folio. </string> <property name="text">
</property> <string>Afficher un texte de potentiel par folio. </string>
</widget> </property>
</item> </widget>
</layout> </item>
</item> </layout>
<item> </item>
<widget class="QLabel" name="label_3"> <item>
<property name="text"> <layout class="QGridLayout" name="m_text_angle_gl">
<string>Rotation du texte de conducteur :</string> <item row="1" column="0">
</property> <widget class="QLabel" name="label_4">
<property name="alignment"> <property name="text">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <string>Vertical</string>
</property> </property>
</widget> <property name="alignment">
</item> <set>Qt::AlignCenter</set>
<item> </property>
<layout class="QGridLayout" name="m_text_angle_gl"> </widget>
<item row="0" column="0"> </item>
<widget class="QLabel" name="label_4"> <item row="1" column="1">
<property name="text"> <widget class="QLabel" name="label_5">
<string>Vertical</string> <property name="text">
</property> <string>Horizontal</string>
<property name="alignment"> </property>
<set>Qt::AlignCenter</set> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
</widget> </property>
</item> </widget>
<item row="0" column="1"> </item>
<widget class="QLabel" name="label_5"> <item row="0" column="0" colspan="2">
<property name="text"> <widget class="QLabel" name="label_3">
<string>Horizontal</string> <property name="text">
</property> <string>Rotation du texte de conducteur :</string>
<property name="alignment"> </property>
<set>Qt::AlignCenter</set> <property name="alignment">
</property> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</widget> </property>
</item> </widget>
</layout> </item>
</item> </layout>
</layout> </item>
</widget> </layout>
</item> </widget>
<item> </item>
<widget class="QRadioButton" name="m_single_rb"> <item>
<property name="toolTip"> <widget class="QGroupBox" name="m_singlewire_gb">
<string>Unifilaire</string> <property name="title">
</property> <string>Unifilaire</string>
<property name="text">
<string>Unifilaire</string>
</property>
</widget>
</item>
<item>
<widget class="QGroupBox" name="m_single_gb">
<property name="title">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property> </property>
<property name="leftMargin"> <property name="flat">
<number>9</number> <bool>false</bool>
</property> </property>
<property name="topMargin"> <property name="checkable">
<number>0</number> <bool>true</bool>
</property> </property>
<property name="rightMargin"> <property name="checked">
<number>0</number> <bool>false</bool>
</property> </property>
<property name="bottomMargin"> <layout class="QVBoxLayout" name="verticalLayout">
<number>0</number> <item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="2">
<widget class="QSlider" name="m_phase_slider">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Nombre de phase</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>3</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="m_neutral_cb">
<property name="toolTip">
<string>Neutre</string>
</property>
<property name="text">
<string>neutre</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/neutral.png</normaloff>:/ico/16x16/neutral.png</iconset>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="m_phase_cb">
<property name="toolTip">
<string>Phase</string>
</property>
<property name="text">
<string>phase</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/phase.png</normaloff>:/ico/16x16/phase.png</iconset>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QSpinBox" name="m_phase_sb">
<property name="toolTip">
<string>Nombre de phase</string>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="m_pen_cb">
<property name="toolTip">
<string>Protective Earth Neutral</string>
</property>
<property name="text">
<string>PEN</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="m_earth_cb">
<property name="toolTip">
<string>Terre</string>
</property>
<property name="text">
<string>terre</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/ground.png</normaloff>:/ico/16x16/ground.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="QLabel" name="m_preview_label">
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="m_update_preview_pb">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="appearance">
<attribute name="title">
<string>Apparence</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>Couleur du conducteur</string>
</property> </property>
<item> <property name="text">
<layout class="QGridLayout" name="gridLayout"> <string>Couleur :</string>
<item row="2" column="2"> </property>
<widget class="QSlider" name="m_phase_slider"> </widget>
<property name="sizePolicy"> </item>
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <item row="1" column="0">
<horstretch>0</horstretch> <widget class="QLabel" name="label_7">
<verstretch>0</verstretch> <property name="toolTip">
</sizepolicy> <string>Style du conducteur</string>
</property> </property>
<property name="toolTip"> <property name="text">
<string>Nombre de phase</string> <string>Style :</string>
</property> </property>
<property name="minimum"> </widget>
<number>1</number> </item>
</property> <item row="1" column="1">
<property name="maximum"> <widget class="QComboBox" name="m_line_style_cb">
<number>3</number> <property name="toolTip">
</property> <string>Style du conducteur</string>
<property name="orientation"> </property>
<enum>Qt::Horizontal</enum> </widget>
</property> </item>
</widget> <item row="0" column="1">
</item> <widget class="QPushButton" name="m_color_pb">
<item row="1" column="1"> <property name="toolTip">
<widget class="QCheckBox" name="m_neutral_cb"> <string>Couleur du conducteur</string>
<property name="toolTip"> </property>
<string>Neutre</string> <property name="accessibleName">
</property> <string/>
<property name="text"> </property>
<string>neutre</string> <property name="autoFillBackground">
</property> <bool>false</bool>
<property name="icon"> </property>
<iconset resource="../../qelectrotech.qrc"> <property name="text">
<normaloff>:/ico/16x16/neutral.png</normaloff>:/ico/16x16/neutral.png</iconset> <string/>
</property> </property>
</widget> <property name="flat">
</item> <bool>false</bool>
<item row="2" column="1"> </property>
<widget class="QCheckBox" name="m_phase_cb"> </widget>
<property name="toolTip"> </item>
<string>Phase</string> <item row="2" column="0">
</property> <spacer name="verticalSpacer">
<property name="text"> <property name="orientation">
<string>phase</string> <enum>Qt::Vertical</enum>
</property> </property>
<property name="icon"> <property name="sizeHint" stdset="0">
<iconset resource="../../qelectrotech.qrc"> <size>
<normaloff>:/ico/16x16/phase.png</normaloff>:/ico/16x16/phase.png</iconset> <width>20</width>
</property> <height>40</height>
</widget> </size>
</item> </property>
<item row="2" column="3"> </spacer>
<widget class="QSpinBox" name="m_phase_sb"> </item>
<property name="toolTip"> </layout>
<string>Nombre de phase</string> </widget>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>3</number>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="m_pen_cb">
<property name="toolTip">
<string>Protective Earth Neutral</string>
</property>
<property name="text">
<string>PEN</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="m_earth_cb">
<property name="toolTip">
<string>Terre</string>
</property>
<property name="text">
<string>terre</string>
</property>
<property name="icon">
<iconset resource="../../qelectrotech.qrc">
<normaloff>:/ico/16x16/ground.png</normaloff>:/ico/16x16/ground.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0" rowspan="3">
<widget class="QLabel" name="m_preview_label">
<property name="text">
<string>TextLabel</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="m_update_preview_pb">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Apparence du conducteur</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="3" column="2">
<widget class="QComboBox" name="m_line_style_cb">
<property name="toolTip">
<string>Style du conducteur</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_6">
<property name="toolTip">
<string>Couleur du conducteur</string>
</property>
<property name="text">
<string>Couleur :</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="m_color_pb">
<property name="toolTip">
<string>Couleur du conducteur</string>
</property>
<property name="accessibleName">
<string/>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="flat">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="label_7">
<property name="toolTip">
<string>Style du conducteur</string>
</property>
<property name="text">
<string>Style :</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -356,22 +343,6 @@
<include location="../../qelectrotech.qrc"/> <include location="../../qelectrotech.qrc"/>
</resources> </resources>
<connections> <connections>
<connection>
<sender>m_multi_rb</sender>
<signal>toggled(bool)</signal>
<receiver>m_multi_gb</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>88</x>
<y>73</y>
</hint>
<hint type="destinationlabel">
<x>54</x>
<y>99</y>
</hint>
</hints>
</connection>
<connection> <connection>
<sender>m_phase_slider</sender> <sender>m_phase_slider</sender>
<signal>valueChanged(int)</signal> <signal>valueChanged(int)</signal>
@@ -404,22 +375,6 @@
</hint> </hint>
</hints> </hints>
</connection> </connection>
<connection>
<sender>m_single_rb</sender>
<signal>toggled(bool)</signal>
<receiver>m_single_gb</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>78</x>
<y>192</y>
</hint>
<hint type="destinationlabel">
<x>81</x>
<y>250</y>
</hint>
</hints>
</connection>
<connection> <connection>
<sender>m_phase_cb</sender> <sender>m_phase_cb</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>