Changeset 910 for trunk/MagicSoft/Cosy/gui

Timestamp:

08/15/01 12:52:38 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy/gui

Files:

• MGCosy.cc (modified) (6 diffs)
• MGCosy.h (modified) (3 diffs)
• Makefile (added)

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -10 +10 @@
 #include <TGLabel.h>       // TGLabel
 #include <TGSplitter.h>    // TGHorizontal3DLine
+#include <TApplication.h>  // gApplication
 
 #include "timer.h"         // Timer
@@ -16 +17 @@
 #include "MGList.h"
 #include "MGCoordinates.h"
+#include "MGSkyPosition.h"
 
 #include "Slalib.h"
@@ -149 +151 @@
 
     fCoord = new MGCoordinates(this, kTRUE,
-                                "Coordinate 1 [\xb0]:", "Coordinate 2 [\xb0]:");
+                               "Coordinate 1 [\xb0]:", "Coordinate 2 [\xb0]:");
     fCoord->Move(10, 160);
     fList->Add(fCoord);
 
+    fSkyPosition = new MGSkyPosition(this);
+    fSkyPosition->Move(320, 40);
+    fSkyPosition->Resize(200, 200);
+    fList->Add(fSkyPosition);
+
     //
     //   Map the window, set up the layout, etc.
     //
-    SetWMSizeHints(350, 250, 350, 250, 10, 10 ) ;  // set the smallest and biggest size of the Main frame
+    SetWMSizeHints(550, 250, 550, 250, 10, 10);  // set the smallest and biggest size of the Main frame
 
     MapSubwindows();
@@ -173 +180 @@
 MGCosy::~MGCosy()
 {
+    cout << "Deleting MGCosy." << endl;
+
     delete fLayMenuBar;
     delete fLayMenuItem;
 
-    fList->Delete();
+    cout << "Deleting MGCosy::fList" << endl;
+
     delete fList;
+
+    cout << "MGCosy deleted." << endl;
 }
 // ======================================================================
@@ -188 +200 @@
     // window menu item is selected.
 
-    gSystem->ExitLoop();
+    //gSystem->ExitLoop();
     //  gSystem->DispatchOneEvent(kTRUE);
 
     //    TGMainFrame::CloseWindow();
-    //  gROOT->GetApplication()->Terminate(0);
+    gApplication->Terminate(0);
 }
 
@@ -270 +282 @@
             {
             case IDM_EXIT:
+                cout << "Idm_Exit." << endl;
                 CloseWindow();
                 return kTRUE;

trunk/MagicSoft/Cosy/gui/MGCosy.h

@@ -26 +26 @@
 class MGList;
 class MGCoordinates;
+class MGSkyPosition;
 
 class MGCosy : public TGMainFrame
@@ -44 +45 @@
 
     MGCoordinates *fCoord;
+    MGSkyPosition *fSkyPosition;
 
     MsgQueue      *fQueue;
@@ -61 +63 @@
     TGLabel **GetLabel3() { return fLabel3; }
 
+    MGSkyPosition *GetSkyDisplay() { return fSkyPosition; }
+
     Bool_t ProcessMessage(Long_t msg, Long_t mp1, Long_t mp2);
 };