Changeset 1050 for trunk

Timestamp:

11/07/01 14:13:50 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbase/MWriteAsciiFile.cc (modified) (3 diffs)
• mmain/MBrowser.cc (modified) (15 diffs)
• mmain/MBrowser.h (modified) (3 diffs)
• mmain/MMars.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mbase/MWriteAsciiFile.cc

@@ -32 +32 @@
 // This can be the name of the class or a given name, which identifies     //
 // the container in a parameter container list (MParList).                 //
-// The container is writte to the ascii file if its ReadyToSave flag is     //
+// The container is writte to the ascii file if its ReadyToSave flag is    //
 // set (MParContainer)                                                     //
 //                                                                         //
@@ -54 +54 @@
 // of the class (eg. MHillas) but it can also be a different name which
 // identifies the container in the parameter list.
+// Because you cannot write more than one container there is no Add-function
+// like in MWriteRootFile.
+//
+//  For Example: MWriteAsciiFile("file.txt", "MHillas");
 //
 MWriteAsciiFile::MWriteAsciiFile(const char *filename, const char *contname,
@@ -72 +76 @@
 // Specify a the name of the ascii output file 'filename' and a pointer to
 // the container you want to write. 
+// Because you cannot write more than one container there is no Add-function
+// like in MWriteRootFile.
+//
+//  For Example: MHillas hillas;
+//               MWriteAsciiFile("file.txt", &hillas);
+//
 //
 MWriteAsciiFile::MWriteAsciiFile(const char *filename, MParContainer *cont,

trunk/MagicSoft/Mars/mmain/MBrowser.cc

@@ -33 +33 @@
 #include <TGMsgBox.h>       // TGMsgBox
 #include <TGListBox.h>      // TGListBox
-#include <TGComboBox.h>     // TGComboBox
+#include <TGTextEntry.h>    // TGTextEntry
+#include <TGFSComboBox.h>   // TGFSComboBox, TGFSLboxEntry
 #include <TGProgressBar.h>  // TGHProgressBar
 #include <TGFSContainer.h>  // TGFileContainer
@@ -47 +48 @@
 
 enum {
-    M_FILE_CLOSE          = 0x1000,
-    M_PBUTTON_CDIR_UP     = 0x1001,
-    M_PBUTTON_LIST_MODE   = 0x1002,
-    M_PBUTTON_DETAIL_MODE = 0x1003,
-    M_DIRBOX              = 0x1004
+    kFileClose,
+    kButDirUp,
+    kButListMode,
+    kButDetailMode,
+    kCBDirectory,
+    kTEFileName
 };
 
@@ -60 +62 @@
     //
     TGPopupMenu *filemenu = new TGPopupMenu(gClient->GetRoot());
-    filemenu->AddEntry("Close", M_FILE_CLOSE);
-    //filemenu->Associate(this);
+    filemenu->AddEntry("Close", kFileClose);
     fList->Add(filemenu);
 
@@ -110 +111 @@
     // Create Dir-Listbox and buttons in first frame
     //
-    fDir = new TGComboBox(frame, M_DIRBOX);
+    fDir = new TGFSComboBox(frame, kCBDirectory);
     fDir->Resize(350, 20);
 
@@ -123 +124 @@
     // Create the corresponding picture buttons
     //
-    fCdup     = new TGPictureButton(frame, fPic1, M_PBUTTON_CDIR_UP);
-    fListMode = new TGPictureButton(frame, fPic2, M_PBUTTON_LIST_MODE);
-    fDetail   = new TGPictureButton(frame, fPic3, M_PBUTTON_DETAIL_MODE);
+    fCdup     = new TGPictureButton(frame, fPic1, kButDirUp);
+    fListMode = new TGPictureButton(frame, fPic2, kButListMode);
+    fDetail   = new TGPictureButton(frame, fPic3, kButDetailMode);
 
     //
@@ -163 +164 @@
     //    padding:   5, 5, 5, 5
     //
-    TGLayoutHints *layout = new TGLayoutHints(kLHintsNormal, 5, 5, 5, 5);
+    TGLayoutHints *laydir = new TGLayoutHints(kLHintsExpandX|kLHintsLeft|kLHintsCenterY); //, 5, 5, 5, 5);
+    fList->Add(laydir);
+
+    TGLayoutHints *layout = new TGLayoutHints(kLHintsRight|kLHintsCenterY, 10); //, 5, 5, 5);
     fList->Add(layout);
 
-    frame->AddFrame(fDir,      layout);
-    frame->AddFrame(fCdup,     layout);
+    frame->AddFrame(fDir,      laydir);
     frame->AddFrame(fListMode, layout);
     frame->AddFrame(fDetail,   layout);
+    frame->AddFrame(fCdup,     layout);
 }
 
@@ -193 +197 @@
     fFileCont->Sort(kSortByName);
 
-    TGLayoutHints *layview = new TGLayoutHints(kLHintsTop|kLHintsExpandX|kLHintsExpandY, 5, 5, 5, 5);
+    TGLayoutHints *layview = new TGLayoutHints(kLHintsTop|kLHintsExpandX|kLHintsExpandY); //, 5, 5, 5, 5);
     fList->Add(layview);
 
@@ -206 +210 @@
     // Create three frames for the first tab
     //
-    TGCompositeFrame *tab1  = new TGCompositeFrame(frame, 100, 100, kHorizontalFrame);
-    TGCompositeFrame *tab1a = new TGCompositeFrame(frame, 100, 100, kHorizontalFrame);
-    TGCompositeFrame *tab1b = new TGCompositeFrame(frame, 100, 100, kVerticalFrame);
-
-    TGLayoutHints *laytab1b = new TGLayoutHints(kLHintsExpandX|kLHintsExpandY, 5, 5, 5, 5);
-    TGLayoutHints *laytab1  = new TGLayoutHints(kLHintsExpandX, 5, 5, 5, 5);
-
-    fList->Add(laytab1b);
+    TGHorizontalFrame *tab1a = new TGHorizontalFrame(frame, 100, 100);
+    TGHorizontalFrame *tab1b = new TGHorizontalFrame(frame, 100, 100);
+    TGVerticalFrame   *tab2  = new TGVerticalFrame  (frame, 100, 100);
+
+    TGLayoutHints *laytab1  = new TGLayoutHints(kLHintsNormal|kLHintsExpandX,  10, 10, 10);
+    TGLayoutHints *laytab2  = new TGLayoutHints(kLHintsExpandX|kLHintsExpandY, 10, 10, 10, 10);
+    TGLayoutHints *layentry = new TGLayoutHints(kLHintsNormal|kLHintsExpandX); //,  5, 5, 5);
+
+    frame->AddFrame(tab1a, laytab1);
+    frame->AddFrame(tab1b, laytab1);
+    frame->AddFrame(tab2,  laytab2);
+
+    fEntry = new TGTextEntry(tab1a, "", kTEFileName);
+    fEntry->Resize(350, 20);
+    fEntry->Associate(this);
+    tab1a->AddFrame(fEntry, layentry);
+
+    CreateDirListMenu(tab1b);
+    CreateDirListBox(tab2);
+
     fList->Add(laytab1);
-
-    frame->AddFrame(tab1a);
-    frame->AddFrame(tab1b, laytab1b);
-    frame->AddFrame(tab1,  laytab1);
-
-    fList->Add(tab1);
+    fList->Add(laytab2);
     fList->Add(tab1a);
     fList->Add(tab1b);
-
-    CreateDirListMenu(tab1a);
-    CreateDirListBox(tab1b);
+    fList->Add(tab2);
+    fList->Add(layentry);
+    fList->Add(fEntry);
 }
 
