Index: trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/magicmirror.cpp
===================================================================
--- trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/magicmirror.cpp	(revision 4489)
+++ trunk/MagicSoft/AMC/activemirrorcontrol/activemirrorcontrol/magicmirror.cpp	(revision 4490)
@@ -10,6 +10,6 @@
 #include <qtextstream.h>
 
-#define PANELFILENAME "/home/amc/Panels.txt"
-#define POSFILENAME   "/home/amc/PanelPos.txt"
+#define PANELFILENAME "/home/amc/AMC/share/amc/Panels.txt"
+#define POSFILENAME   "/home/amc/AMC/share/amc/PanelPos.txt"
 
 extern AMCState*	g_pAMCState;
@@ -55,5 +55,5 @@
 	
 	m_iNumPanels = 0;
-	QFile file( "/home/amc/Panels.txt" );
+	QFile file( PANELFILENAME );
 	if( file.open( IO_ReadOnly ) )
 	{
@@ -97,5 +97,5 @@
 void MagicMirror::readPanelPositions()
 {
-	QFile file( "/home/amc/PanelPos.txt" );
+	QFile file( POSFILENAME );
 	if( file.open( IO_ReadOnly ) )
 	{
@@ -110,10 +110,13 @@
 				continue;
 				
-			int ii, ij, iX, iY, iLaserX, iLaserY;
+			int ii, ij, iX, iY;
+      double dLaserX, dLaserY;
 			double dAxisX, dSlopeX, dConvX;
 			double dAxisY, dSlopeY, dConvY;
-			sscanf( line.data(),"%d %d %d %d %d %d %lf %lf %lf %lf %lf %lf",
-								&ii, &ij, &iX, &iY, &iLaserX, &iLaserY,
-								&dAxisX, &dSlopeX, &dConvX, &dAxisY, &dSlopeY, &dConvY );
+      int iIsReversed, iIsInstalled;
+			sscanf( line.data(),"%d %d %d %d %lf %lf %lf %lf %lf %lf %lf %lf %d %d",
+								&ii, &ij, &iX, &iY, &dLaserX, &dLaserY,
+								&dAxisX, &dSlopeX, &dConvX, &dAxisY, &dSlopeY, &dConvY,
+                &iIsReversed, &iIsInstalled );
       if( dAxisX == 0.0)
 			{
@@ -126,6 +129,6 @@
 			m_arrPanels[ii+8][ij+8]->setRefX( iX );
 			m_arrPanels[ii+8][ij+8]->setRefY( iY );
-			m_arrPanels[ii+8][ij+8]->setLaserX( iLaserX );
-			m_arrPanels[ii+8][ij+8]->setLaserY( iLaserY );
+			m_arrPanels[ii+8][ij+8]->setLaserX( dLaserX );
+			m_arrPanels[ii+8][ij+8]->setLaserY( dLaserY );
 			m_arrPanels[ii+8][ij+8]->setAxisX( dAxisX );
 			m_arrPanels[ii+8][ij+8]->setSlopeX( dSlopeX );
@@ -134,4 +137,5 @@
 			m_arrPanels[ii+8][ij+8]->setSlopeY( dSlopeY );
 			m_arrPanels[ii+8][ij+8]->setConversionY( dConvY );
+			m_arrPanels[ii+8][ij+8]->setReversed( (iIsReversed == 1) );
 		}
 	}
@@ -168,5 +172,5 @@
 			{
 				AMCMirrorPanel* pPanel = m_arrPanels[i][j];
-				line.sprintf( " %2d %2d\t%5d\t%5d\t%5d\t%5d\t%9.2f\t%7.2f\t%10.5f\t%9.2f\t%7.2f\t%10.5f\n",
+				line.sprintf( " %2d %2d\t%5d\t%5d\t%7.2f\t%7.3f\t%9.2f\t%9.5f\t%10.5f\t%9.2f\t%9.5f\t%10.5f\t%1d\t%1d\n",
 											pPanel->i(),
 											pPanel->j(),
@@ -180,5 +184,7 @@
 											pPanel->getAxisY(),
 											pPanel->getSlopeY(),
-											pPanel->getConversionY() );
+											pPanel->getConversionY(),
+											( pPanel->isReversed() ? 1 : 0 ),
+											( pPanel->isInstalled() ? 1 : 0 ) );
 				stream << line;
 			}
@@ -191,5 +197,5 @@
  										 "Can't open panel position description file",
 										 "The programm tried to open the file \'PanelPos.txt\'\n"
-										 "in the directory \'/home/amc/\'.\n"
+										 "in the directory \'/home/amc/AMC/share\'.\n"
 										 "The file may not have the right permissions.\n",
 										 "Continue" );