Changeset 8824 for trunk/MagicSoft/Cosy/gui

Timestamp:

01/24/08 09:20:59 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Cosy/gui/MGCosy.cc (modified) (11 diffs)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -37 +37 @@
 #include "SlaStars.h"
 
-#undef DEBUG
+#define DEBUG
+//#undef DEBUG
 //#define EXPERT
 //#define HAS_DEMO
@@ -84 +85 @@
 void MGCosy::CreateMenu()
 {
-    TGLayoutHints *laymenubar  = new TGLayoutHints (kLHintsNormal | kLHintsExpandX);
-    TGLayoutHints *laymenuitem = new TGLayoutHints (kLHintsNormal, 0, 4, 0, 0);
-    fList->Add(laymenubar);
-    fList->Add(laymenuitem);
+    //
+    //  the button messages are handled by main frame (this)
+    //
+    TGMenuBar   *menubar  = new TGMenuBar(this, 1, 1, kHorizontalFrame);
+    TGPopupMenu *filemenu = menubar->AddPopup("&File");
+    TGPopupMenu *logmenu  = menubar->AddPopup("&Log");
 
     //
     //  crate the menu bar
     //
-    TGPopupMenu *filemenu = new TGPopupMenu(gClient->GetRoot());
     filemenu->AddEntry("Set Aspect", IDM_ASPECT);
     filemenu->AddEntry("Exit", IDM_EXIT);
     filemenu->Associate(this);
-    fList->Add(filemenu);
 
     //
     // Log Menu
     //
-    TGPopupMenu *logmenu = new TGPopupMenu(gClient->GetRoot());
     logmenu->AddEntry("&Copy Selected", kLogCopy);
     logmenu->AddEntry("&Select All",    kLogSelect);
     logmenu->AddSeparator();
     logmenu->AddEntry("Clear &all",     kLogClear);
-    /*
-     logmenu->AddSeparator();
-     logmenu->AddEntry("Search",         kLogSearch);
-     */
+    //logmenu->AddSeparator();
+    //logmenu->AddEntry("Search",         kLogSearch);
     logmenu->AddSeparator();
     logmenu->AddEntry("Sa&ve",          kLogSave);
@@ -116 +114 @@
 
     //
-    //  the button messages are handled by main frame (this)
-    //
-    TGMenuBar *menubar = new TGMenuBar(this, 1, 1, kHorizontalFrame);
-    menubar->AddPopup("File", filemenu, laymenuitem);
-    menubar->AddPopup("Lo&g", logmenu,  laymenuitem);
-    AddFrame(menubar, laymenubar);
-    fList->Add(menubar);
-
-    //
     //  Seperator beyond menubar
     //
     TGHorizontal3DLine *linesep = new TGHorizontal3DLine(this);
-    AddFrame(linesep, laymenubar);
-    fList->Add(linesep);
+
+    //
+    // Setup Frames
+    //
+    TGLayoutHints *laymenubar  = new TGLayoutHints (kLHintsNormal | kLHintsExpandX);
+
+    AddFrame(menubar, (TGLayoutHints*)laymenubar->Clone());
+    AddFrame(linesep, (TGLayoutHints*)laymenubar->Clone());
+
+    delete laymenubar;
 }
 
@@ -449 +446 @@
     l2->Move(x, y+h);
     l3->Move(x, y+2*h);
-    l4->Move(x, y+3*h);
+    //l4->Move(x, y+3*h);
     fList->Add(l1);
     fList->Add(l2);
     fList->Add(l3);
-    fList->Add(l4);
+    //fList->Add(l4);
 
 #ifdef EXPERT
