Changeset 587 for trunk/MagicSoft/Mars/mgui

Timestamp:

01/23/01 10:43:18 (24 years ago)

Author:

harald

Message:

The integration of the class MGFadcDisp in the mars code. Now
one is able to see at least the high gain samples with this gui.
I hope that also Razmik is now able to look to the data.

Location:

trunk/MagicSoft/Mars/mgui

Files:

• GuiIncl.h (modified) (1 diff)
• GuiLinkDef.h (modified) (1 diff)
• MGEventDispMain.cc (added)
• MGEventDispMain.h (added)
• MGMarsMain.cc (modified) (3 diffs)
• MGPrototyp.cc (modified) (11 diffs)
• MGPrototyp.h (modified) (3 diffs)
• Makefile (modified) (2 diffs)

trunk/MagicSoft/Mars/mgui/GuiIncl.h

@@ -9 +9 @@
 #include <TGSplitter.h>     // TGHorizontal3DLine
 #include <TGFSContainer.h>  // TGFileContainer
+#include <TGLabel.h>       // TGLabel
+#include <TGTextEntry.h>  
+
 
 #endif // __CINT__

trunk/MagicSoft/Mars/mgui/GuiLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class MGMarsMain;
+#pragma link C++ class MGEventDispMain;
 #pragma link C++ class MGDataCheckMain;
 #pragma link C++ class MGMonteCarloMain;

trunk/MagicSoft/Mars/mgui/MGMarsMain.cc

@@ -9 +9 @@
 #include <TGSplitter.h>    // TGHorizontal3DLine
 
+#include "MGEventDispMain.h"
 #include "MGDataCheckMain.h"
 #include "MGMonteCarloMain.h"
@@ -193 +194 @@
 
             case M_BUTTON_EVTDISP:
-
-              new TGMsgBox(fClient->GetRoot(), this,
-                           "WARNING!", 
-                           "EventDisplay not yet implemented!", 
-                           kMBIconExclamation, buttons, &retval);
+              
+              new MGEventDispMain (fClient->GetRoot(), this, 400, 650 ) ; 
               break ;
               
@@ -205 +203 @@
 
             case M_BUTTON_ANALYSE:
