Changeset 1540 for trunk/MagicSoft/Mars/mmain

Timestamp:

10/15/02 17:02:46 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mmain

Files:

• MMars.cc (modified) (6 diffs)
• MMars.h (modified) (1 diff)
• MProgressBar.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mmain/MMars.cc

@@ -111 +111 @@
 }
 
-void MMars::CreateTextButton(TGVerticalFrame *tab, const char *text,
-                             const UInt_t id, TGLayoutHints *hints) const
+#include <TGLabel.h>
+
+void MMars::CreateTextButton(TGVerticalFrame *tab,
+                             const char *text, const char *descr,
+                             const UInt_t id) const
 {
     //
     // Create the button
     //
-    TGTextButton *button = new TGTextButton(tab, text, id);
+    TGHorizontalFrame *frame  = new TGHorizontalFrame(tab, 1, 1);
+    TGTextButton      *button = new TGTextButton(frame, text, id);
+    TGLabel           *label  = new TGLabel(frame, descr);
+    TGLayoutHints     *hints1 = new TGLayoutHints(kLHintsLeft|kLHintsCenterY|kLHintsExpandX, 5, 5, 2, 2);
 
     //
     // Add button for 'auto-delete'
     //
+    fList->Add(hints1);
     fList->Add(button);
+    fList->Add(label);
+    fList->Add(frame);
 
     //
@@ -132 +141 @@
     // Add button with corresponding layout to containing frame
     //
-    tab->AddFrame(button, hints);
+    tab->AddFrame(frame,    hints1);
+    frame->AddFrame(button, hints1);
+    frame->AddFrame(label,  hints1);
 }
 
@@ -143 +154 @@
     fList->Add(laytabs);
 
-    TGTab *tabs = new TGTab(low, 400, 400);
+    TGTab *tabs = new TGTab(low, 1, 1);
     fList->Add(tabs);
     low->AddFrame(tabs, laytabs);
@@ -152 +163 @@
     TGCompositeFrame *tf = tabs->AddTab("Control");
 
-    TGVerticalFrame *tab1 = new TGVerticalFrame(tf, 300, 100);
-    TGVerticalFrame *tab2 = new TGVerticalFrame(tf, 300, 100);
-
-    fList->Add(tab1);
-    fList->Add(tab2);
-
-    TGLayoutHints *laytabx = new TGLayoutHints(kLHintsTop|kLHintsExpandX);
-    fList->Add(laytabx);
-
-    tf->AddFrame(tab1, laytabx);
-    tf->AddFrame(tab2, laytabx);
-
-    TGLayoutHints *laybut = new TGLayoutHints(kLHintsTop|kLHintsCenterX, 10, 10, 10, 10);
-    fList->Add(laybut);
-
-    CreateTextButton(tab2, "Event Display",  kButEvtDisplay,    laybut);
-    CreateTextButton(tab2, "Data Check",     kButDataCheck,  laybut);
-    CreateTextButton(tab2, "Analysis",       kButAnalysis,    laybut);
-    CreateTextButton(tab2, "Monte Carlo",    kButMonteCarlo, laybut);
-    CreateTextButton(tab2, "Camera Display", kButCameraDisplay, laybut);
+    TGLayoutHints   *laytab = new TGLayoutHints(kLHintsCenterY|kLHintsExpandX);
+    TGVerticalFrame *tab    = new TGVerticalFrame(tf, 1, 1);
+    fList->Add(laytab);
+    fList->Add(tab);
+
+    CreateTextButton(tab, "Event Display",  "Historgrams: Pix per Event",
+                     kButEvtDisplay);
+    CreateTextButton(tab, "Data Check",     "Histograms: Pix per Run",
+                     kButDataCheck);
+    CreateTextButton(tab, "Analysis",       "Calculate image parameters",
+                     kButAnalysis);
+    CreateTextButton(tab, "Monte Carlo",    "Calculate MC stuff",
+                     kButMonteCarlo);
+    CreateTextButton(tab, "Camera Display", "Display Cerenekov Photons",
+                     kButCameraDisplay);
+
+    tf->AddFrame(tab, laytab);
 }
 
 MMars::MMars()
-: TGMainFrame(gClient->GetRoot(), 330, 400, kVerticalFrame|kFixedSize)
+: TGMainFrame(gClient->GetRoot(), 400, 400, kVerticalFrame)
 {
     //
@@ -191 +199 @@
     // create and layout the frame/contents
     //
-    TGHorizontalFrame *top = new TGHorizontalFrame(this, 300, 100);
-    TGHorizontalFrame *low = new TGHorizontalFrame(this, 300, 100);
+    TGHorizontalFrame *top = new TGHorizontalFrame(this, 1, 1);
+    TGHorizontalFrame *low = new TGHorizontalFrame(this, 1, 1);
 
     TGHorizontal3DLine *linesep = new TGHorizontal3DLine(this);
@@ -203 +211 @@
     CreateBottomFrame(low);
 
-    TGLayoutHints *layout = new TGLayoutHints(kLHintsTop|kLHintsExpandX);
-    fList->Add(layout);
-
-    AddFrame(top,     layout);
-    AddFrame(linesep, layout);
-    AddFrame(low,     layout);
-
-    //    CreateTopFrame(fTop2);
-    //    CreateBottomFrame(fTop3);
+    TGLayoutHints *layout1 = new TGLayoutHints(kLHintsTop|kLHintsExpandX);
+    TGLayoutHints *layout2 = new TGLayoutHints(kLHintsTop|kLHintsExpandX|kLHintsExpandY);
+    fList->Add(layout1);
+    fList->Add(layout2);
+
+    AddFrame(top,     layout1);
+    AddFrame(linesep, layout1);
+    AddFrame(low,     layout2);
 
     //
     //   Map the window, set up the layout, etc.
-    //   kFixedSize seems to be ignored
-    //
-    SetWMSizeHints(GetWidth(), GetHeight(), GetWidth(), GetHeight(), 0, 0);  // set the smallest and biggest size of the Main frame
+    //
     Move(rand()%100, rand()%100);
 
+    Layout();
+
     MapSubwindows();
-
-    Layout();
 
     SetWindowName("MARS Main Window");

trunk/MagicSoft/Mars/mmain/MMars.h

@@ -21 +21 @@
 
     void CreateTextButton(TGVerticalFrame *tab, const char *text,
-                          const UInt_t id, TGLayoutHints *hints) const;
+                          const char *descr, const UInt_t id) const;
 
     void CreateMenuBar();

trunk/MagicSoft/Mars/mmain/MProgressBar.cc

@@ -53 +53 @@
     fList->SetOwner();
 
+    //SetMWMHints(0, 0, 0);
+
     SetWMSizeHints(150, 15, 640, 480, 10, 10); // set the smallest and biggest size of the Main frame
     Move(rand()%100+50, rand()%100+50);