Changeset 921 for trunk/MagicSoft/Cosy/gui/MGCoordinate.cc

Timestamp:

08/30/01 16:02:20 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGCoordinate.cc (modified) (4 diffs)

trunk/MagicSoft/Cosy/gui/MGCoordinate.cc

@@ -23 +23 @@
 };
 
-MGCoordinate::MGCoordinate(const TGWindow* p,
+MGCoordinate::MGCoordinate(const TGWindow* p, const Int_t type=kETypeDeg,
                            const Bool_t flag, const char *txt,
                            const Int_t deg, const UInt_t min, const UInt_t sec)
-: TGFrame(p, 114, flag?76:46, kSunkenFrame|kFixedSize), fDeg(deg), fMin(min), fSec(sec)
+: TGFrame(p, 119, flag?76:46, kSunkenFrame|kFixedSize), fDeg(deg), fMin(min), fSec(sec)
 {
     // p = pointer to MainFrame (not owner)
@@ -37 +37 @@
         // fTextEntryMin->SetAlignment(kTextCenterX);
         // fTextEntrySec->SetAlignment(kTextCenterX);
-        fTextEntryDeg->Move( 4, 26);
-        fTextEntryMin->Move(44, 26);
-        fTextEntrySec->Move(78, 26);
+        fTextEntryDeg->Move( 7, 26);
+        fTextEntryMin->Move(47, 26);
+        fTextEntrySec->Move(81, 26);
         fTextEntryDeg->MapWindow();
         fTextEntryMin->MapWindow();
@@ -60 +60 @@
     fLabelMin->SetTextJustify(kTextRight);
     fLabelSec->SetTextJustify(kTextRight);
-    fLabelDeg->Move( 4+6, ypos);
-    fLabelMin->Move(44+6, ypos);
-    fLabelSec->Move(78+6, ypos);
+    fLabelDeg->Move(13, ypos);
+    fLabelMin->Move(53, ypos);
+    fLabelSec->Move(87, ypos);
     fLabelDeg->MapWindow();
     fLabelMin->MapWindow();
@@ -82 +82 @@
     TGLabel *label;
 
+    const char *deg = type==kETypeDeg ? "\xb0" : "h";
+    const char *min = type==kETypeDeg ? "'"    : "m";
+    const char *sec = type==kETypeDeg ? "\""   : "s";
+
     if (flag)
     {
-        label = new TGLabel(this, "\xb0");
+        label = new TGLabel(this, deg);
         label->SetTextJustify(kTextLeft);
-        label->Move(36, 26);
+        label->Move(39, 26);
         label->MapWindow();
         fList.Add(label);
 
-        label = new TGLabel(this, "'");
+        label = new TGLabel(this, min);
         label->SetTextJustify(kTextLeft);
-        label->Move(70, 26);
+        label->Move(73, 26);
         label->MapWindow();
         fList.Add(label);
 
-        label = new TGLabel(this, "\"");
+        label = new TGLabel(this, sec);
         label->SetTextJustify(kTextLeft);
-        label->Move(104, 26);
+        label->Move(107, 26);
         label->MapWindow();
         fList.Add(label);
     }
 
-    label = new TGLabel(this, "\xb0");
+    label = new TGLabel(this, deg);
     label->SetTextJustify(kTextLeft);
-    label->Move(36, ypos);
+    label->Move(39, ypos);
     label->MapWindow();
     fList.Add(label);
 
-    label = new TGLabel(this, "'");
+    label = new TGLabel(this, min);
     label->SetTextJustify(kTextLeft);
-    label->Move(70, ypos);
+    label->Move(73, ypos);
     label->MapWindow();
     fList.Add(label);
  
-    label = new TGLabel(this, "\"");
+    label = new TGLabel(this, sec);
     label->SetTextJustify(kTextLeft);
-    label->Move(104, ypos);
+    label->Move(107, ypos);
     label->MapWindow();
     fList.Add(label);