Changeset 13823

Timestamp:

05/23/12 10:00:21 (13 years ago)

Author:

tbretz

Message:

Replaced cd() by GetListOfPrimitives()->Add(). Strictly speaking this is not necessary, but a cleaner solution.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -28 +28 @@
 #include "src/DimData.h"
 
+#ifdef HAVE_ROOT
 #include "TROOT.h"
 #include "TSystem.h"
@@ -37 +38 @@
 #include "TMarker.h"
 #include "TColor.h"
+#endif
 
 #include "QCameraWidget.h"
@@ -1019 +1021 @@
         }
 
-        c->cd();
-
         if (!hf)
         {
@@ -1047 +1047 @@
             h->SetMarkerColor(kBlue);
 
-            hf->Draw("");
+            c->GetListOfPrimitives()->Add(hf, "");
 
             if (dynamic_cast<TH2*>(h))
-                h->Draw("col same");
+                c->GetListOfPrimitives()->Add(h, "col same");
         }
 
@@ -1077 +1077 @@
             d0->SetMarkerColor(kRed);
             d0->SetLineColor(kRed);
-            d0->Draw("PEX0same");
+            c->GetListOfPrimitives()->Add(d0, "PEX0same");
         }
 
@@ -1088 +1088 @@
             d1->SetMarkerColor(kMagenta);
             d1->SetLineColor(kMagenta);
-            d1->Draw("PEX0same");
+            c->GetListOfPrimitives()->Add(d1, "PEX0same");
         }
 
@@ -1099 +1099 @@
             d2->SetMarkerColor(kGreen);
             d2->SetLineColor(kGreen);
-            d2->Draw("PEX0same");
+            c->GetListOfPrimitives()->Add(d2, "PEX0same");
         }
 
         if (!dynamic_cast<TH2*>(h) && !c->GetListOfPrimitives()->FindObject(h))
-            h->Draw("PLsame");
+            c->GetListOfPrimitives()->Add(h, "PLsame");
 
         // -----------------------------------------------------------
@@ -1283 +1283 @@
         const double scale = 0.9*(m-l)/mm;
 
-        c->cd();
-
         DrawHorizontal(hf, l, h2, scale);
         DrawHorizontal(hf, l, h1, scale);
@@ -1918 +1916 @@
         TCanvas *c = fFtmRateCanv->GetCanvas();
 
+        TList * l = c->GetListOfPrimitives();
+
+
         while (c->FindObject("PatchRate"))
-            c->GetListOfPrimitives()->Remove(c->FindObject("PatchRate"));
+            l->Remove(c->FindObject("PatchRate"));
 
         while (c->FindObject("BoardRate"))
-            c->GetListOfPrimitives()->Remove(c->FindObject("BoardRate"));
-
-        c->cd();
+            l->Remove(c->FindObject("BoardRate"));
 
         if (fRatePatch1->value()>=0)
@@ -1930 +1929 @@
             fGraphPatchRate[fRatePatch1->value()].SetLineColor(kRed);
             fGraphPatchRate[fRatePatch1->value()].SetMarkerColor(kRed);
-            fGraphPatchRate[fRatePatch1->value()].Draw("PL");
+            l->Add(&fGraphPatchRate[fRatePatch1->value()], "PL");
         }
         if (fRatePatch2->value()>=0)
@@ -1936 +1935 @@
             fGraphPatchRate[fRatePatch2->value()].SetLineColor(kGreen);
             fGraphPatchRate[fRatePatch2->value()].SetMarkerColor(kGreen);
-            fGraphPatchRate[fRatePatch2->value()].Draw("PL");
+            l->Add(&fGraphPatchRate[fRatePatch2->value()], "PL");
         }
         if (fRateBoard1->value()>=0)
@@ -1942 +1941 @@
             fGraphBoardRate[fRateBoard1->value()].SetLineColor(kMagenta);
             fGraphBoardRate[fRateBoard1->value()].SetMarkerColor(kMagenta);
-            fGraphBoardRate[fRateBoard1->value()].Draw("PL");
+            l->Add(&fGraphBoardRate[fRateBoard1->value()], "PL");
         }
         if (fRateBoard2->value()>=0)
@@ -1948 +1947 @@
             fGraphBoardRate[fRateBoard2->value()].SetLineColor(kCyan);
             fGraphBoardRate[fRateBoard2->value()].SetMarkerColor(kCyan);
-            fGraphBoardRate[fRateBoard2->value()].Draw("PL");
+            l->Add(&fGraphBoardRate[fRateBoard2->value()], "PL");
         }
 
@@ -2458 +2457 @@
         TCanvas *c = fRateScanCanv->GetCanvas();
 
+        TList *l = c->GetListOfPrimitives();
+
         while (c->FindObject("PatchRate"))
-            c->GetListOfPrimitives()->Remove(c->FindObject("PatchRate"));
+            l->Remove(c->FindObject("PatchRate"));
 
         while (c->FindObject("BoardRate"))
