Changeset 1172 for trunk/MagicSoft/Mars/mmain

Timestamp:

01/14/02 17:34:02 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MBrowser.cc (modified) (4 diffs)
• MBrowser.h (modified) (2 diffs)
• MDataCheck.cc (modified) (1 diff)
• MDataCheck.h (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MBrowser.cc

@@ -280 +280 @@
                    main?main:gClient->GetRoot(), w, h)
 {
-    fInputFile[0] = '\0';
-
     fList = new MGList;
     fList->SetOwner();
@@ -382 +380 @@
     // Checks if there is a selected input root file
     //
-    return fInputFile[0]!='\0';
+    return !fInputFile.IsNull(); //[0]!='\0';
 }
 
@@ -417 +415 @@
 }
 
-void MBrowser::SetFileName(const char *name)
-{
-    //
-    // determine the file type by extensions
-    //
-    const char *ext=strrchr(name, '.');
-
-    Bool_t failed = kFALSE;
-
-    if (!ext)
-        failed = kTRUE;
-    else
-        if (strcasecmp(ext, ".root"))
-            failed = kTRUE;
-
-    char *fname=NULL;
-    if (!failed)
+void MBrowser::SetFileName(TString name)
+{
+    if (name[0]!='/')
     {
-        const char *dir = fFileCont->GetDirectory();
-
-        fname = Form("%s/%s", dir, name);
-
-        failed = gSystem->AccessPathName(fname, kFileExists);
+        name.Insert(0, "/");
+        name.Insert(0, fFileCont->GetDirectory());
     }
 
-    if (!failed)
-        strcpy(fInputFile, fname);
-    else
-        fname = Form(fInputFile);
-
-    char *slash = strrchr(fname, '/');
-
-    fEntry->SetText(slash ? slash+1 : "");
-
-    if (!slash)
+    if (gSystem->AccessPathName(name, kFileExists))
         return;
 
-    *slash = '\0';
-    ChangeDir(fname);
+    if (name.EndsWith(".root", TString::kIgnoreCase))
+        fInputFile = name;
+
+    fEntry->SetText(gSystem->BaseName(name));
+
+    ChangeDir(gSystem->DirName(name));
 }
 
@@ -483 +459 @@
     const TGTextLBEntry *selected = (TGTextLBEntry*)filter->GetListBox()->GetSelectedEntry();
 
-    const char *txt = StrDup(selected->GetText()->GetString());
-
     //
     // find filter and remove leading spaces
     //
-    char *lt = strchr(txt, '<');
-    if (lt)
-    {
-        do *lt-- = '\0';
-        while (lt>txt && *lt==' ');
-
-        //
-        // Set new filter and refresh the file container
-        //
-        fFileCont->SetFilter(txt);
-        fFileCont->DisplayDirectory();
-    }
-
-    delete [] txt;
+    TString txt = selected->GetText()->GetString();
+    if (txt.First('<') < 0)
+        return;
+
+    //
+    // Set new filter and refresh the file container
+    //
+    txt.Remove(txt.First('<'));
+
+    TString ftxt = txt.Strip();
+    fFileCont->SetFilter(ftxt);
+    fFileCont->DisplayDirectory();
 }
 

trunk/MagicSoft/Mars/mmain/MBrowser.h

@@ -36 +36 @@
     void CreateDirListBox(TGCompositeFrame *frame);
 
-    void SetFileName(const char *name);
+    void SetFileName(TString name);
 
     void SetFilter();
@@ -44 +44 @@
 protected:
     MGList *fList;
-    Char_t  fInputFile[256];
+    TString fInputFile;
 
     TGCompositeFrame *CreateNewTab(const char *name);

trunk/MagicSoft/Mars/mmain/MDataCheck.cc

@@ -97 +97 @@
 //  histograms.
 //
-void MDataCheck::ViewAdcSpectra(Char_t *inputfile, Char_t *treeName)
+void MDataCheck::ViewAdcSpectra(const Char_t *inputfile, const Char_t *treeName)
 {
     //

trunk/MagicSoft/Mars/mmain/MDataCheck.h

@@ -9 +9 @@
 {
 private:
-    void ViewAdcSpectra(Char_t *inputfile, Char_t *treeName);
+    void ViewAdcSpectra(const Char_t *inputfile, const Char_t *treeName);
 
 public: