Changeset 2467 for trunk/MagicSoft

Timestamp:

11/04/03 14:12:44 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• meventdisp/MGCamDisplay.cc (modified) (1 diff)
• mimage/MHillas.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -37 +37 @@
      - moved code from Do() to Process()
      - added comments
+
+   * meventdisp/MGCamDisplay.cc:
+     - replaced MHillas:Clear() by Removing from ListOfPrimitives
+     
+   * mimage/MHillas.[h,cc]:
+     - removed fEllipse
+     - removed the Draw function
+     - added a correct Paint() function
 
 

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -301 +301 @@
     else
     {
-        hillas->Clear();
         for (int i=0; i<5; i++)
         {
+            fCanvas2[i]->GetListOfPrimitives()->Remove(hillas);
             fCanvas2[i]->Modified();
             fCanvas2[i]->Update();

trunk/MagicSoft/Mars/mimage/MHillas.cc

@@ -82 +82 @@
 // Default constructor.
 //
-MHillas::MHillas(const char *name, const char *title) : fEllipse(NULL)
+MHillas::MHillas(const char *name, const char *title)
 {
     fName  = name  ? name  : "MHillas";
@@ -88 +88 @@
 
     Reset();
-
-    fEllipse = new TEllipse;
 }
 
@@ -98 +96 @@
 MHillas::~MHillas()
 {
-    Clear();
 }
 
@@ -115 +112 @@
     fMeanX  =  0;
     fMeanY  =  0;
-
-    Clear();
 }
 
@@ -143 +138 @@
 // --------------------------------------------------------------------------
 //
-// Instead of adding MHillas itself to the Pad (s. AppendPad in TObject)
-// we create an ellipse, which is added to the Pad by its Draw function
-// You can remove it by deleting the Ellipse Object (s. Clear())
-//
-void MHillas::Draw(Option_t *opt)
-{
-    Clear();
-
+// Paint the ellipse corresponding to the parameters
+//
+void MHillas::Paint(Option_t *opt)
+{
     if (fLength<0 || fWidth<0)
         return;
 
-    fEllipse = new TEllipse(fMeanX, fMeanY, fLength, fWidth,
+    TEllipse e(fMeanX, fMeanY, fLength, fWidth,
                             0, 360, fDelta*kRad2Deg+180);
 
-    fEllipse->SetLineWidth(2);
-    fEllipse->Draw();
-}
-
-// --------------------------------------------------------------------------
-//
-// If a TEllipse object exists it is deleted
-//
-void MHillas::Clear(Option_t *)
-{
-    if (!fEllipse)
-        return;
-
-    delete fEllipse;
-
-    fEllipse = NULL;
-}
-
+    e.SetLineWidth(2);
+    e.Paint();
+}
 
 // --------------------------------------------------------------------------