@@ -713 +710 @@
     : TGMainFrame(p, w, h), fObservatory(key), fQueue(q)
 {
+    // This means that all objects added with AddFrame are deleted
+    // automatically, including all LayoutHints.
+    SetCleanup();
+
     fList = new MGList;
+    fList->SetOwner();
 
     fFont = gVirtualX->LoadQueryFont("7x13bold");
 
-#ifdef DEBUG
-    cout << "MGCosy: Creating Menu" << endl;
-#endif
     CreateMenu();
 
-#ifdef DEBUG
-    cout << "MGCosy: Creating TGCompositeFrame" << endl;
-#endif
     TGHorizontalFrame *f1 = new TGHorizontalFrame(this, 0, 0);
     TGHorizontalFrame *f2 = new TGHorizontalFrame(this, 0, 0);
-    fList->Add(f1);
-    fList->Add(f2);
-
-#ifdef DEBUG
-    cout << "MGCosy: Creating TGTab" << endl;
-#endif
+    f1->SetCleanup();
+    f2->SetCleanup();
+    //fList->Add(f1);
+    //fList->Add(f2);
+
     fTab = new TGTab(f1, 300, 300);
-    fList->Add(fTab);
-
-#ifdef DEBUG
-    cout << "MGCosy: Creating MGSkyPosition" << endl;
-#endif
+    //fList->Add(fTab);
+
     fSkyPosition = new MGSkyPosition(fObservatory, f1, 300);
-#ifdef DEBUG
-    cout << "MGCosy: Creating MGAccuracy" << endl;
-#endif
+
     fAccuracy = new MGAccuracy(f1, 300);
     fAccuracy->DrawText("0.5se", "1.0se", "2.0se", "Ctrl Deviation [min]");
     fAccuracy->DrawCircles();
-#ifdef DEBUG
-    cout << "MGCosy: Creating MGVelocity" << endl;
-#endif
 
     fImage = new MGImage(f2, 768/2-1, 576/2-1, kRaisedFrame);
     //fVelocity = new MGVelocity(f2, "Velocity [U_{mot}/min]", 300);
     //    fOffset      = new MGVelocity   (f, "Offset se-re [']", 300);
-#ifdef DEBUG
-    cout << "MGCosy: Creating MGVelocityTime" << endl;
-#endif
 //  fAccuracyTime = new MGAccuracyTime(f2, 300);
 
-    fList->Add(fSkyPosition);
-    fList->Add(fAccuracy);
+    //fList->Add(fSkyPosition);
+    //fList->Add(fAccuracy);
     //  fList->Add(fAccuracyTime);
     //  fList->Add(fVelocity);
     //  fList->Add(fOffset);
-    fList->Add(fImage);
-
-#ifdef DEBUG
-    cout << "MGCosy: Creating TGGroupFrame" << endl;
-#endif
+    //fList->Add(fImage);
+
     TGGroupFrame *frame = new TGGroupFrame(f2, "Status");
-    fList->Add(frame);
-
-#ifdef DEBUG
-    cout << "MGCosy: Creating TGTextView" << endl;
-#endif
+    // frame->SetCleanup();
+    //fList->Add(frame);
+
     fLog = new TGTextView(f2, 300, 300);
     if (fFont)
         fLog->SetFont(fFont);
-    fList->Add(fLog);
+    //fList->Add(fLog);
 
     TGLayoutHints *hints1  = new TGLayoutHints(kLHintsNormal  | kLHintsExpandX|kLHintsExpandY, 6, 6, 6, 3);
@@ -789 +768 @@
     TGLayoutHints *hints3b = new TGLayoutHints(kLHintsRight   | kLHintsCenterY|kLHintsExpandX|kLHintsExpandY);
 
+    /*
     fList->Add(hints1);
     fList->Add(hints2);
@@ -797 +777 @@
     fList->Add(hints2b);
     fList->Add(hints3b);
-
+    */
     // Layout upper frame
     f1->AddFrame(fTab,         hints1a);
@@ -814 +794 @@
     AddFrame(f2, hints2);
 
-#ifdef DEBUG
-    cout << "MGCosy: Creating Tabs" << endl;
-#endif
     CreateTabs();
-#ifdef DEBUG
-    cout << "MGCosy: Creating Label" << endl;
-#endif
     CreateLabel(frame);
 
@@ -826 +800 @@
     //   Map the window, set up the layout, etc.
     //
-#ifdef DEBUG
-    cout << "MGCosy: Setting Size" << endl;
-#endif
     const Int_t ww = 1010;
     const Int_t hh =  700;
@@ -848 +819 @@
 MGCosy::~MGCosy()
 {
+    /*
+    TIter Next(fList);
+    TObject *o=0;
+    while((o=Next()))
+    {
+        cout << o << " " << flush;
+        cout << o->ClassName() << " " << flush;
+        cout << o->GetName() << " " << endl;
+        delete o;
+    }
+    */
 #ifdef DEBUG
     cout << "MGCosy::~MGCosy called." << endl;
@@ -1466 +1448 @@
                     {
                     case kPB_RAp:
-                        xy.X(xy.X()+1./60);
+                        xy.Set(xy.X()+1./60, xy.Y());
                         break;
                     case kPB_RAm:
-                        xy.X(xy.X()-1./60);
+                        xy.Set(xy.X()-1./60, xy.Y());
                         break;
                     case kPB_DECp:
-                        xy.Y(xy.Y()+1./60);
+                        xy.Set(xy.X(), xy.Y()+1./60);
                         break;
                     case kPB_DECm:
-                        xy.Y(xy.Y()-1./60);
+                        xy.Set(xy.X(), xy.Y()-1./60);
                         break;
                     }