@@ -394 +405 @@
     fFileCont->ChangeDirectory(txt?txt:gSystem->WorkingDirectory());
 
-    const char  *dir = fFileCont->GetDirectory();
-    //    const UInt_t num = fDir->GetSelected()+1;
-
-    //
-    // FIXME: This is a big workaround!
-    //
-    fDir->InsertEntry(dir, -1/*num*/, -1);
-    fDir->Select(-1/*num*/);
+    const char *dir = fFileCont->GetDirectory();
+    fDir->Update(dir);
+}
+
+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)
+    {
+        const char *dir = fFileCont->GetDirectory();
+
+        fname = Form("%s/%s", dir, name);
+
+        failed = gSystem->AccessPathName(fname, kFileExists);
+    }
+
+    if (!failed)
+        strcpy(fInputFile, fname);
+    else
+        fname = Form(fInputFile);
+
+    char *slash = strrchr(fname, '/');
+
+    fEntry->SetText(slash ? slash+1 : "");
+
+    if (!slash)
+        return;
+
+    *slash = '\0';
+    ChangeDir(fname);
 }
 
@@ -410 +456 @@
   switch (GET_MSG(msg))
   {
+  case kC_TEXTENTRY:
+      if (GET_SUBMSG(msg)!=kTE_ENTER)
+          return kTRUE;
+
+      SetFileName(fEntry->GetText());
+      return kTRUE;
+
   case kC_COMMAND:
       switch (GET_SUBMSG(msg))
@@ -417 +470 @@
           switch (parm1)
           {
-          case M_PBUTTON_CDIR_UP :
+          case kButDirUp :
               //
               //  goto the parent directory
@@ -424 +477 @@
               return kTRUE;
             
-            case M_PBUTTON_LIST_MODE:
+            case kButListMode:
               fFileView->SetViewMode(kLVList);
               fDetail->SetState(kButtonUp) ;
               return kTRUE;
               
-          case M_PBUTTON_DETAIL_MODE:
+          case kButDetailMode:
               fFileView->SetViewMode(kLVDetails);
               fListMode->SetState(kButtonUp);
@@ -441 +494 @@
           // But to do this we need the number of entries in the list.
           //
-          if (parm1 == M_DIRBOX)
-              ChangeDir(((TGTextLBEntry*)fDir->GetSelectedEntry())->GetText()->GetString());
+          if (parm1 != kCBDirectory)
+              return kTRUE;
+
+          ChangeDir(((TGTreeLBEntry*)fDir->GetSelectedEntry())->GetPath()->GetString());
           return kTRUE;
 
         case kCM_MENU:
-          if (parm1==M_FILE_CLOSE)
+          if (parm1==kFileClose)
               CloseWindow();
           return kTRUE;
@@ -465 +520 @@
           //
 
-          if (parm1 != kButton1)
-              return kTRUE;
-
-          if (fFileCont->NumSelected() != 1 )
+          if (parm1 != kButton1 || fFileCont->NumSelected() != 1)
               return kTRUE;
 
@@ -489 +541 @@
           }
 
-          //
-          // file is no directory, is a file
-          //    determine the file type by extensions
-          //
-          const char *extension=strrchr(str, '.');
-
-          if (!extension)
-              return kTRUE;
-
-          const char *dir = fFileCont->GetDirectory();
-
-          if (!strcasecmp(extension, ".ps")) // postscript file
-          {
-              char *cmd = new char[strlen(dir)+strlen(str)+40];
-              sprintf(cmd, "gv %s/%s &", dir, str);
-              gSystem->Exec(cmd);
-              delete cmd;
-              return kTRUE;
-          }
-
-          if (!strcasecmp(extension, ".root"))
-          {
-              sprintf(fInputFile, "%s/%s", dir, str);
-              return kTRUE;
-          }
+          SetFileName(str);
           return kTRUE;
       }

