Changeset 2386 for trunk/MagicSoft/Mars/mmain

Timestamp:

10/15/03 19:15:13 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc (modified) (15 diffs)

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -75 +75 @@
 #include <TObjArray.h>            // TObjArray
 #include <TPostScript.h>          // TPostScript
+#include <TInterpreter.h>         // gInterpreter
 
 #include <TGTab.h>                // TGTab
@@ -186 +187 @@
     //filemenu->AddEntry("Set printer &name",    kFilePrinterName);
     filemenu->AddSeparator();
+    filemenu->AddEntry("C&lose", kFileClose);
     filemenu->AddEntry("E&xit", kFileExit);
     filemenu->Associate(this);
@@ -507 +509 @@
 : TGMainFrame(gClient ? gClient->GetRoot() : NULL, 1, 1), fTimer(this, t, kTRUE), fStatus(kLoopNone), fLog(&gLog), fLogIdx(-1), fLogTimer(this, 250, kTRUE), fLogBox(NULL), fIsLocked(0)
 {
+    //
+    // This is a possibility for the user to check whether this
+    // object has already been deleted. It will be removed
+    // from the list in the destructor.
+    //
     gROOT->GetListOfSpecials()->Add(this);
 
     fFont = gVirtualX->LoadQueryFont("7x13bold");
 
+    //
+    // In case we are in batch mode use a list of canvases
+    // instead of the Root Embedded Canvases in the TGTab
+    //
     fBatch = new TList;
     fBatch->SetOwner();
@@ -566 +577 @@
 MStatusDisplay::~MStatusDisplay()
 {
+    //
+    // Delete object from global object table so it cannot
+    // be deleted by chance a second time
+    //
+    gInterpreter->DeleteGlobal(this);
+
+    //
+    // This is a possibility for the user to check whether this
+    // object has already been deleted. It has been added
+    // to the list in the constructor.
+    //
     gROOT->GetListOfSpecials()->Remove(this);
 
     SetLogStream(NULL);
 
+    //
+    // Delete the list of objects corresponding to this object
+    //
     delete fList;
+
+    //
+    // Delete the list list of canvases used in batch mode
+    // instead of the Root Embedded Canvases in the TGTab
+    //
     delete fBatch;
 
+    //
+    // Delete the font used for the logging window
+    //
     if (fFont)
         gVirtualX->DeleteFont(fFont);
@@ -671 +704 @@
 }
 
+/*
+class MCanvas : public TRootEmbeddedCanvas
+{
+public:
+    MCanvas(const char* name, const TGWindow* p, UInt_t w, UInt_t h, UInt_t o) :
+              TRootEmbeddedCanvas(name, p, w, h, o) {}
+              void Layout()
+              {
+                  cout << "EmbLayout: " << GetCanvas()->GetName() << endl;
+
+                  // Create layout for canvas. Depending on the size of the container
+                  // we need to add the scrollbars.
+                  TRootEmbeddedCanvas::Layout();
+              }
+};
+*/
+
+TGCompositeFrame *MStatusDisplay::AddRawTab(const char *name)
+{
+    // Add new tab
+    TGCompositeFrame *f = fTab->AddTab(name);
+
+    // layout and map new tab
+    Layout();
+    MapSubwindows();
+    Layout();
+
+    // display new tab in the main frame
+    gClient->ProcessEventsFor(fTab);
+
+    *fLog << inf << "Adding Raw Tab '" << name << "' (" << f->GetWidth() << "x";
+    *fLog << f->GetHeight() << ")" << endl;
+
+    // return pointer to new canvas
+    return f;
+}
+
 // --------------------------------------------------------------------------
 //
@@ -688 +758 @@
     TGCompositeFrame *f = fTab->AddTab(name);
 
-    // create root emb 0edded canvas and add it to the tab
+    // create root embedded canvas and add it to the tab
     TRootEmbeddedCanvas *ec = new TRootEmbeddedCanvas(name, f, f->GetWidth(), f->GetHeight(), 0);
     f->AddFrame(ec, fLayCanvas);
@@ -723 +793 @@
 }
 
