Changeset 3519 for trunk/MagicSoft

Timestamp:

03/16/04 10:59:07 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mastro

Files:

• MAstroCamera.cc (modified) (1 diff)
• MAstroCatalog.cc (modified) (4 diffs)
• MAstroCatalog.h (modified) (1 diff)

trunk/MagicSoft/Mars/mastro/MAstroCamera.cc

@@ -316 +316 @@
         }
 
-    MAstroCatalog::ExecuteEvent(event, mp1, mp2);
-}
+    MAstroCatalog::EventInfo(event, mp1, mp2);
+    //MAstroCatalog::ExecuteEvent(event, mp1, mp2);
+}

trunk/MagicSoft/Mars/mastro/MAstroCatalog.cc

@@ -561 +561 @@
 void MAstroCatalog::Paint(Option_t *o)
 {
-    if (!gPad->IsBatch())
-        gVirtualX->ClearWindow();
+//    if (!gPad->IsBatch())
+//        gVirtualX->ClearWindow();
 
     if (TestBit(kHasChanged))
@@ -643 +643 @@
      gPad->Range(-edge, -edge, edge, edge);
 
-     cout << gPad->GetWw() << " " << gPad->GetWh() << endl;
-
      const Float_t w = gPad->GetWw();
      const Float_t h = gPad->GetWh();
@@ -666 +664 @@
     clk.Print();
 
+    // Append to a possible second pad
+    if (!gPad->GetListOfPrimitives()->FindObject(this))
+        AppendPad(o);
+
     // Append all objects to pad
     DrawMap();
@@ -674 +676 @@
 void MAstroCatalog::Draw(Option_t *o)
 {
-    TObject::Draw(o);
+    // Append to first pad
+    AppendPad(o);
 
     if (!TestBit(kHasChanged))

trunk/MagicSoft/Mars/mastro/MAstroCatalog.h

@@ -193 +193 @@
     void Draw(Option_t *o="");
 
-    void EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected);
+    void EventInfo(Int_t event, Int_t px, Int_t py, TObject *selected=0);
 
     ClassDef(MAstroCatalog, 1)