-            c->GetListOfPrimitives()->Remove(c->FindObject("BoardRate"));
-
-        c->cd();
+            l->Remove(c->FindObject("BoardRate"));
 
         if (fRateScanPatch1->value()>=0)
@@ -2470 +2469 @@
             fGraphRateScan[fRateScanPatch1->value()+41].SetLineColor(kRed);
             fGraphRateScan[fRateScanPatch1->value()+41].SetMarkerColor(kRed);
-            fGraphRateScan[fRateScanPatch1->value()+41].Draw("PL");
+            l->Add(&fGraphRateScan[fRateScanPatch1->value()+41], "PL");
         }
         if (fRateScanPatch2->value()>=0)
@@ -2476 +2475 @@
             fGraphRateScan[fRateScanPatch2->value()+41].SetLineColor(kGreen);
             fGraphRateScan[fRateScanPatch2->value()+41].SetMarkerColor(kGreen);
-            fGraphRateScan[fRateScanPatch2->value()+41].Draw("PL");
+            l->Add(&fGraphRateScan[fRateScanPatch2->value()+41], "PL");
         }
         if (fRateScanBoard1->value()>=0)
@@ -2482 +2481 @@
             fGraphRateScan[fRateScanBoard1->value()+1].SetLineColor(kMagenta);
             fGraphRateScan[fRateScanBoard1->value()+1].SetMarkerColor(kMagenta);
-            fGraphRateScan[fRateScanBoard1->value()+1].Draw("PL");
+            l->Add(&fGraphRateScan[fRateScanBoard1->value()+1], "PL");
         }
         if (fRateScanBoard2->value()>=0)
@@ -2488 +2487 @@
             fGraphRateScan[fRateScanBoard2->value()+1].SetLineColor(kCyan);
             fGraphRateScan[fRateScanBoard2->value()+1].SetMarkerColor(kCyan);
-            fGraphRateScan[fRateScanBoard2->value()+1].Draw("PL");
+            l->Add(&fGraphRateScan[fRateScanBoard2->value()+1], "PL");
         }
 
@@ -3708 +3707 @@
         const int16_t isw = fThresholdIdx->value();
         const int16_t ihw = isw<0 ? -1 : fPatchMapHW[isw];
-       if (ihw<0)
+        if (ihw<0)
             return;
 
@@ -3753 +3752 @@
         h->GetYaxis()->SetTitleOffset(1.2);
         //        h.GetYaxis()->SetTitleSize(1.2);
-        h->Draw();
-
         return h;
     }
@@ -3959 +3956 @@
         c->SetTopMargin(0.03);
         c->SetGrid();
-        c->cd();
 
         TH1 *hf = DrawTimeFrame("Control deviation [mV]   ");
@@ -3969 +3965 @@
         hf->GetYaxis()->SetRangeUser(-99, 99);
 
-        fGraphFeedbackDev.Draw("LP");
+        c->GetListOfPrimitives()->Add(hf, "");
+        c->GetListOfPrimitives()->Add(&fGraphFeedbackDev, "LP");
 
         c = fFeedbackCmd->GetCanvas();
@@ -3978 +3975 @@
         c->SetTopMargin(0.03);
         c->SetGrid();
-        c->cd();
 
         hf = DrawTimeFrame("Command delta value [mV]   ");
@@ -3988 +3984 @@
         hf->GetYaxis()->SetRangeUser(-99*10, 99*10);
 
-        fGraphFeedbackCmd.Draw("LP");
+        c->GetListOfPrimitives()->Add(hf, "");
+        c->GetListOfPrimitives()->Add(&fGraphFeedbackCmd, "LP");
 
         // --------------------------------------------------------------------------
@@ -4000 +3997 @@
         c->SetTopMargin(0.03);
         c->SetGrid();
-        c->cd();
 
         TH1F *h=new TH1F("Frame", "", 1, 0, 1);
@@ -4013 +4009 @@
         h->GetYaxis()->SetLabelSize(0.025);
         h->GetYaxis()->SetTitleOffset(1.2);
-        h->Draw();
+        c->GetListOfPrimitives()->Add(h, "");
 
         fGraphRateScan[0].SetName("CameraRate");
@@ -4030 +4026 @@
         fGraphRateScan[0].SetMarkerColor(kBlue);
         fGraphRateScan[0].SetMarkerStyle(kFullDotSmall);
-        fGraphRateScan[0].Draw("LP");
+        c->GetListOfPrimitives()->Add(&fGraphRateScan[0], "LP");
 
         // --------------------------------------------------------------------------
@@ -4042 +4038 @@
         c->SetTopMargin(0.03);
         c->SetGrid();
-        c->cd();
 
         hf = DrawTimeFrame("Trigger rate [Hz]");
@@ -4065 +4060 @@
         fGraphFtmRate.SetMarkerColor(kBlue);
         fGraphFtmRate.SetMarkerStyle(kFullDotSmall);
-        fGraphFtmRate.Draw("LP");
+
+        c->GetListOfPrimitives()->Add(hf, "");
+        c->GetListOfPrimitives()->Add(&fGraphFtmRate, "LP");
 
         /*