+
 // --------------------------------------------------------------------------
 //
@@ -737 +808 @@
         return;
 
-    // Code taken from TCanvas::Update() and TCanvas::Paint
-    c->FeedbackMode(kFALSE);  // Goto double buffer mode
-    c->Paint();               // Repaint all pad's
-    c->Flush();               // Copy all pad pixmaps to the screen
+    // Code taken from TCanvas::Update() and TCanvas::Paint()
+    // replaces PaintModified() by Paint()
+    if (gThreadXAR)
+    {
+        void *arr[2] = { NULL, c };
+        if (((*gThreadXAR)("CUPD", 2, arr, NULL)))
+            return;
+    }
+
+    if (!c->IsBatch())
+        c->FeedbackMode(kFALSE);  // Goto double buffer mode
+
+    c->Paint();                   // Repaint all pads
+    c->Flush();                   // Copy all pad pixmaps to the screen
+
     //c->SetCursor(kCross);
 
@@ -871 +953 @@
     {
     case kLoopStop:
+    case kFileClose:
     case kFileExit:
-        if (id==kFileExit)
-            delete this;
+        if (id==kFileExit || id==kFileClose)
+            CloseWindow();
         fStatus = (Status_t)id;
         return kTRUE;
@@ -1029 +1112 @@
         return ProcessMessageCommandMenu(mp1); // mp2=userdata
     case kCM_TAB:
-        for (int i=1; i<fTab->GetNumberOfTabs(); i++)
-            fTab->GetTabContainer(i)->UnmapWindow();
+        /*
+         for (int i=0; i<fTab->GetNumberOfTabs(); i++)
+         fTab->GetTabContainer(i)->UnmapWindow();
+         */
         UpdateTab(fTab->GetTabContainer(mp1));
-        fTab->GetTabContainer(mp1)->MapWindow();
+        //fTab->GetTabContainer(mp1)->MapWindow();
+
         /*
         if (mp1>0)
@@ -1187 +1273 @@
     // and the destructor are calling DestroyWindow which seems to be
     // in conflict with the TRootEmbeddedCanvas.
-    delete this;
+
+    // FIXME: Make sure that the Status Display is deleted from every
+    //        where (eg Eventloop) first!
+
+    gLog << dbg << "MStatusDisplay is on heap: " << (int)IsOnHeap() << endl;
+
+    if (fIsLocked<=0 && IsOnHeap())
+        delete this;
+    fStatus = kFileExit;
 }
 
@@ -1201 +1295 @@
 
     flag ? SetBit(kNoContextMenu) : ResetBit(kNoContextMenu);
+
     for (int i=1; i<fTab->GetNumberOfTabs(); i++)
     {
@@ -1563 +1658 @@
     TVirtualPS *psave  = gVirtualPS;
 
+    TDatime d;
+
     TPostScript ps(name, 112);
     ps.SetBit(TPad::kPrintingPS);
@@ -1608 +1705 @@
         ps.NewPage();
 
-        Float_t psw = 26; // A4 - width
-        Float_t psh = 20; // A4 - height
+        //
+        // 26 is used here to scale the canvas into a height of 26,
+        // such that the page title can be set above the canvas...
+        //
+        Float_t psw = 26; //29.7; // A4 - width
+        Float_t psh = 21.0; // A4 - height
 
         const Float_t cw = c->GetWw();
@@ -1655 +1756 @@
         ps.TextNDC(0, 1.02, TString("  ")+n->GetName());
         ps.SetTextAlign(21); // cent top
-        ps.TextNDC(0.5, 1.02, "MARS - Magic Analysis and Reconstruction Software");
+        ps.TextNDC(0.5, 1.02, TString("MARS - Magic Analysis and Reconstruction Software - ")+d.AsString());
         ps.SetTextAlign(31); // right top
         ps.TextNDC(1, 1.02, Form("Page No.%i (%i)  ", page++, i));