Skip to content
Snippets Groups Projects
Commit 993bba5f authored by Ruud Overeem's avatar Ruud Overeem
Browse files

BugID: 679

Introduced setStatte function.
parent 721174ea
No related merge requests found
...@@ -59,7 +59,8 @@ ObservationControl::ObservationControl(const string& cntlrName) : ...@@ -59,7 +59,8 @@ ObservationControl::ObservationControl(const string& cntlrName) :
itsChildPort (0), itsChildPort (0),
itsParentControl (0), itsParentControl (0),
itsParentPort (0), itsParentPort (0),
itsTimerPort (0) itsTimerPort (0),
itsState (CTState::NOSTATE)
{ {
LOG_TRACE_OBJ_STR (cntlrName << " construction"); LOG_TRACE_OBJ_STR (cntlrName << " construction");
...@@ -88,6 +89,8 @@ ObservationControl::ObservationControl(const string& cntlrName) : ...@@ -88,6 +89,8 @@ ObservationControl::ObservationControl(const string& cntlrName) :
registerProtocol (CONTROLLER_PROTOCOL, CONTROLLER_PROTOCOL_signalnames); registerProtocol (CONTROLLER_PROTOCOL, CONTROLLER_PROTOCOL_signalnames);
registerProtocol (PA_PROTOCOL, PA_PROTOCOL_signalnames); registerProtocol (PA_PROTOCOL, PA_PROTOCOL_signalnames);
setState(CTState::CREATED);
} }
...@@ -106,6 +109,20 @@ ObservationControl::~ObservationControl() ...@@ -106,6 +109,20 @@ ObservationControl::~ObservationControl()
// ... // ...
} }
//
// setState(CTstateNr)
//
void ObservationControl::setState(CTState::CTstateNr newState)
{
itsState = newState;
if (itsPropertySet) {
CTState cts;
itsPropertySet->setValue(string(PVSSNAME_FSM_STATE),
GCFPVString(cts.name(newState)));
}
}
// //
// handlePropertySetAnswer(answer) // handlePropertySetAnswer(answer)
...@@ -167,6 +184,17 @@ void ObservationControl::handlePropertySetAnswer(GCFEvent& answer) ...@@ -167,6 +184,17 @@ void ObservationControl::handlePropertySetAnswer(GCFEvent& answer)
break; break;
} }
// case F_SUBSCRIBED:
// case F_UNSUBSCRIBED:
// case F_PS_CONFIGURED:
// case F_EXTPS_LOADED:
// case F_EXTPS_UNLOADED:
// case F_MYPS_ENABLED:
// case F_MYPS_DISABLED:
// case F_VGETRESP:
// case F_VCHANGEMSG:
// case F_SERVER_GONE:
default: default:
break; break;
} }
......
...@@ -88,6 +88,7 @@ private: ...@@ -88,6 +88,7 @@ private:
ObservationControl(const ObservationControl&); ObservationControl(const ObservationControl&);
ObservationControl& operator=(const ObservationControl&); ObservationControl& operator=(const ObservationControl&);
void setState(CTState::CTstateNr newState);
void _connectedHandler(GCFPortInterface& port); void _connectedHandler(GCFPortInterface& port);
void _disconnectedHandler(GCFPortInterface& port); void _disconnectedHandler(GCFPortInterface& port);
boost::shared_ptr<ACC::APS::ParameterSet> boost::shared_ptr<ACC::APS::ParameterSet>
...@@ -121,6 +122,8 @@ private: ...@@ -121,6 +122,8 @@ private:
GCFTimerPort* itsTimerPort; GCFTimerPort* itsTimerPort;
CTState::CTstateNr itsState;
// ParameterSet variables // ParameterSet variables
string itsTreePrefix; string itsTreePrefix;
uint32 itsInstanceNr; uint32 itsInstanceNr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment