Skip to content

Commit 6a53e7a

Browse files
t-sommert-sommer
committed
Remove checkboxes from import dialog
1 parent 555b668 commit 6a53e7a

File tree

4 files changed

+67
-115
lines changed

4 files changed

+67
-115
lines changed

‎modelica_fmi/src/modelica_fmi/gui/__init__.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ def main():
8383
import_fmu_to_modelica(
8484
fmu_path=dialog.ui.fmuPathLineEdit.text(),
8585
model_path=dialog.ui.modelPathLineEdit.text(),
86-
basic=dialog.ui.basicCheckBox.isChecked(),
87-
hide_connectors=dialog.ui.hideConnectorsCheckBox.isChecked(),
8886
)
8987
except Exception as ex:
9088
QMessageBox.critical(dialog, "Failed to import FMU", str(ex))

‎modelica_fmi/src/modelica_fmi/gui/forms/ImportDialog.ui‎

Lines changed: 20 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
10-
<height>300</height>
9+
<width>529</width>
10+
<height>148</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -33,6 +33,23 @@
3333
<property name="spacing">
3434
<number>12</number>
3535
</property>
36+
<item row="0" column="0">
37+
<widget class="QLabel" name="label">
38+
<property name="text">
39+
<string>FMU</string>
40+
</property>
41+
</widget>
42+
</item>
43+
<item row="4" column="0" colspan="2">
44+
<widget class="QDialogButtonBox" name="buttonBox">
45+
<property name="orientation">
46+
<enum>Qt::Orientation::Horizontal</enum>
47+
</property>
48+
<property name="standardButtons">
49+
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
50+
</property>
51+
</widget>
52+
</item>
3653
<item row="1" column="0">
3754
<widget class="QLabel" name="mo">
3855
<property name="text">
@@ -96,14 +113,7 @@
96113
</layout>
97114
</widget>
98115
</item>
99-
<item row="0" column="0">
100-
<widget class="QLabel" name="label">
101-
<property name="text">
102-
<string>FMU</string>
103-
</property>
104-
</widget>
105-
</item>
106-
<item row="5" column="0">
116+
<item row="3" column="0">
107117
<spacer name="verticalSpacer">
108118
<property name="orientation">
109119
<enum>Qt::Orientation::Vertical</enum>
@@ -116,30 +126,6 @@
116126
</property>
117127
</spacer>
118128
</item>
119-
<item row="6" column="0" colspan="2">
120-
<widget class="QDialogButtonBox" name="buttonBox">
121-
<property name="orientation">
122-
<enum>Qt::Orientation::Horizontal</enum>
123-
</property>
124-
<property name="standardButtons">
125-
<set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
126-
</property>
127-
</widget>
128-
</item>
129-
<item row="3" column="0" colspan="2">
130-
<widget class="QCheckBox" name="basicCheckBox">
131-
<property name="text">
132-
<string>Basic Co-Simulation</string>
133-
</property>
134-
</widget>
135-
</item>
136-
<item row="4" column="0" colspan="2">
137-
<widget class="QCheckBox" name="hideConnectorsCheckBox">
138-
<property name="text">
139-
<string>Hide Connectors</string>
140-
</property>
141-
</widget>
142-
</item>
143129
</layout>
144130
</widget>
145131
<resources>

‎modelica_fmi/src/modelica_fmi/gui/generated/ImportDialog.py‎

Lines changed: 46 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -8,132 +8,100 @@
88
## WARNING! All changes made in this file will be lost when recompiling UI file!
99
################################################################################
1010

11-
from PySide6.QtCore import QCoreApplication, QMetaObject, QSize, Qt
12-
from PySide6.QtGui import QIcon
13-
from PySide6.QtWidgets import (
14-
QCheckBox,
15-
QDialogButtonBox,
16-
QGridLayout,
17-
QHBoxLayout,
18-
QLabel,
19-
QLineEdit,
20-
QSizePolicy,
21-
QSpacerItem,
22-
QToolButton,
23-
QWidget,
24-
)
25-
11+
from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
12+
QMetaObject, QObject, QPoint, QRect,
13+
QSize, QTime, QUrl, Qt)
14+
from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
15+
QFont, QFontDatabase, QGradient, QIcon,
16+
QImage, QKeySequence, QLinearGradient, QPainter,
17+
QPalette, QPixmap, QRadialGradient, QTransform)
18+
from PySide6.QtWidgets import (QAbstractButton, QApplication, QDialog, QDialogButtonBox,
19+
QGridLayout, QHBoxLayout, QLabel, QLineEdit,
20+
QSizePolicy, QSpacerItem, QToolButton, QWidget)
21+
from . import icons_rc
2622

