Changeset 11112 for trunk/FACT++

Timestamp:

06/22/11 17:50:37 (13 years ago)

Author:

tbretz

Message:

Added TOGGLE for singel FAD connections.

Location:

trunk/FACT++

Files:

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

trunk/FACT++/gui/MainWindow.cc

@@ -208 +208 @@
 }
 
+void MainWindow::slot_fFadLED_clicked()
+{
+    for (int32_t i=0; i<40; i++)
+        if (sender()==fFadLED[i])
+        {
+            Dim::SendCommand("FAD_CONTROL/TOGGLE", i);
+            break;
+        }
+}
+
 void MainWindow::SetTriggerSequence()
 {

trunk/FACT++/gui/MainWindow.h

@@ -121 +121 @@
 
     // Tab: FADs
-    void slot_fFadLED_clicked() { }
+    void slot_fFadLED_clicked();
 
     // Tab: Chat

trunk/FACT++/src/fadctrl.cc

@@ -1108 +1108 @@
         if (it==fBoards.end())
             return T::GetCurrentState();
+
+        EnableConnection(it->second, enable);
+        ConnectSlot(it->first, enable ? it->second.first : tcp::endpoint());
+
+        return T::GetCurrentState();
+    }
+
+    int ToggleSlot(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "ToggleSlot", 2))
+            return T::kSM_FatalError;
+
+        const int16_t slot = evt.GetShort();
+
+        const BoardList::iterator it = GetSlot(slot);
+        if (it==fBoards.end())
+            return T::GetCurrentState();
+
+        const bool enable = it->second.second->IsDisconnected() && fStatus2[slot]==0;
 
         EnableConnection(it->second, enable);
@@ -1460 +1479 @@
             ("Disconnect a connected slot.");
 
+        T::AddEvent("TOGGLE", "S:1", FAD::kDisconnected, FAD::kConnecting, FAD::kConnected)
+            (boost::bind(&StateMachineFAD::ToggleSlot, this, _1))
+            ("");
+
         T::AddEvent("CLOSE_OPEN_FILES", FAD::kConnecting, FAD::kConnected)
             (boost::bind(&StateMachineFAD::CloseOpenFiles, this))