Changeset 11764 for trunk

Timestamp:

08/03/11 20:16:16 (13 years ago)

Author:

tbretz

Message:

Fixed the missing color for the horizontal histograms in the Raw data tab.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -1158 +1158 @@
 
             box->SetFillStyle(0);
-            box->SetLineColor(h.GetMarkerColor());
+            box->SetLineColor(h.GetLineColor());
             box->SetLineStyle(kSolid);
             box->SetBit(kCannotPick|kNoContextMenu);
@@ -1166 +1166 @@
         }
     }
-
-    /*
-    void DrawHori(TH1 *h)
-    {
-        //Draw histogram h horizontaly with bars
-        Double_t ymin = h->GetMinimum();
-        Double_t ymax = 1.05*h->GetMaximum();
-
-        TAxis *axis   = ;
-
-        Double_t xmin = h->GetXaxis()->GetXmin();
-        Double_t xmax = h->GetXaxis()->GetXmax();
-
-        Int_t nbins   = h->GetXaxis()->GetNbins();
-
-        //TH2F *h2 = new TH2F("h2",h->GetTitle(),10,ymin,ymax,nbins,xmin,xmax);
-        //h2->SetBit(kCanDelete);
-        //h2->SetDirectory(0);
-        //h2->SetStats(0);
-        //h2->Draw();
-        TBox box;
-        //Int_t color = h->GetFillColor();
-        //if (color == 0) color = 1;
-        box.SetFillColor(color);
-        Double_t dy;
-        Double_t x1,y1,x2,y2;
-        for (Int_t i=1;i<=nbins;i++)
-        {
-            dy = axis->GetBinWidth(i);
-
-            x1 = 0;
-            x2 = h->GetBinContent(i);
-
-            y1 = h->GetBinCenter(i)-0.3*dy;
-            y2 = h->GetBinCenter(i)+0.3*dy;
-
-            box.DrawBox(x1,y1,x2,y2);
-        }
-    }*/
 
     void DisplayEventData()
@@ -1388 +1349 @@
         h1.SetDirectory(0);
         h2.SetDirectory(0);
+        hd.SetLineColor(h->GetLineColor());
+        h0.SetLineColor(d0->GetLineColor());
+        h1.SetLineColor(d1->GetLineColor());
+        h2.SetLineColor(d2->GetLineColor());
 
         for (int i=0; i<fEventData->Roi; i++)
@@ -1412 +1377 @@
 
         const double l = h->GetBinLowEdge(h->GetXaxis()->GetLast()+1);
-        const double m = c->GetX2(); // X2()-X1()
+        const double m = c->GetX2();
 
         const double scale = 0.9*(m-l)/mm;
@@ -1422 +1387 @@
         DrawHorizontal(hf, l, h0, scale);
         DrawHorizontal(hf, l, hd, scale);
-//        DrawHorizontal(hf, l, &h1);
-//        DrawHorizontal(hf, l, &h2);
 
         // -----------------------------------------------------------
@@ -1466 +1429 @@
             return;
 
-        static int i=0;
-        if (i++%10>0)
+        static int cnt=0;
+        if (cnt++%10>0)
             return;
 
@@ -1527 +1490 @@
         fDrsRuns[1] = run[1];
         fDrsRuns[2] = run[2];
-
-        cout << "Received: " << run[0] << " " << run[1] << " " << run[2] << endl;
 
         const float *dat = d.ptr<float>(sizeof(uint32_t)*3);