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
649c71c6
Commit
649c71c6
authored
1 year ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
fix: code formatting
parent
befb9d5e
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
include/DeviceModule.h
+3
-3
3 additions, 3 deletions
include/DeviceModule.h
include/Flags.h
+13
-13
13 additions, 13 deletions
include/Flags.h
with
16 additions
and
16 deletions
include/DeviceModule.h
+
3
−
3
View file @
649c71c6
...
@@ -102,9 +102,9 @@ namespace ChimeraTK {
...
@@ -102,9 +102,9 @@ namespace ChimeraTK {
*/
*/
class
ConnectingDeviceModule
:
public
DeviceModule
{
class
ConnectingDeviceModule
:
public
DeviceModule
{
public:
public:
[[
deprecated
(
"Use DeviceModule instead"
)]]
ConnectingDeviceModule
(
ModuleGroup
*
owner
,
const
std
::
string
&
deviceAliasOrCDD
,
[[
deprecated
(
"Use DeviceModule instead"
)]]
ConnectingDeviceModule
(
ModuleGroup
*
owner
,
const
std
::
string
&
triggerPath
=
{},
std
::
function
<
void
(
ChimeraTK
::
Device
&
)
>
initialisationHandler
=
nullptr
,
const
std
::
string
&
deviceAliasOrCDD
,
const
std
::
string
&
triggerPath
=
{}
,
const
std
::
string
&
pathInDevice
=
"/"
)
std
::
function
<
void
(
ChimeraTK
::
Device
&
)
>
initialisationHandler
=
nullptr
,
const
std
::
string
&
pathInDevice
=
"/"
)
:
DeviceModule
(
owner
,
deviceAliasOrCDD
,
triggerPath
,
std
::
move
(
initialisationHandler
),
pathInDevice
)
{}
:
DeviceModule
(
owner
,
deviceAliasOrCDD
,
triggerPath
,
std
::
move
(
initialisationHandler
),
pathInDevice
)
{}
using
DeviceModule
::
DeviceModule
;
using
DeviceModule
::
DeviceModule
;
...
...
This diff is collapsed.
Click to expand it.
include/Flags.h
+
13
−
13
View file @
649c71c6
...
@@ -42,19 +42,19 @@ namespace ChimeraTK {
...
@@ -42,19 +42,19 @@ namespace ChimeraTK {
*
*
* Deprecated, do not use in new code.
* Deprecated, do not use in new code.
*/
*/
enum
class
[[
deprecated
(
"Use a qualified name instead"
)]]
HierarchyModifier
{
enum
class
[[
deprecated
(
"Use a qualified name instead"
)]]
HierarchyModifier
{
none
,
///< No modification is performed
none
,
///< No modification is performed
hideThis
,
///< The hierarchy level at which this flag is specified is hidden. Everything below this level is moved
hideThis
,
///< The hierarchy level at which this flag is specified is hidden. Everything below this level is moved
///< exactly one level up. The structure below this level is kept.
///< exactly one level up. The structure below this level is kept.
moveToRoot
,
///< The module at which this flag is specified is moved to the root level, together with the entire
moveToRoot
,
///< The module at which this flag is specified is moved to the root level, together with the entire
///< structure below the module. Note: Unless you run findTag() or so on the entire application, the
///< structure below the module. Note: Unless you run findTag() or so on the entire application, the
///< moved hierarchy structures might not be visible in the control system etc.
///< moved hierarchy structures might not be visible in the control system etc.
oneLevelUp
,
///< Move the module up to the level where the owner lives. Instead of creating a "daughter"
oneLevelUp
,
///< Move the module up to the level where the owner lives. Instead of creating a "daughter"
///< of the owning module, it creates a "sister" (module that lives on the same level).
///< of the owning module, it creates a "sister" (module that lives on the same level).
///< This modifyer can only be used in sub-modules, not on the first level
///< This modifyer can only be used in sub-modules, not on the first level
oneUpAndHide
///< Move the structure inside the module up to the level where the owner lives. Instead of adding a
oneUpAndHide
///< Move the structure inside the module up to the level where the owner lives. Instead of adding a
///< hierrarchy level, one level is removed. This modifyer can only be used in sub-modules, not on
the
///< hierrarchy level, one level is removed. This modifyer can only be used in sub-modules, not on
///< first level inside an application.
///<
the
first level inside an application.
};
};
/********************************************************************************************************************/
/********************************************************************************************************************/
...
...
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