Changeset 2178 for trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

Timestamp:

06/16/03 13:45:01 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mmain/MStatusDisplay.cc

@@ -181 +181 @@
     filemenu->AddEntry("Save As status.&root", kFileSaveAsRoot);
     filemenu->AddSeparator();
+    filemenu->AddEntry("Re&set",               kFileReset);
+    filemenu->AddSeparator();
     filemenu->AddEntry("Print with &lpr",      kFilePrint);
     //filemenu->AddEntry("Set printer &name",    kFilePrinterName);
@@ -196 +198 @@
     tabmenu->AddEntry("Save As tab-i.&C",    kTabSaveAsC);
     tabmenu->AddEntry("Save As tab-i.&root", kTabSaveAsRoot);
+    tabmenu->AddSeparator();
+    tabmenu->AddEntry("Re&move",             kTabRemove);
     tabmenu->AddSeparator();
     tabmenu->AddEntry("Print with &lpr",     kFilePrint);
@@ -560 +564 @@
 // to the corresponding TCanvas. If it isn't found NULL is returned.
 //
-TCanvas *MStatusDisplay::GetCanvas(TGCompositeFrame *cf) const
+TRootEmbeddedCanvas *MStatusDisplay::GetEmbeddedCanvas(TGCompositeFrame *cf) const
 {
     TIter Next(cf->GetList());
@@ -567 +571 @@
     while ((f=(TGFrameElement*)Next()))
         if (f->fFrame->InheritsFrom(TRootEmbeddedCanvas::Class()))
-            return ((TRootEmbeddedCanvas*)f->fFrame)->GetCanvas();
+            return (TRootEmbeddedCanvas*)f->fFrame;
 
     return NULL;
+}
+
+// --------------------------------------------------------------------------
+//
+// Takes a TGCompositeFrame as argument. Searches for the first
+// TRootEmbeddedCanvas which is contained by it and returns a pointer
+// to the corresponding TCanvas. If it isn't found NULL is returned.
+//
+TCanvas *MStatusDisplay::GetCanvas(TGCompositeFrame *cf) const
+{
+    TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(cf);
+    return ec ? ec->GetCanvas() : NULL;
 }
 
@@ -654 +670 @@
     c.SetBorderMode(0);
 
-    // If kNoContaxtMenu set set kNoCOntextMenu of the canvas
+    // If kNoContextMenu set set kNoContextMenu of the canvas
     if (TestBit(kNoContextMenu))
         c.SetBit(kNoContextMenu);
@@ -738 +754 @@
 
     return pages;
+}
+
+// --------------------------------------------------------------------------
+//
+// Remove tab no i if this tab contains a TRootEmbeddedCanvas
+//
+void MStatusDisplay::RemoveTab(int i)
+{
+    TGCompositeFrame *f = fTab->GetTabContainer(i);
+    if (!f)
+        return;
+
+    TRootEmbeddedCanvas *ec = GetEmbeddedCanvas(f);
+    if (!ec)
+        return;
+
+    TCanvas *c = ec->GetCanvas();
+    if (!c)
+        return;
+
+    const TString name(c->GetName());
+
+    f->RemoveFrame(ec);
+    delete fList->Remove(ec);
+
+    fTab->RemoveTab(i);
+
+    // layout and map new tab
+#if ROOT_VERSION_CODE < ROOT_VERSION(3,03,00)
+    MapSubwindows();
+    Layout();
+#else
+    Layout();
+    MapSubwindows();
+#endif
+
+    // display new tab in the main frame
+    gClient->ProcessEventsFor(fTab);
+
+    *fLog << inf << "Removed Tab #" << i << " '" << name << "'" << endl;
+}
+
+// --------------------------------------------------------------------------
+//
+// Use this to check whether the MStatusDisplay still contains the
+// TCanvas c. It could be removed meanwhile by menu usage.
+//
+Bool_t MStatusDisplay::HasCanvas(const TCanvas *c) const
+{
+    for (int i=1; i<fTab->GetNumberOfTabs(); i++)
+        if (c==GetCanvas(i))
+            return kTRUE;
+    return kFALSE;
 }
 
@@ -773 +842 @@
         return kTRUE;
 
+    case kFileReset:
+        for (int i=fTab->GetNumberOfTabs()-1; i>0; i--)
+            RemoveTab(i);
+        return kTRUE;
         /*
     case kFileSave:
@@ -828 +901 @@
     case kTabPrevious:
         fTab->SetTab(fTab->GetCurrent()-1);
+        return kTRUE;
+
+    case kTabRemove:
+        RemoveTab(fTab->GetCurrent());
         return kTRUE;