-              new TGMsgBox(fClient->GetRoot(), this,
+              //new MGPrototyp(fClient->GetRoot(), this, 400, 650 ) ;
+
+               new TGMsgBox(fClient->GetRoot(), this,
                            "WARNING!", 
                            "Analysis not yet implemented!", 

trunk/MagicSoft/Mars/mgui/MGPrototyp.cc

@@ -9 +9 @@
 #include <TGListBox.h>      // TGListBox
 #include <TGFSContainer.h>  // TGFileContainer
+#include <TGSplitter.h>    // TGHorizontal3DLine
+#include <TGTextEntry.h> 
+#include <TGLabel.h>       // TGLabel
+
 
 // FIXME: Move to MAGIC.h
@@ -15 +19 @@
 ClassImp(MGPrototyp)
 
-enum CommandDataChecker {
+enum CommandPrototyp {
   M_FILE_CLOSE , 
   M_BUTTON_ACTION, 
 
+  M_FILERESET, 
   M_PBUTTON_CDIR_UP, 
   M_PBUTTON_LIST_MODE, 
@@ -58 +63 @@
   AddFrame(fMenuBar, fLayMenuBar ) ; 
   
+  fLineSep1 = new TGHorizontal3DLine(this) ; 
+  AddFrame(fLineSep1, new TGLayoutHints(kLHintsTop | kLHintsExpandX) );
+
+  
   //
   //    Create the top window with a lot of buttons 
@@ -74 +83 @@
   AddFrame(fFrameTop, new TGLayoutHints (kLHintsTop ) ) ;   
 
+  //   a line between top and low frame
+  
+  fLineSep2 = new TGHorizontal3DLine(this) ; 
+  AddFrame(fLineSep2, new TGLayoutHints(kLHintsTop | kLHintsExpandX) );
 
   //
@@ -92 +105 @@
   //  tf->AddFrame(fTabF1, fLayTab ) ; 
 
-  
   fTabF1a = new TGCompositeFrame (tf, 100, 100, kHorizontalFrame) ; 
   tf->AddFrame(fTabF1a,  new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; 
 
-  fTabF1b = new TGCompositeFrame (tf, 100, 100, kVerticalFrame) ; 
-  //  tf->AddFrame(fTabF1b,  new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX | kLHintsExpandY  , 5, 5, 5, 5 ) ) ; 
-  tf->AddFrame(fTabF1b,  new TGLayoutHints ( kLHintsExpandX | kLHintsExpandY  , 5, 5, 5, 5 ) ) ; 
-
-  
-  fDir = new TGListBox(fTabF1a, -1) ; 
+  fTabF1b = new TGCompositeFrame (tf, 100, 100, kHorizontalFrame) ; 
+  tf->AddFrame(fTabF1b,  new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; 
+
+  fTabF1c = new TGCompositeFrame (tf, 100, 100, kVerticalFrame) ; 
+  //  tf->AddFrame(fTabF1c,  new TGLayoutHints ( kLHintsTop | kLHintsLeft | kLHintsExpandX | kLHintsExpandY  , 5, 5, 5, 5 ) ) ; 
+  tf->AddFrame(fTabF1c,  new TGLayoutHints ( kLHintsExpandX | kLHintsExpandY  , 5, 5, 5, 5 ) ) ; 
+  
+  //   the items in the first subframe
+
+  fLabFileName = new TGLabel(fTabF1a, new TGString("selected File:") );
+  fTabF1a->AddFrame( fLabFileName, new TGLayoutHints (kLHintsLeft, 10, 10, 10, 10)) ; 
+
+  fTxtFileName = new TGTextEntry(fTabF1a, fTxtBufFileName = new TGTextBuffer(256) );
+  fTxtFileName->Resize(60, fTxtFileName->GetDefaultHeight());
+  fTabF1a->AddFrame(fTxtFileName, new TGLayoutHints(kLHintsTop | kLHintsExpandX, 5, 5, 5, 5)); 
+
+  fButFileReset = new TGTextButton (fTabF1a, "Reset", M_FILERESET ) ;
+  fButFileReset->Associate(this) ; 
+  fTabF1a->AddFrame (fButFileReset, new TGLayoutHints (kLHintsRight, 10, 10, 10, 10  ) ) ; 
+  
+  
+  
+  //   the items in the second subfraem
+
+  fLabDir = new TGLabel(fTabF1b, new TGString("Directory:") );
+  fTabF1b->AddFrame( fLabDir, new TGLayoutHints (kLHintsLeft, 10, 10, 10, 10)) ; 
+
+  fDir = new TGListBox(fTabF1b, -1) ; 
   fDir->Resize(350,20) ;
   char temp[100] ; 
@@ -107 +141 @@
   sprintf ( temp, "%s", gSystem->WorkingDirectory()  ) ; 
   fDir->AddEntry(temp, 1) ; 
-  fTabF1a->AddFrame( fDir, new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; 
+  fTabF1b->AddFrame( fDir, new TGLayoutHints(kLHintsTop | kLHintsLeft | kLHintsExpandX, 5, 5, 5, 5 ) ) ; 
 
 
   fPicCdup = fClient->GetPicture("tb_uplevel.xpm") ; 
-  fCdup = new TGPictureButton(fTabF1a, fPicCdup, M_PBUTTON_CDIR_UP ) ; 
+  fCdup = new TGPictureButton(fTabF1b, fPicCdup, M_PBUTTON_CDIR_UP ) ; 
   fCdup->SetToolTipText("One Level up!") ; 
   fCdup->Associate(this) ; 
-  fTabF1a->AddFrame (fCdup, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; 
+  fTabF1b->AddFrame (fCdup, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; 
 
   fPicList = fClient->GetPicture("tb_list.xpm") ; 
-  fListMode = new TGPictureButton(fTabF1a, fPicList, M_PBUTTON_LIST_MODE ) ; 
+  fListMode = new TGPictureButton(fTabF1b, fPicList, M_PBUTTON_LIST_MODE ) ; 
   fListMode->SetToolTipText("List Mode") ; 
   fListMode->Associate(this) ; 
   fListMode->SetState(kButtonUp) ; 
   fListMode->AllowStayDown(kTRUE) ; 
-  fListMode->AllowStayDown(kTRUE) ;  fTabF1a->AddFrame (fListMode, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ;
+  fListMode->AllowStayDown(kTRUE) ;  fTabF1b->AddFrame (fListMode, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ;
 
   fPicDetail = fClient->GetPicture("tb_details.xpm") ; 
-  fDetail = new TGPictureButton(fTabF1a, fPicDetail, M_PBUTTON_DETAIL_MODE ) ; 
+  fDetail = new TGPictureButton(fTabF1b, fPicDetail, M_PBUTTON_DETAIL_MODE ) ; 
   fDetail->SetToolTipText("Details Mode") ; 
   fDetail->Associate(this) ; 
   fDetail->SetState(kButtonEngaged) ; 
   fDetail->AllowStayDown(kTRUE) ; 
-  fTabF1a->AddFrame (fDetail, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; 
-
-    
-  fFileView = new TGListView(fTabF1b, 540, 380 ) ; 
+  fTabF1b->AddFrame (fDetail, new TGLayoutHints(kLHintsLeft | kLHintsTop, 5, 5, 5, 5) ) ; 
+
+  // the items in the third subframe
+
+  fFileView = new TGListView(fTabF1c, 540, 380 ) ; 
   fFileCont = new TGFileContainer(fFileView->GetViewPort(), 100, 100,
                                   kVerticalFrame, fgWhitePixel) ; 
@@ -146 +181 @@
   fFileCont->Sort(kSortByName) ; 
   
-  fTabF1b->AddFrame(fFileView, new TGLayoutHints(kLHintsTop | kLHintsExpandX | kLHintsExpandY, 5, 5, 5, 5) ) ; 
+  fTabF1c->AddFrame(fFileView, new TGLayoutHints(kLHintsTop | kLHintsExpandX | kLHintsExpandY, 5, 5, 5, 5) ) ; 
 
   tf->AddFrame(fTabF1, fLayTab) ;
@@ -187 +222 @@
     delete fDetail;
     delete fDir ;
+    delete fLabDir ; 
+
+    delete fButFileReset ; 
+    delete fTxtFileName  ; 
+    delete fLabFileName  ; 
+    
+    delete fTabF1c;
     delete fTabF1b;
     delete fTabF1a;
@@ -193 +235 @@
     delete fTop1;
     delete fTab;
+
     delete fFrameTop;
     delete fFrameLow;
+    delete fLineSep2 ; 
+    delete fLineSep1 ; 
+
     delete fFileMenu;
     delete fMenuBar;
@@ -269 +315 @@
 
               break ; 
-                  
+                
+
+            case M_FILERESET:
+              
+              sprintf ( fInputFile, "\n" ) ; 
+              fTxtFileName->SetText( fInputFile ) ; 
+              
+              break; 
             case M_PBUTTON_CDIR_UP :
 
@@ -375 +428 @@
                 else if  ( ! strcmp(extens, "root") ) {      //     root file
                   sprintf ( fInputFile, "%s/%s" , gSystem->WorkingDirectory(), wort ) ;  
-
-                  printf (" %s \n", fInputFile ) ; 
+                  fTxtFileName->SetText( fInputFile ) ;
+
                   break ; 
                 }

trunk/MagicSoft/Mars/mgui/MGPrototyp.h

@@ -19 +19 @@
 class TGFileContainer;
 class TGListView;
+class TGHorizontal3DLine;
+class TGLabel ; 
+class TGTextEntry ; 
+class TGTextBuffer; 
 
 class MGPrototyp : public TGTransientFrame {
@@ -35 +39 @@
   TGMenuBar         *fMenuBar ; 
   TGPopupMenu       *fFileMenu ;
+  TGHorizontal3DLine *fLineSep1, *fLineSep2 ; 
+
 
   //   divide the Window in two different parts
@@ -53 +59 @@
 
   TGCompositeFrame  *fTabF1 ;                       // first tab of low part 
-  TGCompositeFrame  *fTabF1a, *fTabF1b ;            // subpart of the file selector in low window
+  TGCompositeFrame  *fTabF1a, *fTabF1b, *fTabF1c ;  // subpart of the file selector in low window
+
+  TGLabel           *fLabFileName ; 
+  TGTextEntry       *fTxtFileName ; 
+  TGTextBuffer      *fTxtBufFileName ; //!
+  TGTextButton      *fButFileReset ; 
+ 
+  TGLabel           *fLabDir ; 
   TGListBox         *fDir ; 
   TGPictureButton   *fCdup, *fListMode, *fDetail ; 

trunk/MagicSoft/Mars/mgui/Makefile

@@ -27 +27 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mraw -I../mdatacheck
+INCLUDES = -I. -I../mbase -I../mraw -I../mdatacheck -I../meventdisp
 
 #
@@ -53 +53 @@
 
 SRCFILES = MGMarsMain.cc \
+           MGEventDispMain.cc \
            MGDataCheckMain.cc \
            MGMonteCarloMain.cc \