Skip to content
Snippets Groups Projects
Commit 9db8ffff authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

chore: adpot small API changes in ControlSystemAdapter

parent ea07a793
No related branches found
No related tags found
No related merge requests found
......@@ -11,7 +11,7 @@ include(cmake/set_version_numbers.cmake)
option(BUILD_TESTS "Build tests." ON)
# Find the ControlSystemAdapter
FIND_PACKAGE(ChimeraTK-ControlSystemAdapter 02.07 REQUIRED)
FIND_PACKAGE(ChimeraTK-ControlSystemAdapter 02.11 REQUIRED)
# Find the DeviceAccess
FIND_PACKAGE(ChimeraTK-DeviceAccess 03.14 REQUIRED)
......
......@@ -29,7 +29,7 @@ Application::Application(const std::string& name) : ApplicationBase(name), Modul
ModuleGroup::_model = Model::ModuleGroupProxy(_model);
// check if the application name has been set
if(applicationName.empty()) {
if(_applicationName.empty()) {
Application::shutdown();
throw ChimeraTK::logic_error("Error: An instance of Application must have its applicationName set.");
}
......@@ -44,7 +44,7 @@ Application::Application(const std::string& name) : ApplicationBase(name), Modul
/*********************************************************************************************************************/
Application::~Application() {
if(_lifeCycleState == LifeCycleState::initialisation && !hasBeenShutdown) {
if(_lifeCycleState == LifeCycleState::initialisation && !_hasBeenShutdown) {
// likely an exception has been thrown in the initialisation phase, in which case we better call shutdown to prevent
// ApplicationBase from complaining and hiding the exception
ApplicationBase::shutdown();
......@@ -114,7 +114,7 @@ void Application::optimiseUnmappedVariables(const std::set<std::string>& names)
/*********************************************************************************************************************/
void Application::run() {
assert(not applicationName.empty());
assert(!_applicationName.empty());
if(_testableMode.isEnabled()) {
if(!_testFacilityRunApplicationCalled) {
......@@ -224,18 +224,18 @@ void Application::shutdown() {
/*********************************************************************************************************************/
void Application::generateXML() {
assert(not applicationName.empty());
assert(!_applicationName.empty());
XMLGenerator generator{*this};
generator.run();
generator.save(applicationName + ".xml");
generator.save(_applicationName + ".xml");
}
/*********************************************************************************************************************/
void Application::generateDOT() {
assert(not applicationName.empty());
this->getModel().writeGraphViz(applicationName + ".dot");
assert(!_applicationName.empty());
this->getModel().writeGraphViz(_applicationName + ".dot");
}
/*********************************************************************************************************************/
......
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