2723
class Ui_ImportDialog(object):
2824
def setupUi(self, ImportDialog):
2925
if not ImportDialog.objectName():
30-
ImportDialog.setObjectName("ImportDialog")
31-
ImportDialog.resize(400, 300)
26+
ImportDialog.setObjectName(u"ImportDialog")
27+
ImportDialog.resize(529, 148)
3228
icon = QIcon()
33-
icon.addFile(":/fmi.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
29+
icon.addFile(u":/fmi.svg", QSize(), QIcon.Mode.Normal, QIcon.State.Off)
3430
ImportDialog.setWindowIcon(icon)
3531
self.gridLayout = QGridLayout(ImportDialog)
3632
self.gridLayout.setSpacing(12)
37-
self.gridLayout.setObjectName("gridLayout")
33+
self.gridLayout.setObjectName(u"gridLayout")
3834
self.gridLayout.setContentsMargins(12, 12, 12, 12)
35+
self.label = QLabel(ImportDialog)
36+
self.label.setObjectName(u"label")
37+
38+
self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
39+
40+
self.buttonBox = QDialogButtonBox(ImportDialog)
41+
self.buttonBox.setObjectName(u"buttonBox")
42+
self.buttonBox.setOrientation(Qt.Orientation.Horizontal)
43+
self.buttonBox.setStandardButtons(QDialogButtonBox.StandardButton.Cancel|QDialogButtonBox.StandardButton.Ok)
44+
45+
self.gridLayout.addWidget(self.buttonBox, 4, 0, 1, 2)
46+
3947
self.mo = QLabel(ImportDialog)
40-
self.mo.setObjectName("mo")
48+
self.mo.setObjectName(u"mo")
4149

4250
self.gridLayout.addWidget(self.mo, 1, 0, 1, 1)
4351

4452
self.widget = QWidget(ImportDialog)
45-
self.widget.setObjectName("widget")
53+
self.widget.setObjectName(u"widget")
4654
self.horizontalLayout = QHBoxLayout(self.widget)
47-
self.horizontalLayout.setObjectName("horizontalLayout")
55+
self.horizontalLayout.setObjectName(u"horizontalLayout")
4856
self.horizontalLayout.setContentsMargins(0, 0, 0, 0)
4957
self.modelPathLineEdit = QLineEdit(self.widget)
50-
self.modelPathLineEdit.setObjectName("modelPathLineEdit")
58+
self.modelPathLineEdit.setObjectName(u"modelPathLineEdit")
5159

5260
self.horizontalLayout.addWidget(self.modelPathLineEdit)
5361

5462
self.selectModelPathButton = QToolButton(self.widget)
55-
self.selectModelPathButton.setObjectName("selectModelPathButton")
63+
self.selectModelPathButton.setObjectName(u"selectModelPathButton")
5664

5765
self.horizontalLayout.addWidget(self.selectModelPathButton)
5866

67+
5968
self.gridLayout.addWidget(self.widget, 1, 1, 1, 1)
6069

6170
self.widget_2 = QWidget(ImportDialog)
62-
self.widget_2.setObjectName("widget_2")
71+
self.widget_2.setObjectName(u"widget_2")
6372
self.horizontalLayout_2 = QHBoxLayout(self.widget_2)
64-
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
73+
self.horizontalLayout_2.setObjectName(u"horizontalLayout_2")
6574
self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
6675
self.fmuPathLineEdit = QLineEdit(self.widget_2)
67-
self.fmuPathLineEdit.setObjectName("fmuPathLineEdit")
76+
self.fmuPathLineEdit.setObjectName(u"fmuPathLineEdit")
6877

6978
self.horizontalLayout_2.addWidget(self.fmuPathLineEdit)
7079

7180
self.selectFMUPathButton = QToolButton(self.widget_2)
72-
self.selectFMUPathButton.setObjectName("selectFMUPathButton")
81+
self.selectFMUPathButton.setObjectName(u"selectFMUPathButton")
7382

7483
self.horizontalLayout_2.addWidget(self.selectFMUPathButton)
7584

76-
self.gridLayout.addWidget(self.widget_2, 0, 1, 1, 1)
77-
78-
self.label = QLabel(ImportDialog)
79-
self.label.setObjectName("label")
8085

81-
self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
82-
83-
self.verticalSpacer = QSpacerItem(
84-
20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding
85-
)
86-
87-
self.gridLayout.addItem(self.verticalSpacer, 5, 0, 1, 1)
88-
89-
self.buttonBox = QDialogButtonBox(ImportDialog)
90-
self.buttonBox.setObjectName("buttonBox")
91-
self.buttonBox.setOrientation(Qt.Orientation.Horizontal)
92-
self.buttonBox.setStandardButtons(
93-
QDialogButtonBox.StandardButton.Cancel | QDialogButtonBox.StandardButton.Ok
94-
)
95-
96-
self.gridLayout.addWidget(self.buttonBox, 6, 0, 1, 2)
97-
98-
self.basicCheckBox = QCheckBox(ImportDialog)
99-
self.basicCheckBox.setObjectName("basicCheckBox")
86+
self.gridLayout.addWidget(self.widget_2, 0, 1, 1, 1)
10087

101-
self.gridLayout.addWidget(self.basicCheckBox, 3, 0, 1, 2)
88+
self.verticalSpacer = QSpacerItem(20, 40, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Expanding)
10289

103-
self.hideConnectorsCheckBox = QCheckBox(ImportDialog)
104-
self.hideConnectorsCheckBox.setObjectName("hideConnectorsCheckBox")
90+
self.gridLayout.addItem(self.verticalSpacer, 3, 0, 1, 1)
10591

106-
self.gridLayout.addWidget(self.hideConnectorsCheckBox, 4, 0, 1, 2)
10792

10893
self.retranslateUi(ImportDialog)
10994
self.buttonBox.accepted.connect(ImportDialog.accept)
11095
self.buttonBox.rejected.connect(ImportDialog.reject)
11196

11297
QMetaObject.connectSlotsByName(ImportDialog)
113-
11498
# setupUi
11599

116100
def retranslateUi(self, ImportDialog):
117-
ImportDialog.setWindowTitle(
118-
QCoreApplication.translate(
119-
"ImportDialog", "Import an FMU to Modelica", None
120-
)
121-
)
122-
self.mo.setText(
123-
QCoreApplication.translate("ImportDialog", "Modelica File", None)
124-
)
125-
self.selectModelPathButton.setText(
126-
QCoreApplication.translate("ImportDialog", "...", None)
127-
)
128-
self.selectFMUPathButton.setText(
129-
QCoreApplication.translate("ImportDialog", "...", None)
130-
)
131-
self.label.setText(QCoreApplication.translate("ImportDialog", "FMU", None))
132-
self.basicCheckBox.setText(
133-
QCoreApplication.translate("ImportDialog", "Basic Co-Simulation", None)
134-
)
135-
self.hideConnectorsCheckBox.setText(
136-
QCoreApplication.translate("ImportDialog", "Hide Connectors", None)
137-
)
138-
101+
ImportDialog.setWindowTitle(QCoreApplication.translate("ImportDialog", u"Import an FMU to Modelica", None))
102+
self.label.setText(QCoreApplication.translate("ImportDialog", u"FMU", None))
103+
self.mo.setText(QCoreApplication.translate("ImportDialog", u"Modelica File", None))
104+
self.selectModelPathButton.setText(QCoreApplication.translate("ImportDialog", u"...", None))
105+
self.selectFMUPathButton.setText(QCoreApplication.translate("ImportDialog", u"...", None))
139106
# retranslateUi
107+

‎modelica_fmi/src/modelica_fmi/gui/generated/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
from . import icons_rc
1+
from . import icons_rc

0 commit comments

Comments
 (0)