Changeset 2805

Timestamp:

01/14/04 18:06:11 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• manalysis/MCurrents.cc (deleted)
• manalysis/MCurrents.h (deleted)
• manalysis/Makefile (modified) (1 diff)
• mbase/MStatusDisplay.cc (modified) (6 diffs)
• mbase/MStatusDisplay.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -14 +14 @@
      - include MFFT
      - put MCurrents.cc back into the Makefile (was only in the LinkDef)
+
 
  2004/01/14: Abelardo Moralejo
@@ -22 +23 @@
        rms = 0 later resulted in the pixel being eliminated in the 
        image cleaning.
+
+
 
  2004/01/14: Thomas Bretz
@@ -62 +65 @@
      - removed forbidden underscore from member variable
      - changed wrong 0/1 in allocation of fResult into kFALSE/TRUE
+
+   * mbase/MStatusDisplay.[h,cc]:
+     - added new member function Open
+     - added new menu entry kFileOpen
+     - changed UpdatePSheader algorithm (the old one was much too slow)
+
+   * manalysis/MCurrents.[h,cc]:
+     - removed (old outdated)
+
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h:
+     - removed MCurrents
 
 

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -77 +77 @@
            MCT1PadONOFF.cc  \
            MPad.cc  \
-           MCurrents.cc  \
            MPedestalWorkaround.cc \
            MExtractedSignalCam.cc \

trunk/MagicSoft/Mars/mbase/MStatusDisplay.cc

@@ -190 +190 @@
     filemenu->AddEntry("Save As status.&root", kFileSaveAsRoot);
     filemenu->AddSeparator();
+    filemenu->AddEntry("&Open...",             kFileOpen);
     filemenu->AddEntry("Save &As...",          kFileSaveAs);
     filemenu->AddSeparator();
@@ -1088 +1089 @@
         return kTRUE;
 
+    case kFileOpen:
+        Open();
+        return kTRUE;
+
     case kFileSaveAs:
         SaveAs();
@@ -1725 +1730 @@
 {
     const TString newstr("%%DocumentPaperSizes: a4\n%%Orientation: Landscape\n");
-    const Int_t   l = newstr.Length();
+
+    ifstream fin(name);
+    ofstream fout(name+".$$$");
+
+    char c;
+
+    TString str;
+    fin >> str >> c;                // Read "%!PS-Adobe-2.0\n"
+    fout << str << endl << newstr;
+
+    // Doing it in blocks seems not to gain much for small (MB) files
+    while (fin)
+    {
+        fin.read(&c, 1);
+        fout.write(&c, 1);
+    }
+
+    gSystem->Unlink(name);
+    gSystem->Rename(name+".$$$", name);
+/*
+    //
+    // Old style algorithm. Shifts blocks inside a single file --- SLOW!
+    //
+    const Int_t l = newstr.Length();
 
     Long_t t[4]; // { id, size, flags, modtime }
@@ -1768 +1796 @@
     delete c[1];
     delete c[0];
+*/
 }
 
@@ -2155 +2184 @@
     {
         "PostScript",   "*.ps",
-        // "Encapsulated PostScript", "*.eps",
         "Gif files",    "*.gif",
         "Macro files",  "*.C",
@@ -2186 +2214 @@
     Warning("MStatusDisplay::SaveAs", "Unknown Extension: %s", fi.fFilename);
     return 0;
+}
+
+// --------------------------------------------------------------------------
+//
+//  Open contents of a MStatusDisplay with key name from file fname.
+//
+Int_t MStatusDisplay::Open(TString fname, const char *name)
+{
+    TFile file(fname, "READ");
+    if (file.IsZombie())
+    {
+        gLog << warn << "WARNING - Cannot open file " << fname << endl;
+        return 0;
+    }
+
+    return Read(name);
+}
+
+// --------------------------------------------------------------------------
+//
+//  Opens an open dialog
+//
+Int_t MStatusDisplay::Open()
+{
+    static const char *gOpenTypes[] =
+    {
+        "ROOT files", "*.root",
+        "All files",  "*",
+        NULL,           NULL
+    };
+
+    static TString dir(".");
+
+    TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
+
+    fi.fFileTypes = (const char**)gOpenTypes;
+    fi.fIniDir    = StrDup(dir);
+
+    new TGFileDialog(fClient->GetRoot(), this, kFDSave, &fi);
+
+    if (!fi.fFilename)
+        return 0;
+
+    dir = fi.fIniDir;
+
+    return Open(fi.fFilename);
 }
 

trunk/MagicSoft/Mars/mbase/MStatusDisplay.h

@@ -39 +39 @@
     typedef enum {
         // kFile
-        kFileBrowser, kFileCanvas, kFileSave, kFileSaveAs, kFileSaveAsPS,
+        kFileBrowser, kFileCanvas, kFileOpen, kFileSave, kFileSaveAs, kFileSaveAsPS,
         kFileSaveAsRoot, kFileSaveAsGIF, kFileSaveAsC, kFilePrint,
         kFilePrinterName, kFileClose, kFileExit, kFileReset,
@@ -183 +183 @@
 
      Int_t  SaveAs(Int_t num=-1);
+     Int_t  Open(TString fname, const char *name="MStatusDisplay");
+     Int_t  Open();
 
      Status_t CheckStatus() const { return fStatus; }