Changeset 8807 for trunk/MagicSoft

Timestamp:

01/14/08 16:18:59 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Cosy/Changelog (modified) (1 diff)
• Cosy/tpoint/gui.C (modified) (9 diffs)
• Mars/Changelog (modified) (1 diff)
• Mars/mpointing/MPointing.h (modified) (1 diff)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2008/01/14 Thomas Bretz
+
+   * tpoint/gui.C:
+     - added individual reset buttons
+
+
 
  2008/01/09 Thomas Bretz

trunk/MagicSoft/Cosy/tpoint/gui.C

@@ -1101 +1101 @@
     }
 
-    Bool_t ProcessMessage(Long_t msg, Long_t mp1, Long_t)
+    Bool_t ProcessMessage(Long_t msg, Long_t mp1, Long_t mp2)
     {
         // cout << "Msg: " << hex << GET_MSG(msg) << endl;
@@ -1148 +1148 @@
                     return kTRUE;
                 }
+
+                // In the default cas a reset button must have been pressed
+                cout << "DEL! " << mp1-2*MPointing::GetNumPar() <<endl;
+
+                fBending[mp1-2*MPointing::GetNumPar()] = 0;
+                DisplayBending();
+
                 return kTRUE;
             }
@@ -1155 +1162 @@
     }
 
-    void AddTextButton(TGCompositeFrame *f, TString txt, Int_t id=-1, TGLayoutHints *h=0)
+    TGButton *AddTextButton(TGCompositeFrame *f, TString txt, Int_t id=-1, TGLayoutHints *h=0)
     {
         TGButton *but = new TGTextButton(f, txt, id);
@@ -1161 +1168 @@
         f->AddFrame(but, h);
         fList->Add(but);
-
-    }
-
-    void AddCheckButton(TGCompositeFrame *f, TString txt, Int_t id=-1, TGLayoutHints *h=0)
+        return but;
+
+    }
+
+    TGButton *AddCheckButton(TGCompositeFrame *f, TString txt, Int_t id=-1, TGLayoutHints *h=0)
     {
         TGButton *but = new TGCheckButton(f, txt, id);
@@ -1170 +1178 @@
         f->AddFrame(but, h);
         fList->Add(but);
+        return but;
+    }
+
+    TGButton *AddResetButton(TGCompositeFrame *f, Int_t id, TGLayoutHints *h, Int_t height)
+    {
+        // Move this to a AddResetButton function
+        TGPictureButton *but = new TGPictureButton(f, "Totenkopf.xpm", id);
+        but->SetHeight(height); // Offsets from TGLayout
+        but->SetWidth(height);
+        but->Associate(this);
+        f->AddFrame(but, h);
+        fList->Add(but);
+        return but;
     }
 
@@ -1233 +1254 @@
         fFont = gVirtualX->LoadQueryFont("7x13bold");
 
-        TGLayoutHints *hints0 = new TGLayoutHints(kLHintsExpandY, 7, 5, 5, 6);
+        TGLayoutHints *hints0 = new TGLayoutHints(kLHintsExpandY,                7, 5, 5, 0);
         TGLayoutHints *hints1 = new TGLayoutHints(kLHintsExpandX|kLHintsExpandY, 5, 7, 5, 6);
         TGLayoutHints *hints2 = new TGLayoutHints(kLHintsCenterX|kLHintsCenterY, 5, 5, 5, 5);
@@ -1267 +1288 @@
         fList->Add(comp);
 
-        TGLayoutHints *hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 20, 5, 0);
+        TGLayoutHints *hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 10, 5, 0); //20, 5, 0);
         fList->Add(hints3);
 
-        TGLabel *l;
-
         TGVerticalFrame *vframe = new TGVerticalFrame(comp, 1, 1);
+        for (int i=0; i<MPointing::GetNumPar(); i++)
+            AddCheckButton(vframe, fBending.GetVarName(i), i);
+
+        TGButton *but = (TGButton*)fList->FindWidget(0);
+
+
+
         comp->AddFrame(vframe, hints3);
         fList->Add(vframe);
-
-        for (int i=0; i<MPointing::GetNumPar(); i++)
-            AddCheckButton(vframe, fBending.GetVarName(i), i);
 
         vframe = new TGVerticalFrame(comp, 1, 1);
@@ -1283 +1306 @@
         fList->Add(vframe);
 
-        l = new TGLabel(vframe, "+000.0000");
+        hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 7, 5, 0);
+        fList->Add(hints3);
+
+        TGLabel *l = new TGLabel(vframe, "+000.0000");
         l->SetTextJustify(kTextRight);
         fList->Add(l);
         fLabel.Add(l);
 
-        TGButton *but = (TGButton*)fList->FindWidget(0);
-
         TGLayoutHints *h = new TGLayoutHints(kLHintsCenterY, 0, 0, but->GetHeight()-l->GetHeight());
         fList->Add(h);
@@ -1301 +1325 @@
         comp->AddFrame(vframe, hints3);
         fList->Add(vframe);
-
         for (int i=0; i<MPointing::GetNumPar(); i++)
             AddLabel(vframe, "\xb1 00.0000\xb0", h)->SetTextJustify(kTextRight);
+
+        hints3 = new TGLayoutHints(kLHintsLeft|kLHintsTop, 0, 20, 5, 0);
+        fList->Add(hints3);
+
+        TGLayoutHints *hreset = new TGLayoutHints(kLHintsNormal, 0, 0, 3, 1);
+        fList->Add(hreset);
+
+        TGVerticalFrame *vframe2 = new TGVerticalFrame(comp, 1, 1);
+        comp->AddFrame(vframe2, hints3);
+        fList->Add(vframe2);
+        for (int i=0; i<MPointing::GetNumPar(); i++)
+            AddResetButton(vframe2, i+2*MPointing::GetNumPar(), hreset,
+                           but->GetHeight()-4);
 
         vframe = new TGVerticalFrame(comp, 1, 1);
         comp->AddFrame(vframe, hints3);
         fList->Add(vframe);
-
         for (int i=0; i<MPointing::GetNumPar(); i++)
             AddLabel(vframe, fBending.GetDescription(i), h);

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2008/01/14 Thomas Bretz
+
+   * mpointing/MPointing.h:
+     - added enumeration operator[]
+
+
 
  2008/01/11 Thomas Bretz

trunk/MagicSoft/Mars/mpointing/MPointing.h

@@ -227 +227 @@
     }
 
+    Double_t &operator[](UInt_t i) { return *fCoeff[i]; }
+
     void SetMinuitParameters(TMinuit &m, Int_t n=-1) const;
     void GetMinuitParameters(TMinuit &m, Int_t n=-1);