From adb8ec7f0eca91f09dad380990de4a6ca11e21b8 Mon Sep 17 00:00:00 2001 From: Andrew Reilley Date: Sun, 31 May 2020 19:06:58 -0400 Subject: [PATCH] Update pyFormGen, add dividers to fire widget --- requirements.txt | 2 +- ui/views/forms/FireWidget.ui | 24 +++++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index ba8947b..56d4451 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ PyQt5==5.14.2 PyQt5-sip==12.7.2 PyYAML==5.1 pySerial==3.4 -git+https://github.com/reilleya/pyFormGen.git@c6c2c2ad57ad7243b055d46fa8d8cafc912ceec2 +git+https://github.com/reilleya/pyFormGen.git@8456db822069678418b334657816e192613ce43f git+https://github.com/reilleya/pyFileIO.git diff --git a/ui/views/forms/FireWidget.ui b/ui/views/forms/FireWidget.ui index 5201709..330c30c 100644 --- a/ui/views/forms/FireWidget.ui +++ b/ui/views/forms/FireWidget.ui @@ -86,6 +86,13 @@ + + + + Qt::Horizontal + + + @@ -104,6 +111,13 @@ + + + + Qt::Vertical + + + @@ -603,6 +617,11 @@ + + DataAgeWidget + QLineEdit +
ui.dataAgeWidget
+
CollectionEditor QWidget @@ -615,11 +634,6 @@
ui.portSelectorWidget
1
- - DataAgeWidget - QLineEdit -
ui.dataAgeWidget
-
TransducerSelectorWidget QWidget