Changeset 10716 for trunk

Timestamp:

05/16/11 15:47:30 (14 years ago)

Author:

tbretz

Message:

Changed 1338 to 1440, fixed initialization in camera widget, enabled time display on temp axis.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -26 +26 @@
 #include "TMarker.h"
 #include "TColor.h"
-
-#define HAS_ROOT
 
 using namespace std;
@@ -53 +51 @@
         double bb[5] = {0., 1.00, 0.00, 0.00, 1.00};
 
-        const Int_t nn = 1438;
+        const Int_t nn = 1440;
 
         Int_t idx = TColor::CreateGradientColorTable(5, ss, rr, gg, bb, nn);
@@ -120 +118 @@
 
     valarray<double> fData;
-    map<int, bool>   fBold;
-    map<int, bool>   fEnable;
+    vector<bool>   fBold;
+    vector<bool>   fEnable;
 
     int fWhite;
 
 public:
-    Camera() : fData(0., 1438), fWhite(-1)
+    Camera() : fData(1440), fBold(1440), fEnable(1440), fWhite(-1)
     {
         CreatePalette();
         CreateGeometry();
 
-        for (int i=0; i<1438; i++)
-            fData[i] = i;
+        for (int i=0; i<1440; i++)
+        {
+            fData[i] = i;
+            fBold[i]=false;
+            fEnable[i]=true;
+        }
     }
 
@@ -205 +207 @@
 
             Paint(*p);
-        }
+        }
 
         line.SetLineWidth(2);
@@ -910 +912 @@
 
         // ----------------------------------------------
-#ifdef HAS_ROOT
+#ifdef HAVE_ROOT
         TCanvas *c = fFtmTempCanv->GetCanvas();
 
-        static int cntr = 0;
-        double_t tm = cntr++;//Time().RootTime();
+//        static int cntr = 0;
+//        double_t tm = cntr++;//Time().RootTime();
+
+        double tm = d.time.RootTime();
+
+        cout << tm << endl;
 
         TH1 *h = (TH1*)c->FindObject("MyFrame");
@@ -929 +935 @@
         // ----------------------------------------------
 
-        valarray<double> dat(0., 1438);
-
-        for (int i=0; i<1438; i++)
+        valarray<double> dat(0., 1440);
+
+        for (int i=0; i<1440; i++)
             dat[i] = sdata.fRatePatch[fPatch[i]];
 
@@ -1048 +1054 @@
         SetFtuStatusLed(d.time);
 
-#ifdef HAS_ROOT
+#ifdef HAVE_ROOT
         Camera *cam = (Camera*)fRatesCanv->GetCanvas()->FindObject("Camera");
-        for (int i=0; i<1438; i++)
+        for (int i=0; i<1440; i++)
             cam->SetEnable(i, sdata.IsEnabled(i));
 #endif
@@ -1525 +1531 @@
     }
 
-#ifdef HAS_ROOT
+#ifdef HAVE_ROOT
     void slot_RootEventProcessed(TObject *obj, unsigned int evt, TCanvas *)
     {
@@ -1680 +1686 @@
 
         // --------------------------------------------------------------------------
-#ifdef HAS_ROOT
+#ifdef HAVE_ROOT
         TCanvas *c = fFtmTempCanv->GetCanvas();
         c->SetBit(TCanvas::kNoContextMenu);
@@ -1699 +1705 @@
         h.SetYTitle("Temperature / °C");
         h.GetXaxis()->CenterTitle();
-        h.GetYaxis()->CenterTitle();
-//        h.GetXaxis()->SetTitleSize(1.2);
+        h.GetYaxis()->CenterTitle();
+        h.GetXaxis()->SetTimeDisplay(true);
+        h.GetXaxis()->SetTimeFormat("%H:%M");
+        h.GetXaxis()->SetLabelSize(0.025);
 //        h.GetYaxis()->SetTitleSize(1.2);
         h.DrawCopy();