Changeset 18950 for trunk/FACT++/gui

Timestamp:

03/05/18 12:24:00 (7 years ago)

Author:

tbretz

Message:

the ifdef's to compile without root support were not correctly placed - fixed.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -945 +945 @@
 
     EVENT *fEventData;
-
+#ifdef HAVE_ROOT
     void DrawHorizontal(TH1 *hf, double xmax, TH1 &h, double scale)
     {
@@ -966 +966 @@
         }
     }
-
+#endif
     void DisplayEventData()
     {
@@ -2326 +2326 @@
 
     // ======================= Rate Scan ====================================
-
+#ifdef HAVE_ROOT
     TGraph fGraphRateScan[201];
-
+#endif
     void UpdateRateScan(uint32_t th, const float *rates)
     {
@@ -3201 +3201 @@
     }
 
+    void slot_RootEventProcessed(TObject *obj, unsigned int evt, TCanvas *canv)
+    {
 #ifdef HAVE_ROOT
-    void slot_RootEventProcessed(TObject *obj, unsigned int evt, TCanvas *canv)
-    {
         // kMousePressEvent       // TCanvas processed QEvent mousePressEvent
         // kMouseMoveEvent        // TCanvas processed QEvent mouseMoveEvent
@@ -3252 +3252 @@
         //gSystem->ProcessEvents();
         //QWhatsThis::display(tipText)
+#endif
     }
 
     void slot_RootUpdate()
     {
+#ifdef HAVE_ROOT
         gSystem->DispatchOneEvent(kFALSE);
         //gSystem->ProcessEvents();
         QTimer::singleShot(10, this, SLOT(slot_RootUpdate()));
-    }
 #endif
+    }
 
     void ChoosePatchThreshold(Camera &cam, int isw)
@@ -3535 +3537 @@
     }
 
+#ifdef HAVE_ROOT
     TGraph fGraphFtmTemp[4];
     TGraph fGraphFtmRate;
@@ -3540 +3543 @@
     TGraph fGraphBoardRate[40];
 
-#ifdef HAVE_ROOT
     TH1 *DrawTimeFrame(const char *ytitle)
     {