Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
ApplicationCore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ApplicationCore
Commits
9db8ffff
Commit
9db8ffff
authored
6 months ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
chore: adpot small API changes in ControlSystemAdapter
parent
ea07a793
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
src/Application.cc
+7
-7
7 additions, 7 deletions
src/Application.cc
with
8 additions
and
8 deletions
CMakeLists.txt
+
1
−
1
View file @
9db8ffff
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
src/Application.cc
+
7
−
7
View file @
9db8ffff
...
...
@@ -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"
);
}
/*********************************************************************************************************************/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment