Changeset 5620 for trunk/MagicSoft/Mars/mhvstime

Timestamp:

12/17/04 13:27:08 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mhvstime/MHVsTime.cc

@@ -83 +83 @@
 //
 MHVsTime::MHVsTime(const char *rule, const char *error)
-    : fGraph(NULL), fData(NULL), fError(0), fScale(1), fMaxPts(-1),
+    : fGraph(NULL), fData(NULL), fError(NULL), fScale(1), fMaxPts(-1),
     fNumEvents(1), fUseEventNumber(0)
 {
@@ -114 +114 @@
     if (fData)
         delete fData;
+
+    if (fError)
+        delete fError;
 }
 
@@ -169 +172 @@
 {
     fGraph->SetName(name);
-    MParContainer::SetName(name);
+    MH::SetName(name);
 }
 
@@ -179 +182 @@
 {
     fGraph->SetTitle(title);
-    MParContainer::SetTitle(title);
+    MH::SetTitle(title);
 }
 
@@ -247 +250 @@
 void MHVsTime::Paint(Option_t *opt)
 {
+    /*
+     *fLog << all << fGraph << " " << gPad->GetName() << " ----> Paint " << opt << endl;
+     TListIter Next(gPad->GetListOfPrimitives()); TObject *obj;
+     while ((obj=Next())) *fLog << obj << " " << obj->GetName() << " " << obj->ClassName() << " " << Next.GetOption() << endl;
+     */
+
+    if (!fGraph)
+        return;
+
+//    *fLog << all << fGraph->GetN() << " " << opt << endl;
+
+    if (fGraph->GetN()==0)
+        return;
+
+    TString str(opt);
+    if (!str.Contains("A"))
+        str += "A";
+    if (!str.Contains("P"))
+        str += "P";
+    if (str.Contains("same", TString::kIgnoreCase))
+    {
+        str.ReplaceAll("same", "");
+        str.ReplaceAll("A", "");
+    }
+
     // SetPoint deletes the histogram!
     if (fUseEventNumber)
@@ -264 +292 @@
     // Otherwise MStatusDisplay::Update hangs.
     gPad->GetListOfPrimitives()->Remove(fGraph);
-    gPad->GetListOfPrimitives()->Add(fGraph, fGraph->GetN()<2 ? "A" : opt);
+    fGraph->Draw(fGraph->GetN()<2 ? "A" : str);
+    //gPad->GetListOfPrimitives()->Add(fGraph, fGraph->GetN()<2 ? "A" : opt);
+    //    AppendPad(str);
+    //    fGraph->Draw(str);
+
 }
 
@@ -275 +307 @@
 void MHVsTime::Draw(Option_t *opt)
 {
-    if (!fGraph)
-        return;
-
-    if (fGraph->GetN()==0)
-        return;
-
     TVirtualPad *pad = gPad ? gPad : MakeDefCanvas(fGraph);
     pad->SetBorderMode(0);
-
-    TString str(opt);
-
-    if (!str.Contains("A"))
-        str += "A";
-    if (!str.Contains("P"))
-        str += "P";
-
-    if (str.Contains("same", TString::kIgnoreCase))
-    {
-        str.ReplaceAll("same", "");
-        str.ReplaceAll("A", "");
-    }
-
-    AppendPad(str);
-    fGraph->Draw(str);
+    AppendPad(opt);
 }