Commit 22ef3489 authored by Andrea Orlat's avatar Andrea Orlat
Browse files

prototype of the distribution for Noto is ready, Common part

parent 60f793ba

Common/Clients/CaltoolClient/src/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -188,11 +188,12 @@ endif 
#

# TARGETS

# -------

all:	do_all

all:	gui do_all 

	@echo " . . . 'all' done" 



clean : clean_all 

	@echo " . . . clean done"

	@rm calibrationtool_ui.py



clean_dist : clean_all clean_dist_all 

	@echo " . . . clean_dist done"
@@ -206,8 +207,8 @@ install : install_all 
gui:

	pyuic4 calibrationToolClient.ui -o calibrationtool_ui.py

	

	sed  -ie 's/Qwt5.QwtPlot/PlotProperty/g' calibrationtool_ui.py

	@sed  -ie 's/Qwt5.QwtPlot/PlotProperty/g' calibrationtool_ui.py

	

	 sed -ie '9 i\from customwidgets import *' calibrationtool_ui.py

	@sed -ie '9 i\from customwidgets import *' calibrationtool_ui.py



#___oOo___

Common/Servers/ExternalClients/include/ExternalClientsSocketServer.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#define BUFFERSIZE 1000

#define GAVINO "MANAGEMENT/Gavino"

#define PALMIRO "MANAGEMENT/Palmiro"

#define DUCEZIO "MANAGEMENT/Ducezio"



using namespace IRA;

using namespace maci;

Common/Servers/ExternalClients/src/ExternalClientsImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ void ExternalClientsImpl::cleanUp() 
{

    system("$INTROOT/bin/closeServer &");

    ACE_OS::sleep(3);

    system("killall $INTROOT/bin/closeServer");

    //system("killall $INTROOT/bin/closeServer");

	AUTO_TRACE("ExternalClientsImpl::cleanUp()");

    CSecAreaResourceWrapper<CExternalClientsSocketServer> SocketServer = m_ExternalClientsSocketServer->Get();

    SocketServer->byebye();

Common/Servers/ExternalClients/src/ExternalClientsSocketServer.cpp

+57 −33
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ void CExternalClientsSocketServer::execute() throw (ComponentErrors::CouldntGetC 
			strcpy (superVisorName, GAVINO);

		if (sVisor.Compare("Palmiro") == 0)

			strcpy (superVisorName, PALMIRO);

		if (sVisor.Compare("Ducezio") == 0)

			strcpy (superVisorName, DUCEZIO);

		try {

			m_Scheduler = m_services->getComponent<Management::Scheduler>(superVisorName);

		}
@@ -142,6 +144,16 @@ void CExternalClientsSocketServer::cleanUp() 
		Impl.setComponentName((const char *)m_receiversBoss->name());

		Impl.log(LM_DEBUG);

	}

	try {

		m_services->releaseComponent((const char*)m_mount->name());

	}

	catch (maciErrType::CannotReleaseComponentExImpl& ex) {

		_ADD_BACKTRACE(ComponentErrors::CouldntReleaseComponentExImpl,Impl,ex,"CExternalClientsSocketServer::cleanUp()");

		Impl.setComponentName((const char *)m_mount->name());

		Impl.log(LM_DEBUG);

	}

	newExternalClientsSocketServer.Close(m_Error);

       	m_accept = false;

}



void CExternalClientsSocketServer::cmdToScheduler()
@@ -193,6 +205,8 @@ void CExternalClientsSocketServer::cmdToScheduler() 
            		double lon, lat;

            		IRA::CString azStr;

            		IRA::CString elStr;

            		IRA::CString azCommStr;

            		IRA::CString elCommStr;

            		IRA::CString raStr;

            		IRA::CString decStr;

            		IRA::CString lonStr;
@@ -211,6 +225,7 @@ void CExternalClientsSocketServer::cmdToScheduler() 
            		ACS::ROdouble_var pointingAzCorr_var, pointingElCorr_var, refractionCorr_var;

            		double pointingAzCorr, pointingElCorr, refractionCorr;

            		double azOff, elOff, raOff, decOff, lonOff, latOff;

			double azComm, elComm;



			IRA::CIRATools::getTime(now);

            		ret_val = "antennaParameters";
@@ -262,6 +277,9 @@ void CExternalClientsSocketServer::cmdToScheduler() 
                IRA::CIRATools::radToSexagesimalAngle(dec,decStr);

                IRA::CIRATools::radToSexagesimalAngle(lon,lonStr);

                IRA::CIRATools::radToSexagesimalAngle(lat,latStr);

		m_antennaBoss->getRawCoordinates(now.value().value,azComm,elComm);

                IRA::CIRATools::radToAngle(azComm,azCommStr);

                IRA::CIRATools::radToAngle(elComm,elCommStr);

            }

            catch (...) {

                _EXCPT(ComponentErrors::UnexpectedExImpl,impl,"CExternalClientsSocketServer::cmdToScheduler()");
@@ -272,6 +290,8 @@ void CExternalClientsSocketServer::cmdToScheduler() 
                decStr = "NA";

                lonStr = "NA";

                latStr = "NA";

                azCommStr = "NA";

                elCommStr = "NA";

            }

			out.Concat(azStr);

			out+=m_fieldDelimiter;
@@ -285,6 +305,10 @@ void CExternalClientsSocketServer::cmdToScheduler() 
			out+=m_fieldDelimiter;

			out.Concat(latStr);

			out+=m_fieldDelimiter;

			out.Concat(azCommStr);

			out+=m_fieldDelimiter;

			out.Concat(elCommStr);

			out+=m_fieldDelimiter;

            try {

                azErr_var = m_mount->azimuthError();

                azErr = azErr_var->get_sync( completion.out());