Changeset 8838

Timestamp:

01/30/08 13:55:40 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Cosy

Files:

• Changelog (modified) (2 diffs)
• candrv/sdolist.cc (modified) (1 diff)
• gui/GuiIncl.h (modified) (1 diff)
• gui/MGCoordinates.h (modified) (2 diffs)
• gui/MGCosy.cc (modified) (5 diffs)
• main/MStarguider.cc (modified) (3 diffs)

trunk/MagicSoft/Cosy/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2008/01/30 Thomas Bretz
+
+   * candrv/sdolist.cc:
+     - use the ?: operator instead of a cast
+
+   * gui/GuiIncl.h:
+     - removed obsolete coord.h
+
+   * gui/MGCoordinates.h:
+     - added include of MPointing instead of forward declaration of class XY
+
+   * gui/MGCosy.cc:
+     - revised includes
+     - added some manipulators
+
+   * main/MStarguider.cc:
+     - revised includes
+
+
 
  2008/01/27 Thomas Bretz
@@ -91 +111 @@
      - thread doesn't run detached anymore
 
-   * candrv/nodedrv.[h,cc], devdrv/macs.[h,cc], devdrv/shaftencoder.[h,cc]:
+   * candrv/nodedrv.[h,cc], devdrv/macs.[h,cc], devdrv/shaftencoder.[h,cc],
+     candrv/network.[h,cc]:
      - changed from lout to gLog
      - added maipulators 

trunk/MagicSoft/Cosy/candrv/sdolist.cc

@@ -93 +93 @@
 int PendingSDOList::IsPending() const
 {
-    return (int)fFirst->Next;
+    return fFirst->Next ? 1 : 0;
 }
 

trunk/MagicSoft/Cosy/gui/GuiIncl.h

@@ -1 +1 @@
 #ifndef __CINT__
 
-#include "coord.h"
-
 #endif // __CINT__

trunk/MagicSoft/Cosy/gui/MGCoordinates.h

@@ -1 +1 @@
 #ifndef COSY_MGCoordinates
 #define COSY_MGCoordinates
-
-//
-// This File contains the declaration of the MGCoordinates-class
-//
-//   Author: Thomas Bretz
-//   Version: V1.0 (1-8-2000)
 
 #ifndef ROOT_TGFrame
@@ -12 +6 @@
 #endif
 
-class XY;
+#ifndef MARS_MPointing
+#include "MPointing.h"
+#endif
 
 enum {

trunk/MagicSoft/Cosy/gui/MGCosy.cc

@@ -3 +3 @@
 #include <iomanip>
 #include <fstream>
-
-#include "msgqueue.h"
-#include "coord.h"
-#include "slalib.h"
 
 #include <TROOT.h>
@@ -22 +18 @@
 #include <TApplication.h>  // gApplication
 
-#include "MCosy.h"
+#include "MLog.h"
+#include "MLogManip.h"
+
 #include "MTime.h"
 #include "MString.h"
 #include "MAstro.h"
+
+#include "MCosy.h"
 #include "MGList.h"
 #include "MDriveCom.h"
@@ -36 +36 @@
 
 #include "SlaStars.h"
+/*
+#include "msgqueue.h"
+#include "coord.h"
+#include "slalib.h"
+*/
 
 #define DEBUG
@@ -323 +328 @@
     if (!fin)
     {
-        cout << "ERROR: Predifined positions in 'prepos.txt' not found." << endl;
+        gLog << err << "ERROR: Predifined positions in 'prepos.txt' not found." << endl;
         return;
     }
@@ -359 +364 @@
     if (!fin)
     {
-        cout << "ERROR: Star List 'stars.txt' not found." << endl;
+        gLog << err << "ERROR: Star List 'stars.txt' not found." << endl;
         return;
     }

trunk/MagicSoft/Cosy/main/MStarguider.cc

@@ -5 +5 @@
 
 #include <fstream>    // ifstream
-#include <iostream>   // cout
-#include <iomanip>    // cout
 
 #include <TH2F.h>
@@ -14 +12 @@
 #include <TFile.h> // temp writeout of histos
 #include <TSocket.h>
-
-#include "MAstro.h"
-#include "MString.h"
 
 #include <TGMenu.h>
@@ -25 +20 @@
 #include <TGLayout.h>
 #include "MString.h"
+
+#include "MLog.h"
+#include "MLogManip.h"
+
+#include "MAstro.h"
+#include "MString.h"
+
 
 #include "MCosy.h"