Changeset 2787 for trunk/MagicSoft/Mars

Timestamp:

01/13/04 16:29:46 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (8 diffs)
• mbase/MStatusDisplay.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -79 +79 @@
    * mbase/MLogPlugin.[h,cc], mbase/MLogHtml.[h,cc]:
      - added
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - added a Save-As dialog
 
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -87 +87 @@
 #include <TGTextView.h>           // TGTextView
 #include <TGStatusBar.h>          // TGStatusBar
+#include <TGFileDialog.h>         // TGFileDialog
 #include <TGProgressBar.h>        // TGHProgressBar
-
 #include <TRootEmbeddedCanvas.h>  // TRootEmbeddedCanvas
 
@@ -190 +190 @@
     filemenu->AddEntry("Save As status.&root", kFileSaveAsRoot);
     filemenu->AddSeparator();
+    filemenu->AddEntry("Save &As...",          kFileSaveAs);
+    filemenu->AddSeparator();
     filemenu->AddEntry("Re&set",               kFileReset);
     filemenu->AddSeparator();
@@ -203 +205 @@
     //
     MGPopupMenu *tabmenu = new MGPopupMenu(gClient->GetRoot());
-    // tabmenu->AddEntry("Save &As...", kFileSaveAs);
     tabmenu->AddEntry("Next [&+]",           kTabNext);
     tabmenu->AddEntry("Previous [&-]",       kTabPrevious);
@@ -211 +212 @@
     tabmenu->AddEntry("Save As tab-i.&C",    kTabSaveAsC);
     tabmenu->AddEntry("Save As tab-i.&root", kTabSaveAsRoot);
+    tabmenu->AddSeparator();
+    tabmenu->AddEntry("Save &As...",         kTabSaveAs);
     tabmenu->AddSeparator();
     tabmenu->AddEntry("Re&move",             kTabRemove);
@@ -1084 +1087 @@
         Reset();
         return kTRUE;
-        /*
-    case kFileSave:
-        cout << "Save..." << endl;
-        return kTRUE;
 
     case kFileSaveAs:
-        cout << "SaveAs..." << endl;
-        return kTRUE;
-*/
+        SaveAs();
+        return kTRUE;
+
     case kFileSaveAsPS:
         SaveAsPS();
@@ -1111 +1110 @@
     case kFilePrint:
         PrintToLpr();
+        return kTRUE;
+
+    case kTabSaveAs:
+        SaveAs(fTab->GetCurrent());
         return kTRUE;
 
@@ -2138 +2141 @@
 }
 
+// --------------------------------------------------------------------------
+//
+//  Opens a save as dialog
+//
+Int_t MStatusDisplay::SaveAs(Int_t num)
+{
+    static const char *gSaveAsTypes[] =
+    {
+        "PostScript",   "*.ps",
+        // "Encapsulated PostScript", "*.eps",
+        "Gif files",    "*.gif",
+        "Macro files",  "*.C",
+        "ROOT files",   "*.root",
+        "All files",    "*",
+        NULL,           NULL
+    };
+
+    static TString dir(".");
+
+    TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
+
+    fi.fFileTypes = (const char**)gSaveAsTypes;
+    fi.fIniDir    = StrDup(dir);
+
+    new TGFileDialog(fClient->GetRoot(), this, kFDSave, &fi);
+
+    if (!fi.fFilename)
+        return 0;
+
+    dir = fi.fIniDir;
+
+    const TString name(fi.fFilename);
+
+    if (name.EndsWith(".root")) return SaveAsRoot(num, name);
+    if (name.EndsWith(".ps"))   return SaveAsPS(num, name);
+    if (name.EndsWith(".gif"))  return SaveAsGIF(num, name);
+    if (name.EndsWith(".C"))    return SaveAsC(num, name);
+
+    Warning("MStatusDisplay::SaveAs", "Unknown Extension: %s", fi.fFilename);
+    return 0;
+}
+
 Bool_t MStatusDisplay::HandleConfigureNotify(Event_t *evt)
 {
@@ -2211 +2256 @@
     return rc;
 }
-
-/*
- // --------------------------------------------------------------------------
-//
-//  Opens a save as dialog, and tries to store the canvas
-//  in the given output format
-//
-void MGEvtDisplay::SaveAsDialog() const
-{
-    static const char *gSaveAsTypes[] =
-    {
-        "PostScript",   "*.ps",
-        "Encapsulated PostScript", "*.eps",
-        "Gif files",    "*.gif",
-        "Macro files",  "*.C",
-        "ROOT files",   "*.root",
-        "All files",    "*",
-        NULL,           NULL
-    };
-
-    static TString dir(".");
-
-    TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
-
-    fi.fFileTypes = (const char**)gSaveAsTypes;
-    fi.fIniDir    = StrDup(dir);
-
-    new TGFileDialog(fClient->GetRoot(), this, kFDSave, &fi);
-
-    if (!fi.fFilename)
-        return;
-
-    dir = fi.fIniDir;
-
-    if (strstr(fi.fFilename, ".root") ||
-        strstr(fi.fFilename, ".ps")   ||
-        strstr(fi.fFilename, ".eps")  ||
-        strstr(fi.fFilename, ".gif"))
-    {
-        fCanvas->SaveAs(fi.fFilename);
-        return;
-    }
-    if (strstr(fi.fFilename, ".C"))
-    {
-        fCanvas->SaveSource(fi.fFilename);
-        return;
-    }
-    Warning("SaveAsDialog", "Unknown Extension: %s", fi.fFilename);
-}
-*/

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -182 +182 @@
      Int_t  PrintToLpr(Int_t num);
 
+     Int_t  SaveAs(Int_t num=-1);
+
      Status_t CheckStatus() const { return fStatus; }
      void ClearStatus() { fStatus = kLoopNone; }