Changeset 1081 for trunk/MagicSoft/Mars/meventdisp

Timestamp:

11/15/01 11:24:06 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/meventdisp

Files:

• MGCamDisplay.cc (modified) (4 diffs)
• MGEvtDisplay.cc (modified) (2 diffs)
• MGFadcDisp.cc (modified) (1 diff)

trunk/MagicSoft/Mars/meventdisp/MGCamDisplay.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  10/2001 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -30 +30 @@
 #include <TGButtonGroup.h>  // TGVButtonGroup
 
+#include "MGTask.h"         // MGTask::CreateGui
 #include "MClone.h"         // MClone
 #include "MHillas.h"        // MHillas
@@ -60 +61 @@
     // Create gui elements for vertical frame
     //
-    TGVButtonGroup *group = new TGVButtonGroup(fTab1);
+    TGGroupFrame *grp = new TGGroupFrame(fTab1, "Display");
+    TGVButtonGroup *group = new TGVButtonGroup(grp);
     fList->Add(group);
 
     TGRadioButton *but1 = new TGRadioButton(group, "Raw Events",      kRButRawEvt);
     TGRadioButton *but2 = new TGRadioButton(group, "Cleaned Events",  kRButCleanedEvt);
-    TGCheckButton *but3 = new TGCheckButton(fTab1, "Display Ellipse", kCButHillas);
+    TGCheckButton *but3 = new TGCheckButton(grp,   "Display Ellipse", kCButHillas);
 
     but2->SetState(kButtonDown);
@@ -91 +93 @@
     fList->Add(laybut);
 
-    fTab1->AddFrame(group);
-    fTab1->AddFrame(but3, laybut);
+    grp->AddFrame(group);
+    grp->AddFrame(but3, laybut);
+
+    TGLayoutHints *laygrp1 = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 10, 10, 5, 0);
+    TGLayoutHints *laygrp2 = new TGLayoutHints(kLHintsNormal|kLHintsExpandX, 10, 10, 5, 5);
+
+    fTab1->AddFrame(grp, laygrp1);
+    ((MGTask*)GetTaskList()->FindObject("MImgCleanStd"))->CreateGui(fTab1, laygrp2);
 }
 

trunk/MagicSoft/Mars/meventdisp/MGEvtDisplay.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  10/2001 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001
@@ -467 +467 @@
     static TString dir(".");
 
-    TGFileInfo fi;
+    TGFileInfo fi; // fFileName and fIniDir deleted in ~TGFileInfo
 
     fi.fFileTypes = gSaveAsTypes;

trunk/MagicSoft/Mars/meventdisp/MGFadcDisp.cc

@@ -16 +16 @@
 !
 !
-!   Author(s): Thomas Bretz  10/2001 (tbretz@uni-sw.gwdg.de)
+!   Author(s): Thomas Bretz  10/2001 <mailto:tbretz@uni-sw.gwdg.de>
 !
 !   Copyright: MAGIC Software Development, 2000-2001