Changeset 10781 for trunk/FACT++

Timestamp:

05/23/11 15:05:17 (14 years ago)

Author:

tbretz

Message:

Commented out obsolete FAD stuff, implemented (untested) double click on axis for unzoom

File:

• trunk/FACT++/gui/FactGui.h (modified) (7 diffs)

trunk/FACT++/gui/FactGui.h

@@ -344 +344 @@
     DimStampedInfo fDimFtmDynamicData;
     DimStampedInfo fDimFtmCounter;
-
+/*
     DimStampedInfo fDimFadPassport;
     DimStampedInfo fDimFadTemperatures;
     DimStampedInfo fDimFadSetup;
-
+*/
     map<string, DimInfo*> fServices;
 
@@ -857 +857 @@
 
     // ===================== FAD ============================================
-
+/*
     void handleFadPassport(const DimData &d)
     {
@@ -911 +911 @@
 
     }
-
+*/
     // ===================== FTM ============================================
 
@@ -1648 +1648 @@
         if (getInfo()==&fDimLoggerStats)
             return PostInfoHandler(&FactGui::handleLoggerStats);
-
+/*
         if (getInfo()==&fDimFadTemperatures)
             return PostInfoHandler(&FactGui::handleFadTemperatures);
@@ -1654 +1654 @@
         if (getInfo()==&fDimFadSetup)
             return PostInfoHandler(&FactGui::handleFadSetup);
-
+*/
         if (getInfo()==&fDimLoggerFilenameNight)
             return PostInfoHandler(&FactGui::handleLoggerFilenameNight);
@@ -1822 +1822 @@
                 Dim::SendCommand("FTM_CONTROL/TOGGLE_PIXEL", uint16_t(idx));
             }
+
+            if (dynamic_cast<TAxis*>(obj))
+                static_cast<TAxis*>(obj)->UnZoom();
+
             return;
         }
@@ -1931 +1935 @@
         fDimFtmStaticData    ("FTM_CONTROL/STATIC_DATA",     (void*)NULL, 0, this),
         fDimFtmDynamicData   ("FTM_CONTROL/DYNAMIC_DATA",    (void*)NULL, 0, this),
-        fDimFtmCounter       ("FTM_CONTROL/COUNTER",         (void*)NULL, 0, this),
-        fDimFadPassport      ("FAD_CONTROL/PASSPORT",        (void*)NULL, 0, this),
+        fDimFtmCounter       ("FTM_CONTROL/COUNTER",         (void*)NULL, 0, this)
+         /*
+        , fDimFadPassport      ("FAD_CONTROL/PASSPORT",        (void*)NULL, 0, this),
         fDimFadTemperatures  ("FAD_CONTROL/TEMPERATURES",    (void*)NULL, 0, this),
-        fDimFadSetup         ("FAD_CONTROL/SETUP",           (void*)NULL, 0, this)
+        fDimFadSetup         ("FAD_CONTROL/SETUP",           (void*)NULL, 0, this)*/
     {
         fTriggerWidget->setEnabled(false);