State machine added (f2af4c39) · Commits · IA2 / metadata_importer

src/MetadataImporter.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -586,7 +586,7 @@ void MetadataImporter::checkIfFileExists(std::string fileName)
		throw std::invalid_argument(errorStream.str());
		}

		DEBUG_STREAM << "FILE: " << fileName << " -> OK" << endl;
		INFO_STREAM << "MetadataImporter::checkIfFileExists() " << fileName << endl;
		}

		/----- PROTECTED REGION END -----/ // MetadataImporter::namespace_ending

src/MetadataImporter.xmi

+14 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@
		<deviceProperties name="Timeout" description="Connection timeout (seconds)">
		<type xsi:type="pogoDsl:UIntType"/>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		<DefaultPropValue>5</DefaultPropValue>
		<DefaultPropValue>60</DefaultPropValue>
		</deviceProperties>
		<commands name="Status" description="This command gets the device status (stored in its device_status data member) and returns it to the caller." execMethod="dev_status" displayLevel="OPERATOR" polledPeriod="0">
		<argin description="none">
		@@ -94,6 +94,8 @@
		<type xsi:type="pogoDsl:VoidType"/>
		</argout>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		<excludedStates>ON</excludedStates>
		<excludedStates>FAULT</excludedStates>
		</commands>
		<commands name="Off" description="" execMethod="off" displayLevel="OPERATOR" polledPeriod="0">
		<argin description="">
		@@ -103,7 +105,18 @@
		<type xsi:type="pogoDsl:VoidType"/>
		</argout>
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		<excludedStates>OFF</excludedStates>
		<excludedStates>FAULT</excludedStates>
		</commands>
		<states name="ON" description="Metadata importer is in ON state (connected to server and ready to import)">
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</states>
		<states name="OFF" description="Metadata importer is in OFF state (not connected to server)">
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</states>
		<states name="FAULT" description="Metadata importer is in FAULT state (an error occurred)">
		<status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
		</states>
		<preferences docHome="./doc_html" makefileHome="/usr/local/tango-8.1.2/share/pogo/preferences"/>
		</classes>
		</pogoDsl:PogoSystem>

src/MetadataImporterClass.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -490,9 +490,9 @@ void MetadataImporterClass::set_default_property()
		add_wiz_dev_prop(prop_name, prop_desc);
		prop_name = "Timeout";
		prop_desc = "Connection timeout (seconds)";
		prop_def = "5";
		prop_def = "60";
		vect_data.clear();
		vect_data.push_back("5");
		vect_data.push_back("60");
		if (prop_def.length()>0)
		{
		Tango::DbDatum data(prop_name);

src/MetadataImporterStateMachine.cpp

+15 −2

Original line number	Diff line number	Diff line
		@@ -41,6 +41,9 @@
		//================================================================
		// States \| Description
		//================================================================
		// ON \| Metadata importer is in ON state (connected to server and ready to import)
		// OFF \| Metadata importer is in OFF state (not connected to server)
		// FAULT \| Metadata importer is in FAULT state (an error occurred)


		namespace MetadataImporter_ns
		@@ -61,10 +64,15 @@ namespace MetadataImporter_ns
		//--------------------------------------------------------
		bool MetadataImporter::is_On_allowed(TANGO_UNUSED(const CORBA::Any &any))
		{
		// Not any excluded states for On command.
		// Compare device state with not allowed states.
		if (get_state()==Tango::ON \|\|
		get_state()==Tango::FAULT)
		{
		/----- PROTECTED REGION ID(MetadataImporter::OnStateAllowed) ENABLED START -----/

		/----- PROTECTED REGION END -----/ // MetadataImporter::OnStateAllowed
		return false;
		}
		return true;
		}

		@@ -76,10 +84,15 @@ bool MetadataImporter::is_On_allowed(TANGO_UNUSED(const CORBA::Any &any))
		//--------------------------------------------------------
		bool MetadataImporter::is_Off_allowed(TANGO_UNUSED(const CORBA::Any &any))
		{
		// Not any excluded states for Off command.
		// Compare device state with not allowed states.
		if (get_state()==Tango::OFF \|\|
		get_state()==Tango::FAULT)
		{
		/----- PROTECTED REGION ID(MetadataImporter::OffStateAllowed) ENABLED START -----/

		/----- PROTECTED REGION END -----/ // MetadataImporter::OffStateAllowed
		return false;
		}
		return true;
		}

src/MetadataImporter.h

+3 −3

File changed.

Contains only whitespace changes.