Changeset 4491

Timestamp:

08/04/04 16:49:20 (20 years ago)

Author:

merck

Message:

MMerck: Added AMCCmdState global variable.

File:

• trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/main.cpp (modified) (6 diffs)

trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/main.cpp

@@ +1 @@
+
 /***************************************************************************
                           main.cpp  -  description
@@ -27 +28 @@
 #include "amcserialport.h"
 #include "amcstate.h"
+#include "amccmdstate.h"
 #include "heatstate.h"
 #include "magicmirror.h"
@@ -37 +39 @@
 AMCState*                               g_pAMCState;
 HEATState*                              g_pHEATState;
-int                                                             g_iRefX, g_iRefY;
+AMCCmdState*                    g_pAMCCmdState;
+double                                          g_dRefX, g_dRefY;
 
 static const char *description =
@@ -70 +73 @@
         qDebug("Creating HEATState");
         g_pHEATState = new HEATState( 0 );
+        qDebug("Creating AMCCmdState");
+        g_pAMCCmdState = new AMCCmdState( 0 );
 
         // First we open and initialize the 8 serial ports
@@ -93 +98 @@
         qDebug("Creating MagicMirror");
         g_theMirror = new MagicMirror();
-        g_iRefX = -1;
-        g_iRefY = -1;
+        g_dRefX = -1.;
+        g_dRefY = -1.;
 
         qDebug("Creating ActiveMirrorControl");
@@ -115 +120 @@
         qDebug("Deleting HeatState");
         delete g_pHEATState;
+        qDebug("Deleting AMCCmdState");
+        delete g_pAMCCmdState;
         qDebug("Deleting FrameGrabber");
         delete g_pFG;