Changeset 9439 for trunk/MagicSoft/Cosy/gui

Timestamp:

05/09/09 13:48:12 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (7 diffs)
• MGCosy.h (modified) (2 diffs)
• MGStarg.cc (modified) (1 diff)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -318 +318 @@
 }
 
-void MGCosy::CreatePredefinedPos(TGCompositeFrame *tf1)
+void MGCosy::CreatePredefinedPos(TGCompositeFrame *tf1, const char *prepos)
 {
     TGComboBox *box = new TGComboBox(tf1, kCB_PredefPos);
@@ -331 +331 @@
     fList->Add(lay);
 
-    ifstream fin("prepos.txt");
+    ifstream fin(prepos);
     if (!fin)
     {
-        gLog << err << "ERROR: Predifined positions in 'prepos.txt' not found." << endl;
+        gLog << err << "ERROR: Predifined positions in '" << prepos << "' not found." << endl;
         return;
     }
@@ -391 +391 @@
 }
 
-void MGCosy::CreateTabs()
+void MGCosy::CreateTabs(const char *prepos)
 {
     TGCompositeFrame *tf1 = fTab->AddTab("Position");
@@ -408 +408 @@
     fList->Add(fCZdAz);
 
-    CreatePredefinedPos(tf1);
+    CreatePredefinedPos(tf1, prepos);
     CreateStarList(tf4);
 
@@ -728 +728 @@
 }
 
-MGCosy::MGCosy(MObservatory::LocationName_t key, MsgQueue *q)
+MGCosy::MGCosy(MObservatory::LocationName_t key, const char *prepos, MsgQueue *q)
     : TGMainFrame(gClient->GetRoot(), 1, 1), fObservatory(key), fQueue(q)
 {
@@ -755 +755 @@
 
     fAccuracy = new MGAccuracy(f1, 300);
-    fAccuracy->DrawText("0.5se", "1.0se", "2.0se", "Ctrl Deviation [min]");
+    fAccuracy->SetColorScale(1);
+    fAccuracy->DrawText("1.0'", "2.0'", "3.0'", "Ctrl Deviation [min]");
+    //fAccuracy->DrawText("0.5se", "1.0se", "2.0se", "");
     fAccuracy->DrawCircles();
 
@@ -815 +817 @@
     AddFrame(f2, hints2);
 
-    CreateTabs();
+    CreateTabs(prepos);
     CreateLabel(frame);
 

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -114 +114 @@
     void CreateMenu();
     void CreateLabel(TGCompositeFrame *f);
-    void CreateTabs();
-    void CreatePredefinedPos(TGCompositeFrame *tf1);
+    void CreateTabs(const char *prepos);
+    void CreatePredefinedPos(TGCompositeFrame *tf1, const char *prepos);
     void CreateStarList(TGCompositeFrame *tf1);
 
@@ -133 +133 @@
 
 public:
-    MGCosy(MObservatory::LocationName_t key, MsgQueue *q);
+    MGCosy(MObservatory::LocationName_t key, const char *prepos, MsgQueue *q);
     ~MGCosy();
 

trunk/MagicSoft/Cosy/gui/MGStarg.cc

@@ -23 +23 @@
 : MGAccuracy(p, w)
 {
-    SetColorScale(1.5);
+    SetColorScale(1);
+    DrawText("1.0'", "2.0'", "3.0'", "Mispointing [min]");
+    DrawHexagon();
 }