trunk/MagicSoft/Mars/mmain/MBrowser.h

@@ -13 +13 @@
 class TGTab;
 class TGListView;
-class TGComboBox;
+class TGTextEntry;
+class TGFSComboBox;
 class TGProgressBar;
 class TGPictureButton;
@@ -23 +24 @@
     TGTab            *fTabs;
 
-    TGComboBox       *fDir;
+    TGFSComboBox     *fDir;
+    TGTextEntry      *fEntry;
 
     TGPictureButton  *fCdup;
@@ -42 +44 @@
     void CreateDirListMenu(TGCompositeFrame *frame);
     void CreateDirListBox(TGCompositeFrame *frame);
+
+    void SetFileName(const char *name);
 
 protected:

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -30 +30 @@
 #include <TGTab.h>         // TGTab
 #include <TGMenu.h>        // TGPopupMenu
+#include <TSystem.h>       // gSystem->Exec
 #include <TGMsgBox.h>      // TGMsgBox
 #include <TGButton.h>      // TGPictureButton
 #include <TG3DLine.h>      // TGHorizontal3DLine
-                           // use TGSplitter.h for root<3.00
+
 #include "MEvtDisp.h"
 #include "MAnalysis.h"
@@ -289 +290 @@
 
             case M_PICTURE_MAGIC:
-                DisplWarning("Please open a Netscape to the MAGIC homepage\n"
-                             "http://hegra1.mppmu.mpg.de/MAGICWeb/");
+                gSystem->Exec("netscape http://hegra1.mppmu.mpg.de/MAGICWeb/ &");
                 return kTRUE;
 
             case M_PICTURE_MARS:
-                DisplWarning("Please open a Netscape to the MARS homepage\n"
-                             "http://magic.uni-sw.gwdg.de/mars/");
+                gSystem->Exec("netscape http://magic.uni-sw.gwdg.de/mars/ &");
                 return kTRUE;
             }