Merge branch 'development' of https://github.com/danielhrisca/asammdf …

…into development/shortcut_tests
danielhrisca · Apr 22, 2024 · 5a11483 · 5a11483
2 parents 36d7e0f + e7f07a9
commit 5a11483
Show file tree

Hide file tree

Showing 7 changed files with 621 additions and 316 deletions.
diff --git a/src/asammdf/gui/ui/numeric_offline.py b/src/asammdf/gui/ui/numeric_offline.py
@@ -27,39 +27,46 @@ def setupUi(self, NumericDisplay):
             NumericDisplay.setObjectName(u"NumericDisplay")
         NumericDisplay.resize(681, 666)
         self.main_layout = QVBoxLayout(NumericDisplay)
-        self.main_layout.setSpacing(4)
+        self.main_layout.setSpacing(2)
         self.main_layout.setObjectName(u"main_layout")
-        self.main_layout.setContentsMargins(4, 4, 4, 4)
+        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.controls = QGroupBox(NumericDisplay)
+        self.controls.setObjectName(u"controls")
+        self.controls.setFlat(True)
+        self.verticalLayout = QVBoxLayout(self.controls)
+        self.verticalLayout.setSpacing(2)
+        self.verticalLayout.setObjectName(u"verticalLayout")
+        self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_2 = QGridLayout()
         self.gridLayout_2.setSpacing(4)
         self.gridLayout_2.setObjectName(u"gridLayout_2")
-        self.toggle_controls_btn = QPushButton(NumericDisplay)
+        self.toggle_controls_btn = QPushButton(self.controls)
         self.toggle_controls_btn.setObjectName(u"toggle_controls_btn")
         icon = QIcon()
         icon.addFile(u":/down.png", QSize(), QIcon.Normal, QIcon.Off)
         self.toggle_controls_btn.setIcon(icon)
 
         self.gridLayout_2.addWidget(self.toggle_controls_btn, 0, 3, 1, 1)
 
-        self.label_5 = QLabel(NumericDisplay)
-        self.label_5.setObjectName(u"label_5")
+        self.controls_label = QLabel(self.controls)
+        self.controls_label.setObjectName(u"controls_label")
 
-        self.gridLayout_2.addWidget(self.label_5, 0, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.controls_label, 0, 0, 1, 1)
 
-        self.float_precision = QComboBox(NumericDisplay)
+        self.float_precision = QComboBox(self.controls)
         self.float_precision.setObjectName(u"float_precision")
 
         self.gridLayout_2.addWidget(self.float_precision, 0, 1, 1, 1)
 
-        self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
+        self.controls_spacer = QSpacerItem(40, 20, QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Minimum)
 
-        self.gridLayout_2.addItem(self.horizontalSpacer, 0, 2, 1, 1)
+        self.gridLayout_2.addItem(self.controls_spacer, 0, 2, 1, 1)
 
         self.gridLayout_2.setColumnStretch(2, 1)
 
-        self.main_layout.addLayout(self.gridLayout_2)
+        self.verticalLayout.addLayout(self.gridLayout_2)
 
-        self.time_group = QGroupBox(NumericDisplay)
+        self.time_group = QGroupBox(self.controls)
         self.time_group.setObjectName(u"time_group")
         self.horizontalLayout_2 = QHBoxLayout(self.time_group)
         self.horizontalLayout_2.setSpacing(4)
@@ -100,9 +107,9 @@ def setupUi(self, NumericDisplay):
         self.horizontalLayout_2.addLayout(self.horizontalLayout)
 
 
-        self.main_layout.addWidget(self.time_group)
+        self.verticalLayout.addWidget(self.time_group)
 
-        self.search_group = QGroupBox(NumericDisplay)
+        self.search_group = QGroupBox(self.controls)
         self.search_group.setObjectName(u"search_group")
         self.gridLayout = QGridLayout(self.search_group)
         self.gridLayout.setSpacing(4)
@@ -182,7 +189,10 @@ def setupUi(self, NumericDisplay):
 
         self.gridLayout.setColumnStretch(1, 1)
 
-        self.main_layout.addWidget(self.search_group)
+        self.verticalLayout.addWidget(self.search_group)
+
+
+        self.main_layout.addWidget(self.controls)
 
         QWidget.setTabOrder(self.timestamp, self.pattern_match)
         QWidget.setTabOrder(self.pattern_match, self.op)
@@ -197,8 +207,9 @@ def setupUi(self, NumericDisplay):
 
     def retranslateUi(self, NumericDisplay):
         NumericDisplay.setWindowTitle(QCoreApplication.translate("NumericDisplay", u"Form", None))
+        self.controls.setTitle("")
         self.toggle_controls_btn.setText(QCoreApplication.translate("NumericDisplay", u"Show controls", None))
-        self.label_5.setText(QCoreApplication.translate("NumericDisplay", u"Float precision", None))
+        self.controls_label.setText(QCoreApplication.translate("NumericDisplay", u"Precision", None))
         self.time_group.setTitle(QCoreApplication.translate("NumericDisplay", u"Time stamp", None))
         self.timestamp.setSuffix(QCoreApplication.translate("NumericDisplay", u"s", None))
         self.min_t.setText("")
@@ -226,3 +237,4 @@ def retranslateUi(self, NumericDisplay):
         self.forward.setText("")
         self.match.setText("")
     # retranslateUi
+