Changeset 11342 for trunk

Timestamp:

07/11/11 16:03:44 (13 years ago)

Author:

tbretz

Message:

Divided Reset into soft and hard reset.

Location:

trunk/FACT++

Files:

• gui/MainWindow.cc (modified) (1 diff)
• gui/MainWindow.h (modified) (1 diff)
• gui/design.ui (modified) (5 diffs)
• src/fadctrl.cc (modified) (2 diffs)

trunk/FACT++/gui/MainWindow.cc

@@ -263 +263 @@
 }
 
-void MainWindow::on_fFadReset_clicked()
-{
-    Dim::SendCommand("FAD_CONTROL/RESET");
+void MainWindow::on_fFadSoftReset_clicked()
+{
+    Dim::SendCommand("FAD_CONTROL/SOFT_RESET");
+}
+
+void MainWindow::on_fFadHardReset_clicked()
+{
+    Dim::SendCommand("FAD_CONTROL/HARD_RESET");
 }
 

trunk/FACT++/gui/MainWindow.h

@@ -37 +37 @@
     void on_fFadStop_clicked();
     void on_fFadAbort_clicked();
-    void on_fFadReset_clicked();
+    void on_fFadSoftReset_clicked();
+    void on_fFadHardReset_clicked();
 
     void on_fLoggerStart_clicked();

trunk/FACT++/gui/design.ui

@@ -53 +53 @@
       </property>
       <property name="currentIndex">
-       <number>6</number>
+       <number>3</number>
       </property>
       <property name="documentMode">
@@ -4867 +4867 @@
                  <property name="geometry">
                   <rect>
-                   <x>40</x>
+                   <x>10</x>
                    <y>20</y>
                    <width>423</width>
@@ -7248 +7248 @@
    <property name="minimumSize">
     <size>
-     <width>223</width>
-     <height>596</height>
+     <width>0</width>
+     <height>620</height>
     </size>
    </property>
@@ -7951 +7951 @@
         </widget>
        </item>
-       <item row="1" column="1">
+       <item row="0" column="2">
         <widget class="QPushButton" name="fFadAbort">
          <property name="text">
@@ -7958 +7958 @@
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QPushButton" name="fFadReset">
-         <property name="text">
-          <string>Reset</string>
-         </property>
-        </widget>
+       <item row="1" column="0" colspan="3">
+        <layout class="QHBoxLayout" name="horizontalLayout_26">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QPushButton" name="fFadSoftReset">
+           <property name="text">
+            <string>Soft Reset</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="fFadHardReset">
+           <property name="text">
+            <string>Hard Reset</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
       </layout>

trunk/FACT++/src/fadctrl.cc

@@ -1184 +1184 @@
     }
 
-    int Reset()
-    {
-        ResetThread();
+    int Reset(bool soft)
+    {
+        ResetThread(soft);
         return T::GetCurrentState();
     }
@@ -1532 +1532 @@
             ("Immediately abort EventBuilder thread and disconnect all slots.");
 
-        T::AddEvent("RESET", FAD::kDisconnected)
-            (boost::bind(&StateMachineFAD::Reset, this))
-            ("Flush all buffers, close all files  and reinitialize event builder thread.");
+        T::AddEvent("SOFT_RESET", FAD::kConnected)
+            (boost::bind(&StateMachineFAD::Reset, this, true))
+            ("Wait for buffers to drain, close all files and reinitialize event builder thread.");
+
+        T::AddEvent("HARD_RESET", FAD::kConnected)
+            (boost::bind(&StateMachineFAD::Reset, this, false))
+            ("Free all buffers, close all files and reinitialize event builder thread.");
 
         T::AddEvent("CONNECT", "S:1", FAD::kDisconnected, FAD::kConnecting, FAD::kConnected)