Add initial results output to recv results page

reilleya · Apr 30, 2020 · 212cfe8 · 212cfe8
1 parent 2c7f678
commit 212cfe8
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 12 deletions.
diff --git a/ui/mainWindow.py b/ui/mainWindow.py
@@ -122,7 +122,7 @@ def gotoEditTransducerPage(self):
         self.gotoPage(MainWindowPages.EDIT_TRANSDUCER)
 
     def gotoRecvResultsPage(self):
-        self.ui.pageRecvResults.setup()
+        self.ui.pageRecvResults.reset()
         self.gotoPage(MainWindowPages.RECV_RESULTS)
 
     def exitResults(self):

diff --git a/ui/recvResultsWidget.py b/ui/recvResultsWidget.py
@@ -25,25 +25,34 @@ def __init__(self):
 
         self.ui.pushButtonBack.pressed.connect(self.back.emit)
 
-        self.setup()
+        self.reset()
 
-    def setup(self):
+    def reset(self):
         self.ui.widgetMotorConfig.loadProperties(MotorConfig())
         self.ui.widgetTransducerSelector.reset()
+        self.ui.lineEditInitialResults.setText('0 s')
+        self.ui.pushButtonConnect.setEnabled(True)
         self.firing = None
 
     def connect(self):
+        self.ui.pushButtonConnect.setEnabled(False)
         port = self.ui.widgetPortSelector.getPort()
         self.forceConv, self.pressConv = self.ui.widgetTransducerSelector.getConverters()
 
         motorConfig = MotorConfig()
         motorConfig.setProperties(self.ui.widgetMotorConfig.getProperties())
         self.firing = Firing(self.forceConv, self.pressConv, motorConfig, port)
         self.firing.newGraph.connect(QApplication.instance().newResult)
-        self.firing.fullSizeKnown.connect(QApplication.instance().configureLiveResults)
+        self.firing.fullSizeKnown.connect(self.gotoResults)
         self.firing.newResultsPacket.connect(QApplication.instance().newResultsPacket)
+        self.firing.initialResultsTime.connect(self.initialResultsTime)
 
+    def initialResultsTime(self, time):
+        self.ui.lineEditInitialResults.setText('{:.2f} s'.format(time))
+
+    def gotoResults(self, resultsSize):
         self.results.emit()
+        QApplication.instance().configureLiveResults(resultsSize)
 
     def exit(self): # TODO: confirm before closing if connected to radio
         if self.firing is not None:

diff --git a/ui/views/forms/RecvResultsWidget.ui b/ui/views/forms/RecvResultsWidget.ui
@@ -50,6 +50,36 @@
         </item>
        </layout>
       </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <item>
+         <spacer name="horizontalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QPushButton" name="pushButtonConnect">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="text">
+           <string>Connect</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </widget>
    </item>
@@ -92,12 +122,39 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="pushButtonConnect">
-       <property name="enabled">
-        <bool>true</bool>
+      <widget class="QLabel" name="labelInitialResults">
+       <property name="text">
+        <string>Initial Results:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="lineEditInitialResults">
+       <property name="minimumSize">
+        <size>
+         <width>150</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>150</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>DejaVu Sans Mono</family>
+        </font>
        </property>
        <property name="text">
-        <string>Connect</string>
+        <string>0 s</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
        </property>
       </widget>
      </item>
@@ -107,15 +164,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>CollectionEditor</class>
+   <class>PortSelectorWidget</class>
    <extends>QWidget</extends>
-   <header location="global">pyFormGen.collectionEditor</header>
+   <header location="global">ui.portSelectorWidget</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>PortSelectorWidget</class>
+   <class>CollectionEditor</class>
    <extends>QWidget</extends>
-   <header location="global">ui.portSelectorWidget</header>
+   <header location="global">pyFormGen.collectionEditor</header>
    <container>1</container>
   </customwidget>
   <customwidget>