[med-svn] [camitk] 01/04: Imported Upstream version 4.0.3
Emmanuel Promayon
promayon-guest at moszumanska.debian.org
Fri Sep 30 20:39:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
promayon-guest pushed a commit to branch master
in repository camitk.
commit 5f29a7f4b948ff666c3430581e43b60769ad690f
Author: Emmanuel Promayon <Emmanuel.Promayon at imag.fr>
Date: Fri Sep 30 09:48:38 2016 +0200
Imported Upstream version 4.0.3
---
CMakeLists.txt | 2 +-
CMakeLists.txt.user | 598 ------------
imaging/actions/CMakeLists.txt | 2 +-
imaging/actions/itksegmentation/RegionGrowing.h | 2 +-
imaging/applications/CMakeLists.txt | 2 +-
imaging/components/CMakeLists.txt | 2 +-
imaging/components/dicom/DicomComponent.cpp | 4 +-
imaging/components/dicom/DicomComponent.h | 2 +-
.../components/dicom/DicomComponentExtension.cpp | 6 +-
imaging/components/dicom/DicomComponentExtension.h | 4 +-
imaging/components/dicom/DicomDialogEntry.h | 12 +-
imaging/components/dicom/DicomParser.cpp | 2 +-
imaging/components/dicom/DicomParser.h | 30 +-
imaging/components/dicom/DicomSerie.h | 18 +-
.../dicomtree/DicomTreeDirectoryComponent.h | 6 +-
.../dicomtree/DicomTreeSerieComponent.cpp | 4 +-
.../components/dicomtree/DicomTreeSerieComponent.h | 14 +-
.../dicomtree/DicomTreeStudyComponent.cpp | 3 -
.../components/dicomtree/DicomTreeStudyComponent.h | 10 +-
imaging/libraries/CMakeLists.txt | 2 +-
modeling/actions/CMakeLists.txt | 2 +-
modeling/applications/CMakeLists.txt | 2 +-
modeling/components/CMakeLists.txt | 2 +-
modeling/libraries/CMakeLists.txt | 2 +-
modeling/libraries/lml/CMakeLists.txt | 2 +-
.../libraries/mml/monitoring/AnsysBatchWriter.h | 2 +-
modeling/libraries/pml/CMakeLists.txt | 2 +-
python_sdk/actions/CMakeLists.txt | 2 +-
python_sdk/applications/CMakeLists.txt | 2 +-
python_sdk/components/CMakeLists.txt | 2 +-
python_sdk/libraries/CMakeLists.txt | 2 +-
sdk/actions/CMakeLists.txt | 2 +-
sdk/actions/application/CloseAction.h | 2 +-
sdk/actions/frame/CMakeLists.txt | 2 +-
sdk/actions/frame/editframes/EditFrame.cpp | 2 +-
sdk/actions/image/CMakeLists.txt | 2 +-
sdk/actions/image/cropvolume/BoxVOI.h | 2 +-
sdk/actions/mesh/CMakeLists.txt | 2 +-
sdk/applications/CMakeLists.txt | 2 +-
.../resources/camitk-actionstatemachine.1.in | 14 +-
.../resources/manpage-epilogue.1.in | 4 +-
.../resources/manpage-prologue.1.in | 8 +-
sdk/applications/cepgenerator/main.cpp | 2 +-
.../resources/camitk-cepgenerator.1.in | 6 +-
.../cepgenerator/resources/manpage-epilogue.1.in | 4 +-
.../cepgenerator/resources/manpage-prologue.1.in | 2 +-
.../cepgenerator/testdata/actionAndComponent.xml | 50 ++
.../config/resources/camitk-config.1.in | 6 +-
.../config/resources/manpage-epilogue.1.in | 4 +-
.../config/resources/manpage-prologue.1.in | 2 +-
sdk/applications/imp/main.cpp | 2 +-
sdk/applications/imp/resources/camitk-imp.1.in | 6 +-
.../imp/resources/manpage-epilogue.1.in | 4 +-
.../imp/resources/manpage-prologue.1.in | 2 +-
.../wizard/resources/camitk-wizard.1.in | 6 +-
.../wizard/resources/manpage-epilogue.1.in | 4 +-
.../wizard/resources/manpage-prologue.1.in | 2 +-
.../wizard/resources/newbieWizardDescription.html | 2 +-
.../modules/macros/camitk/CamiTKApplication.cmake | 30 +-
.../modules/macros/camitk/CamiTKExtension.cmake | 28 +-
.../macros/camitk/CamiTKExtension.cmake.orig | 999 ---------------------
.../macros/camitk/CamiTKExtensionProject.cmake | 11 +-
.../modules/macros/camitk/CamiTKLibrary.cmake | 2 +-
.../camitk/packaging/CamiTKCEPPackaging.cmake | 7 +-
.../packaging/CamiTKOpenSourcePackaging.cmake | 34 +-
sdk/components/CMakeLists.txt | 2 +-
sdk/components/off/OffExtension.cpp | 2 +-
sdk/libraries/CMakeLists.txt | 2 +-
sdk/libraries/cepgenerator/ActionGenerator.cpp | 22 +-
sdk/libraries/cepgenerator/ActionGenerator.h | 3 +
sdk/libraries/cepgenerator/resources/Action.cpp.in | 4 +-
sdk/libraries/cepgenerator/resources/Action.h.in | 10 +-
.../cepgenerator/resources/ActionExtension.cpp.in | 3 -
.../cepgenerator/resources/ActionExtension.h.in | 1 +
.../cepgenerator/resources/Component.cpp.in | 3 +-
.../resources/ComponentExtension.cpp.in | 2 -
.../cepgenerator/resources/ComponentExtension.h.in | 1 +
.../resources/actions.CMakeLists.txt.in | 2 +-
.../resources/applications.CMakeLists.txt.in | 2 +-
.../cepgenerator/resources/cep.CMakeLists.txt.in | 2 +-
.../resources/components.CMakeLists.txt.in | 2 +-
.../resources/libraries.CMakeLists.txt.in | 2 +-
.../libraries/core/CamiTKVersion.h | 41 +-
sdk/libraries/core/utils/ObjectController.h | 4 +-
sdk/testapplications/CMakeLists.txt | 2 +-
.../testactions/resources/camitk-testactions.1.in | 6 +-
.../testactions/resources/manpage-epilogue.1.in | 4 +-
.../testactions/resources/manpage-prologue.1.in | 2 +-
sdk/testapplications/testcomponents/main.cpp | 4 +-
.../resources/camitk-testcomponents.1.in | 6 +-
.../testcomponents/resources/manpage-epilogue.1.in | 4 +-
.../testcomponents/resources/manpage-prologue.1.in | 2 +-
92 files changed, 296 insertions(+), 1848 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6793862..a4a3a6b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(CAMITK_PROJECT_NAME "CamiTK")
set(CAMITK_VERSION_MAJOR "4")
set(CAMITK_VERSION_MINOR "0")
set(CAMITK_VER_NICKNAME "red") # Red Amaranth American rose Auburn Burgundy Cardinal Carmine Carnelian Cerise Coquelicot
-set(CAMITK_VERSION_PATCH "1") # patch version for packaging, change when appropriate
+set(CAMITK_VERSION_PATCH "3") # patch version for packaging, change when appropriate
string(TOLOWER "${CAMITK_PROJECT_NAME}-${CAMITK_VERSION_MAJOR}.${CAMITK_VERSION_MINOR}" CAMITK_SHORT_VERSION_STRING)
# Specific to SDK: this is the SDK build
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
deleted file mode 100644
index ad0438c..0000000
--- a/CMakeLists.txt.user
+++ /dev/null
@@ -1,598 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.1, 2016-06-17T09:48:21. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{632d7568-ff09-4aea-a732-5551e010fb24}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap"/>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{d14dcc32-d952-4a4d-ae54-f5ddbc8017f0}</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value>
- <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/haberbuj/Atelier/CamiTK/build</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments"></value>
- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets">
- <value type="QString">apidoc</value>
- </valuelist>
- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Compiler</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
- <valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
- <value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.MakeStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Nettoyer</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">all</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeBuildConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déploiement</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Déployer localement</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-testactions</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-testactions</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-testactions</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-testcomponents</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-testcomponents</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-testcomponents</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.2">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-actionstatemachine</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-actionstatemachine</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-actionstatemachine</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.3">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-imp</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-imp</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-imp</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.4">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-config</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-config</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-config</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.5">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-cepgenerator</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-cepgenerator</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-cepgenerator</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.6">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">application-wizard</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">application-wizard</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.application-wizard</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.7">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">library-lmltest</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">library-lmltest</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.library-lmltest</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.8">
- <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">library-pmltest</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
- <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">library-pmltest</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.library-pmltest</value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">9</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">16</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">16</value>
- </data>
-</qtcreator>
diff --git a/imaging/actions/CMakeLists.txt b/imaging/actions/CMakeLists.txt
index 4b0c742..02b52f7 100644
--- a/imaging/actions/CMakeLists.txt
+++ b/imaging/actions/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(ACTIONS_LIST)
diff --git a/imaging/actions/itksegmentation/RegionGrowing.h b/imaging/actions/itksegmentation/RegionGrowing.h
index 3f2b8a4..4c5d38c 100644
--- a/imaging/actions/itksegmentation/RegionGrowing.h
+++ b/imaging/actions/itksegmentation/RegionGrowing.h
@@ -50,7 +50,7 @@ public:
public slots:
/** this method is automatically called when the action is triggered.
- * !!! This method works only if theWidget has been instantiated
+ * !!! This method works only if theWidget has been instanciated
* (i.e. if getWidget has been called at least once, this is the case when there is a GUI)
* if not, please use the apply method with the parameters...
*/
diff --git a/imaging/applications/CMakeLists.txt b/imaging/applications/CMakeLists.txt
index 17a3046..9b7c2e2 100644
--- a/imaging/applications/CMakeLists.txt
+++ b/imaging/applications/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add an application, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_application() macro apropriately
+# In your CMakeLists.txt, use the camitk_application() macro appropriately
# Find applications
get_subdirectories(APPLICATIONS_LIST)
diff --git a/imaging/components/CMakeLists.txt b/imaging/components/CMakeLists.txt
index 94aa53e..9a3e2b1 100644
--- a/imaging/components/CMakeLists.txt
+++ b/imaging/components/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro appropriately
# Inform the user he has the choice of the DICOM component, by default uses the incomplete ITK one
diff --git a/imaging/components/dicom/DicomComponent.cpp b/imaging/components/dicom/DicomComponent.cpp
index 8c20b14..c7f41e9 100644
--- a/imaging/components/dicom/DicomComponent.cpp
+++ b/imaging/components/dicom/DicomComponent.cpp
@@ -46,11 +46,11 @@ using namespace camitk;
// --------------- Constructor -------------------
DicomComponent::DicomComponent(DicomSerie* dicomSerie) throw(AbortException) : ImageComponent("") {
- // associated the component's dicom serie
+ // associated the component's dicom series
serie = dicomSerie;
std::vector<std::string> stdFileNames = dicomSerie->getStdFileNames();
- // scan files for serie description
+ // scan files for series description
gdcm::Scanner scanner;
gdcm::Tag serieDescriptionTag = gdcm::Tag(0x0008, 0x103e);
scanner.AddTag(serieDescriptionTag);
diff --git a/imaging/components/dicom/DicomComponent.h b/imaging/components/dicom/DicomComponent.h
index b9ad22c..2dedf17 100644
--- a/imaging/components/dicom/DicomComponent.h
+++ b/imaging/components/dicom/DicomComponent.h
@@ -37,7 +37,7 @@ class vtkGDCMImageReader;
* @ingroup group_cepimaging_components_dicom
*
* @brief
- * DICOM Component represents a volumic image of a DICOM SERIE with its corresponding tags information (as CamiTK properties).
+ * DICOM Component represents a volumic image of a DICOM SERIES with its corresponding tags information (as CamiTK properties).
* This class is part of the MODEL (in the MVP pattern) of the DICOM COMPONENT.
*
* @note This component uses GDCM >= 2.2 library.
diff --git a/imaging/components/dicom/DicomComponentExtension.cpp b/imaging/components/dicom/DicomComponentExtension.cpp
index 4241f03..b477531 100644
--- a/imaging/components/dicom/DicomComponentExtension.cpp
+++ b/imaging/components/dicom/DicomComponentExtension.cpp
@@ -56,7 +56,7 @@ Component * DicomComponentExtension::open(const QString & path) throw (AbortExce
serieParsed = DicomParser::parseDirectory(path);
- // create a Dialog entry for each serie parsed
+ // create a Dialog entry for each series parsed
foreach(DicomSerie* dicomSerie, serieParsed) {
DicomDialogEntry* entry = new DicomDialogEntry();
entry->setSelected(false);
@@ -69,7 +69,7 @@ Component * DicomComponentExtension::open(const QString & path) throw (AbortExce
serieDialogEntries.append(entry);
}
- // Prompt the user which serie he wishes to open
+ // Prompt the user which series he wishes to open
QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
dialog = new DicomDialog(serieDialogEntries);
serieDialogEntries = dialog->getSelectedDicomDialogEntries();
@@ -78,7 +78,7 @@ Component * DicomComponentExtension::open(const QString & path) throw (AbortExce
// Open each selected Dicom as a component
if(!serieDialogEntries.isEmpty()) {
foreach(DicomDialogEntry* entry, serieDialogEntries) {
- // Find the corresponding Dicom Serie in the List
+ // Find the corresponding Dicom Series in the List
foreach(DicomSerie* serie, serieParsed) {
if( (serie->getStudyName() == entry->getStudyName()) &&
(serie->getSerieName() == entry->getSerieName()) ) {
diff --git a/imaging/components/dicom/DicomComponentExtension.h b/imaging/components/dicom/DicomComponentExtension.h
index 15308f4..0d76c8b 100644
--- a/imaging/components/dicom/DicomComponentExtension.h
+++ b/imaging/components/dicom/DicomComponentExtension.h
@@ -99,10 +99,10 @@ private:
/// The dialog that asks the user which dicom image files he wishes to open
DicomDialog* dialog;
- /// The different Dicom SERIE parsed
+ /// The different Dicom SERIES parsed
QList<DicomSerie*> serieParsed;
- /// The serie dialog entries representation in the VIEW
+ /// The series dialog entries representation in the VIEW
QList<DicomDialogEntry*> serieDialogEntries;
};
diff --git a/imaging/components/dicom/DicomDialogEntry.h b/imaging/components/dicom/DicomDialogEntry.h
index ae822a5..e65db78 100644
--- a/imaging/components/dicom/DicomDialogEntry.h
+++ b/imaging/components/dicom/DicomDialogEntry.h
@@ -78,22 +78,22 @@ public:
private:
- /// Is this SERIE selected for opening?
+ /// Is this SERIES selected for opening?
bool selected;
- /// Acquisition date of the SERIE.
+ /// Acquisition date of the SERIES.
QDate acquisitionDate;
- /// Acquisition time of the SERIE.
+ /// Acquisition time of the SERIES.
QTime acquisitionTime;
- /// Name of the STUDY this SERIE belongs to.
+ /// Name of the STUDY this SERIES belongs to.
QString studyName;
- /// Name of this SERIE.
+ /// Name of this SERIES.
QString serieName;
- /// Description of this SERIE.
+ /// Description of this SERIES.
QString serieDescription;
/// Name of the patient.
diff --git a/imaging/components/dicom/DicomParser.cpp b/imaging/components/dicom/DicomParser.cpp
index c99e5be..46700dd 100644
--- a/imaging/components/dicom/DicomParser.cpp
+++ b/imaging/components/dicom/DicomParser.cpp
@@ -92,7 +92,7 @@ QList<DicomSerie*> DicomParser::parseDirectory(const QString & directory) {
seriesScanner.Scan(studyFileNames);
const std::set< std::string > serieValues = seriesScanner.GetValues();
foreach(std::string serieName, serieValues) {
- // get file associated with this serie
+ // get file associated with this series
std::vector< std::string > serieFileNames = seriesScanner.GetAllFilenamesFromTagToValue(serieUIDTag, serieName.c_str());
// build a DicomSerie object corresponding to what we have found
diff --git a/imaging/components/dicom/DicomParser.h b/imaging/components/dicom/DicomParser.h
index f146aae..59f545a 100644
--- a/imaging/components/dicom/DicomParser.h
+++ b/imaging/components/dicom/DicomParser.h
@@ -59,7 +59,7 @@ public:
/**
* @brief Parse the input directory for DICOM series.
* @param directory The input directory to parse DICOM image files.
- * @return A list of DicomSerie, high level CamiTK object which store information of a SERIE
+ * @return A list of DicomSerie, high level CamiTK object which store information of a SERIES
*/
static QList<DicomSerie*> parseDirectory(const QString & directory);
@@ -86,43 +86,43 @@ private:
static std::vector< std::string > qtListOfStringToStd(const QList<QString> & inputList);
/**
- * @brief Retrieve the SERIE acquisition date.
- * @param serieFileNames The filenames belonging to a single serie.
- * @return the acquisition date of this SERIE.
+ * @brief Retrieve the SERIES acquisition date.
+ * @param serieFileNames The filenames belonging to a single series.
+ * @return the acquisition date of this SERIES.
*/
static QDate getAcquisitionDate(const std::vector<std::string> & serieFileNames);
/**
- * @brief Retrieve the SERIE acquisition time.
- * @param serieFileNames The filenames belonging to a single serie.
- * @return the acquisition time of this SERIE.
+ * @brief Retrieve the SERIES acquisition time.
+ * @param serieFileNames The filenames belonging to a single series.
+ * @return the acquisition time of this SERIES.
*/
static QTime getAcquisitionTime(const std::vector<std::string> & serieFileNames);
/**
* @brief Retrieve the patient name information from the input files.
- * @param serieFileNames The filenames belonging to a single serie.
+ * @param serieFileNames The filenames belonging to a single series.
* @return the patient name.
*/
static QString getPatientName(const std::vector<std::string> & serieFileNames);
/**
- * @brief Retrieve the serie name.
- * @param serieFileNames The filenames belonging to a single serie.
- * @return the serie name.
+ * @brief Retrieve the series name.
+ * @param serieFileNames The filenames belonging to a single series.
+ * @return the series name.
*/
static QString getSerieName(const std::vector<std::string> & serieFileNames);
/**
- * @brief Retrieve the serie description.
- * @param serieFileNames The filenames belonging to a single serie.
- * @return the serie description.
+ * @brief Retrieve the series description.
+ * @param serieFileNames The filenames belonging to a single series.
+ * @return the series description.
*/
static QString getSerieDescription(const std::vector<std::string> & serieFileNames);
/**
* @brief Retrieve the study name.
- * @param serieFileNames The filenames belonging to a single serie.
+ * @param serieFileNames The filenames belonging to a single series.
* @return the study name.
*/
static QString getStudyName(const std::vector<std::string> & serieFileNames);
diff --git a/imaging/components/dicom/DicomSerie.h b/imaging/components/dicom/DicomSerie.h
index c4a8200..2fd2e09 100644
--- a/imaging/components/dicom/DicomSerie.h
+++ b/imaging/components/dicom/DicomSerie.h
@@ -37,8 +37,8 @@
/**
* @ingroup group_cepimaging_components_dicom
*
- * @brief DicomSerie is a CamiTK high level class to represent a DICOM SERIE
- * This class encapsulates GDCM objects to handle a DICOM SERIE
+ * @brief DicomSerie is a CamiTK high level class to represent a DICOM SERIES
+ * This class encapsulates GDCM objects to handle a DICOM SERIES
*
* @note This class is part of the model (in the MVP pattern) of the DICOM COMPONENT
* @note This class does NOT represent a CamiTK Component.
@@ -82,28 +82,28 @@ public:
private:
- /// Acquisition date of the SERIE.
+ /// Acquisition date of the SERIES.
QDate acquisitionDate;
- /// Acquisition time of the SERIE.
+ /// Acquisition time of the SERIES.
QTime acquisitionTime;
- /// Name of the STUDY this SERIE belongs to.
+ /// Name of the STUDY this SERIES belongs to.
QString studyName;
- /// Name of this SERIE.
+ /// Name of this SERIES.
QString serieName;
- /// Description of this SERIE (sometime more readable than the SERIE name itself).
+ /// Description of this SERIES (sometime more readable than the SERIES name itself).
QString serieDescription;
/// Name of the patient.
QString patientName;
- /// The image file names associated to this SERIE
+ /// The image file names associated to this SERIES
QList<QString> fileNames;
- /// The image file names associated to this SERIE (std list, for GDCM API)
+ /// The image file names associated to this SERIES (std list, for GDCM API)
std::vector<std::string> stdFileNames;
};
diff --git a/imaging/components/dicomtree/DicomTreeDirectoryComponent.h b/imaging/components/dicomtree/DicomTreeDirectoryComponent.h
index 182080e..719a337 100644
--- a/imaging/components/dicomtree/DicomTreeDirectoryComponent.h
+++ b/imaging/components/dicomtree/DicomTreeDirectoryComponent.h
@@ -39,17 +39,17 @@
*
* To betterly understand how this component works, here's a little reminder on how DICOM images are organized.
* For a given PATIENT, we can have several STUDIES. Each STUDY represent a collection of several medical examinations (which can result with images taken from different MODALITIES). A MODALITY is the provider of information, which is, in other words, the machine that allows the doctor to acquire images from the PATIENT. MODALITY are mainly scanners (MRI ...).
- * Each STUDY can have several SERIES of images. One SERIE of images is the result of one medical examination using ONE MODALITY.
+ * Each STUDY can have several SERIES of images. One SERIES of images is the result of one medical examination using ONE MODALITY.
*
* This component works on images acquired in several SERIES, each of them in a specific STUDY (which can be different).
- * Each SERIE of images represents one 3D volumic image.
+ * Each SERIES of images represents one 3D volumic image.
* The public constructor will parse the directory for different STUDIES with different SERIES of images and prompt the user which ones he wants to represent.
* Each series of images selected is then been rendered in CamiTK's viewers as an ImageComponent.
* DICOM images tags are also displayed as Property in the PropertyExplorer (DICOM tab).
*
* @note
* Requires GDCM library in order to work correctly.
- * This component does not support 2D Images serie (GDCM limitation)
+ * This component does not support 2D Images series (GDCM limitation)
*/
class DicomTreeDirectoryComponent : public camitk::Component {
diff --git a/imaging/components/dicomtree/DicomTreeSerieComponent.cpp b/imaging/components/dicomtree/DicomTreeSerieComponent.cpp
index 2c81742..2e58a29 100644
--- a/imaging/components/dicomtree/DicomTreeSerieComponent.cpp
+++ b/imaging/components/dicomtree/DicomTreeSerieComponent.cpp
@@ -50,13 +50,13 @@ DicomTreeSerieComponent::DicomTreeSerieComponent(const std::vector < std::string
// To allow closing only this component
setParent(NULL);
- // scan files for serie description
+ // scan files for series description
gdcm::Scanner scanner;
gdcm::Tag serieDescriptionTag = gdcm::Tag(0x0008, 0x103e);
scanner.AddTag(serieDescriptionTag);
scanner.Scan(fileNames);
setName(QString(scanner.GetValue(fileNames.at(0).c_str(), serieDescriptionTag)));
-// std::cout << "SERIE name = " << getName().toStdString() << std::endl;
+// std::cout << "SERIES name = " << getName().toStdString() << std::endl;
// sort the files according to Patient position ect ...
gdcm::IPPSorter ippSorter;
diff --git a/imaging/components/dicomtree/DicomTreeSerieComponent.h b/imaging/components/dicomtree/DicomTreeSerieComponent.h
index 1a4b213..b4f6e2b 100644
--- a/imaging/components/dicomtree/DicomTreeSerieComponent.h
+++ b/imaging/components/dicomtree/DicomTreeSerieComponent.h
@@ -42,17 +42,17 @@ class vtkGDCMImageReader;
/**
*
* @brief
- * This component allows you to read DICOM images files of a single SERIE of a given STUDY
+ * This component allows you to read DICOM images files of a single SERIES of a given STUDY
*
- * One SERIE of images is the result of one medical examination using one MODALITY.
+ * One SERIES of images is the result of one medical examination using one MODALITY.
*
- * This component works on images acquired of a same SERIE for a given STUDY
- * This SERIE of images will be represented as a 3D volumic image (ImageComponent)
+ * This component works on images acquired of a same SERIES for a given STUDY
+ * This SERIES of images will be represented as a 3D volumic image (ImageComponent)
* DICOM images tags are also displayed as Property in the PropertyExplorer (DICOM tab).
*
* @note
* Requires GDCM library in order to work correctly.
- * This component does not support 2D Images serie (GDCM limitation)
+ * This component does not support 2D Images series (GDCM limitation)
*
*/
class DicomTreeSerieComponent : public camitk::ImageComponent {
@@ -63,7 +63,7 @@ public:
/**
* Build a ImageComponent representing the volumic image of the acquistion by a specific MODALITY.
* @param parent the parent DicomStudyComponent that contains all the SERIES.
- * @param path: the image slices of a same SERIE for a given STUDY.
+ * @param path: the image slices of a same SERIES for a given STUDY.
**/
DicomTreeSerieComponent(const std::vector < std::string > & fileNames);
@@ -88,7 +88,7 @@ private:
/**
* @brief Read the direct cosines angles from the input image
- * @param fileNames the SERIE slices
+ * @param fileNames the SERIES slices
* @return the corresponding ImageOrientation, rounded modulo 90 degrees
*/
camitk::ImageOrientationHelper::PossibleImageOrientations readDirectCosinesAngle(const std::vector< std::string > & fileNames) const;
diff --git a/imaging/components/dicomtree/DicomTreeStudyComponent.cpp b/imaging/components/dicomtree/DicomTreeStudyComponent.cpp
index d2adcc1..c8ed905 100644
--- a/imaging/components/dicomtree/DicomTreeStudyComponent.cpp
+++ b/imaging/components/dicomtree/DicomTreeStudyComponent.cpp
@@ -52,9 +52,7 @@ DicomTreeStudyComponent::DicomTreeStudyComponent(const std::vector< std::string
seriesScanner.Scan(fileNames);
const std::set< std::string > serieValues = seriesScanner.GetValues();
foreach(std::string value, serieValues) {
-// std::cout << "FOUND SERIE " << value << std::endl;
std::vector< std::string > serieFileNames = seriesScanner.GetAllFilenamesFromTagToValue(serieUIDTag, value.c_str());
-// std::cout << "SERIE contains " << serieFileNames.size() << " files" << std::endl;
// This filter aims at removing volumic images containing only a few images, for doctors TOPO for instance
// if ippsorter algorithm returns 0, it means it hasn't been able to sort the files according to their Z spacing
@@ -65,7 +63,6 @@ DicomTreeStudyComponent::DicomTreeStudyComponent(const std::vector< std::string
ippsorter.Sort(serieFileNames);
serieFileNames = ippsorter.GetFilenames();
-// std::cout << "SERIE contains (after filering images (IPPSorter)) : " << serieFileNames.size() << " files" << std::endl;
if(serieFileNames.size() > 0)
addChild(new DicomTreeSerieComponent(serieFileNames));
}
diff --git a/imaging/components/dicomtree/DicomTreeStudyComponent.h b/imaging/components/dicomtree/DicomTreeStudyComponent.h
index 27c5ec7..24a93b7 100644
--- a/imaging/components/dicomtree/DicomTreeStudyComponent.h
+++ b/imaging/components/dicomtree/DicomTreeStudyComponent.h
@@ -43,16 +43,16 @@ class DicomTreeSerieComponent;
* This component allows you to read DICOM images files of several SERIES of a same STUDY
*
* Each STUDY represents a collection of several medical examinations (which can result with images taken from different MODALITIES). A MODALITY is the provider of information, which is, in other words, the machine that allows the doctor to acquire images from the PATIENT. MODALITY are mainly scanners (MRI ...).
- * Each STUDY can have several SERIES of images. One SERIE of images is the result of one medical examination using ONE MODALITY.
+ * Each STUDY can have several SERIES of images. One SERIES of images is the result of one medical examination using ONE MODALITY.
*
* This component works on images acquired in several SERIES, but on the same specific STUDY.
- * Each SERIE of images represents one 3D volumic image.
- * Each SERIE of images selected is then been rendered in CamiTK's viewers as an ImageComponent.
+ * Each SERIES of images represents one 3D volumic image.
+ * Each SERIES of images selected is then been rendered in CamiTK's viewers as an ImageComponent.
* DICOM images tags are also displayed as Property in the PropertyExplorer (DICOM tab).
*
* @note
* Requires GDCM library in order to work correctly.
- * This component does not support 2D Images serie (GDCM limitation)
+ * This component does not support 2D Images series (GDCM limitation)
*/
class DicomTreeStudyComponent : public camitk::Component {
@@ -60,7 +60,7 @@ class DicomTreeStudyComponent : public camitk::Component {
public:
/**
- * Parse the list of files and build a DicomSerieComponent per SERIE
+ * Parse the list of files and build a DicomSerieComponent per SERIES
* @param parent the parent DicomDirectoryComponent that contains all the studies
* @param fileNames images of different SERIES but of the same STUDY
**/
diff --git a/imaging/libraries/CMakeLists.txt b/imaging/libraries/CMakeLists.txt
index 6d292df..c24aed8 100644
--- a/imaging/libraries/CMakeLists.txt
+++ b/imaging/libraries/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a library, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_library() macro apropriately
+# In your CMakeLists.txt, use the camitk_library() macro appropriately
# Find applications
get_subdirectories(LIBRARY_LIST)
diff --git a/modeling/actions/CMakeLists.txt b/modeling/actions/CMakeLists.txt
index f450f39..9bc1e48 100644
--- a/modeling/actions/CMakeLists.txt
+++ b/modeling/actions/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(ACTIONS_LIST)
diff --git a/modeling/applications/CMakeLists.txt b/modeling/applications/CMakeLists.txt
index 0ce7b1e..0f8f7e2 100644
--- a/modeling/applications/CMakeLists.txt
+++ b/modeling/applications/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add an application, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_application() macro apropriately
+# In your CMakeLists.txt, use the camitk_application() macro appropriately
# Find applications
get_subdirectories(APPLICATIONS_LIST)
diff --git a/modeling/components/CMakeLists.txt b/modeling/components/CMakeLists.txt
index 8a373bf..2f18f41 100644
--- a/modeling/components/CMakeLists.txt
+++ b/modeling/components/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro appropriately
# Add subdirectories in CMake project, manually => handling dependencies
camitk_add_subdirectory(pmlcomponent)
diff --git a/modeling/libraries/CMakeLists.txt b/modeling/libraries/CMakeLists.txt
index 6efd4a7..f727709 100644
--- a/modeling/libraries/CMakeLists.txt
+++ b/modeling/libraries/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a library, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_library() macro apropriately
+# In your CMakeLists.txt, use the camitk_library() macro appropriately
# --- add every given library in dependencies order
camitk_add_subdirectory(lmlschema)
diff --git a/modeling/libraries/lml/CMakeLists.txt b/modeling/libraries/lml/CMakeLists.txt
index 9c51d69..35c5f3d 100644
--- a/modeling/libraries/lml/CMakeLists.txt
+++ b/modeling/libraries/lml/CMakeLists.txt
@@ -8,7 +8,7 @@ if (NOT CEP_NAME STREQUAL "modeling")
endif()
# Version (in CamiTK)
-set(VERSION_STRING "lml - ${CAMITK_VERSION_STRING} (c) UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525")
+set(VERSION_STRING "lml - ${CAMITK_VERSION_STRING} (c) Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)")
configure_file(${LML_SOURCE_DIR}/LoadsVersion.h.in ${LML_BINARY_DIR}/LoadsVersion.h)
set( HEADERS
diff --git a/modeling/libraries/mml/monitoring/AnsysBatchWriter.h b/modeling/libraries/mml/monitoring/AnsysBatchWriter.h
index df00c14..a04651e 100644
--- a/modeling/libraries/mml/monitoring/AnsysBatchWriter.h
+++ b/modeling/libraries/mml/monitoring/AnsysBatchWriter.h
@@ -35,7 +35,7 @@
* @ingroup group_cepmodeling_libraries_mml
*
* @brief
- * Ansys batch writer allow to write a part of a batch file
+ * Ansys batch writer helps to write a part of a batch file
*/
class AnsysBatchWriter {
diff --git a/modeling/libraries/pml/CMakeLists.txt b/modeling/libraries/pml/CMakeLists.txt
index 129b124..dba7c58 100644
--- a/modeling/libraries/pml/CMakeLists.txt
+++ b/modeling/libraries/pml/CMakeLists.txt
@@ -8,7 +8,7 @@ if (NOT CEP_NAME STREQUAL "modeling")
endif()
# Version (in CamiTK)
-set(VERSION_STRING "pml - ${CAMITK_VERSION_STRING} (c) UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525")
+set(VERSION_STRING "pml - ${CAMITK_VERSION_STRING} (c) Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525 (GMCAO)")
configure_file(${PML_SOURCE_DIR}/PhysicalModelVersion.h.in ${PML_BINARY_DIR}/PhysicalModelVersion.h)
# Sets the variables for required include subdirectories :
diff --git a/python_sdk/actions/CMakeLists.txt b/python_sdk/actions/CMakeLists.txt
index e1ff5bb..489c805 100644
--- a/python_sdk/actions/CMakeLists.txt
+++ b/python_sdk/actions/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
#---------------------------------------------------------------------------------
#
# Recursively parse subdirectories for classes to expose
diff --git a/python_sdk/applications/CMakeLists.txt b/python_sdk/applications/CMakeLists.txt
index 989d783..f46746a 100644
--- a/python_sdk/applications/CMakeLists.txt
+++ b/python_sdk/applications/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add an application, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_application() macro apropriately
+# In your CMakeLists.txt, use the camitk_application() macro appropriately
#---------------------------------------------------------------------------------
#
diff --git a/python_sdk/components/CMakeLists.txt b/python_sdk/components/CMakeLists.txt
index 96804b5..476aba6 100644
--- a/python_sdk/components/CMakeLists.txt
+++ b/python_sdk/components/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro appropriately
#---------------------------------------------------------------------------------
#
# Recursively parse subdirectories for classes to expose
diff --git a/python_sdk/libraries/CMakeLists.txt b/python_sdk/libraries/CMakeLists.txt
index 742561c..2d0bbc1 100644
--- a/python_sdk/libraries/CMakeLists.txt
+++ b/python_sdk/libraries/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a library, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_library() macro apropriately
+# In your CMakeLists.txt, use the camitk_library() macro appropriately
#---------------------------------------------------------------------------------
#
diff --git a/sdk/actions/CMakeLists.txt b/sdk/actions/CMakeLists.txt
index 605b0f4..71f4863 100644
--- a/sdk/actions/CMakeLists.txt
+++ b/sdk/actions/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(ACTIONS_LIST)
diff --git a/sdk/actions/application/CloseAction.h b/sdk/actions/application/CloseAction.h
index 0cff4a0..21f8f3b 100644
--- a/sdk/actions/application/CloseAction.h
+++ b/sdk/actions/application/CloseAction.h
@@ -33,7 +33,7 @@
* @ingroup group_sdk_actions_application
*
* @brief
- * The CloseAction class allow to close the selected component.
+ * The CloseAction class closes the selected component.
*
**/
class CloseAction : public camitk::Action {
diff --git a/sdk/actions/frame/CMakeLists.txt b/sdk/actions/frame/CMakeLists.txt
index 16b360c..590154a 100644
--- a/sdk/actions/frame/CMakeLists.txt
+++ b/sdk/actions/frame/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(FRAME_ACTIONS_LIST)
diff --git a/sdk/actions/frame/editframes/EditFrame.cpp b/sdk/actions/frame/editframes/EditFrame.cpp
index 8fd11b5..9b78a79 100644
--- a/sdk/actions/frame/editframes/EditFrame.cpp
+++ b/sdk/actions/frame/editframes/EditFrame.cpp
@@ -55,7 +55,7 @@ using namespace camitk;
// --------------- constructor -------------------
EditFrame::EditFrame(ActionExtension* extension) : Action(extension) {
setName("Edit Frame");
- setDescription(tr("This action allow to edit a component's frame from its parent frame (or the world frame if it has no parent) by setting translations and rotation parameters."));
+ setDescription(tr("This action helps to modify a component's frame from its parent frame (or the world frame if it has no parent) by setting translations and rotation parameters."));
setComponent("Component");
// Setting classification family and tags
diff --git a/sdk/actions/image/CMakeLists.txt b/sdk/actions/image/CMakeLists.txt
index 7f99a22..a55e44b 100644
--- a/sdk/actions/image/CMakeLists.txt
+++ b/sdk/actions/image/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(IMAGE_ACTIONS_LIST)
diff --git a/sdk/actions/image/cropvolume/BoxVOI.h b/sdk/actions/image/cropvolume/BoxVOI.h
index 27706e8..65a4b68 100644
--- a/sdk/actions/image/cropvolume/BoxVOI.h
+++ b/sdk/actions/image/cropvolume/BoxVOI.h
@@ -55,7 +55,7 @@ public:
public slots:
/** this method is automatically called when the action is triggered.
- * !!! This method works only if theWidget has been instantiated
+ * !!! This method works only if theWidget has been instanciated
* (i.e. if getWidget has been called at least once, this is the case when there is a GUI)
* if not, please use the apply method with the parameters...
*/
diff --git a/sdk/actions/mesh/CMakeLists.txt b/sdk/actions/mesh/CMakeLists.txt
index 7622e0d..821bc74 100644
--- a/sdk/actions/mesh/CMakeLists.txt
+++ b/sdk/actions/mesh/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(MESH_ACTIONS_LIST)
diff --git a/sdk/applications/CMakeLists.txt b/sdk/applications/CMakeLists.txt
index 16291fa..b1c5840 100644
--- a/sdk/applications/CMakeLists.txt
+++ b/sdk/applications/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add an application, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_application() macro apropriately
+# In your CMakeLists.txt, use the camitk_application() macro appropriately
# Find applications
get_subdirectories(APPLICATIONS_LIST)
diff --git a/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.1.in b/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.1.in
index f1057a4..485a31c 100644
--- a/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.1.in
+++ b/sdk/applications/actionstatemachine/resources/camitk-actionstatemachine.1.in
@@ -9,14 +9,14 @@ camitk- at APPLICATION_NAME@ \- CamiTK Action State Machine
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is able to replay a pipeline (workflow) of CamiTK actions.
-This application takes an CamiTK augmented version of a SCXML subset as input and allow to
-replay interactive the described state-machine containing a list of CamiTK actions
-and transitions.
+This application takes an CamiTK augmented version of a SCXML subset as input and
+interactively replays the described state-machine. The state-machine contains a list
+of CamiTK actions and transitions.
.PP
-The targeted users are in R&D departments or laboratories.
+The targeted users are R&D departments or laboratories.
.PP
.SH "OPTIONS"
@@ -37,8 +37,8 @@ CamiTK SCXML document to play back in the state machine
Output directory (will contains logs and saved files)
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/actionstatemachine/resources/manpage-epilogue.1.in b/sdk/applications/actionstatemachine/resources/manpage-epilogue.1.in
index 07eeb0e..a24e260 100644
--- a/sdk/applications/actionstatemachine/resources/manpage-epilogue.1.in
+++ b/sdk/applications/actionstatemachine/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS, in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/actionstatemachine/resources/manpage-prologue.1.in b/sdk/applications/actionstatemachine/resources/manpage-prologue.1.in
index 9c630a3..a72ceda 100644
--- a/sdk/applications/actionstatemachine/resources/manpage-prologue.1.in
+++ b/sdk/applications/actionstatemachine/resources/manpage-prologue.1.in
@@ -9,12 +9,12 @@ camitk- at APPLICATION_NAME@ \- CamiTK Action State Machine
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is able to replay a pipeline (workflow) of CamiTK actions.
-This application takes an CamiTK augmented version of a SCXML subset as input and allow to
-replay interactive the described state-machine containing a list of CamiTK actions
-and transitions.
+This application takes an CamiTK augmented version of a SCXML subset as input and
+interactively replays the described state-machine. The state-machine contains a list
+of CamiTK actions and transitions.
.PP
The targeted users are in R&D departments or laboratories.
.PP
diff --git a/sdk/applications/cepgenerator/main.cpp b/sdk/applications/cepgenerator/main.cpp
index 11445fe..22c0729 100644
--- a/sdk/applications/cepgenerator/main.cpp
+++ b/sdk/applications/cepgenerator/main.cpp
@@ -35,7 +35,7 @@
// description of the application. Please update the manpage-prologue.1.in also if you modify this string.
const char* description="Please visit http://camitk.imag.fr for more information.\n"
- "(c) UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525\n\n"
+ "(c) Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525\n\n"
"camitk-cepgenerator aims at creating CamiTK Extension Project skeleton from\n"
"a description given in a XML file (valid CamiTK cepcoreschema language).";
diff --git a/sdk/applications/cepgenerator/resources/camitk-cepgenerator.1.in b/sdk/applications/cepgenerator/resources/camitk-cepgenerator.1.in
index 011ab1e..3e32f22 100644
--- a/sdk/applications/cepgenerator/resources/camitk-cepgenerator.1.in
+++ b/sdk/applications/cepgenerator/resources/camitk-cepgenerator.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Extension Project skeleton generator
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is a developer tool for CamiTK, the Computer Assisted
Medical Intervention Tool Kit.
@@ -53,8 +53,8 @@ This is the path to the directory where the CEP skeleton files will be
generated\. The output \fIpath\fP is \fBmandatory\fP\.
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/cepgenerator/resources/manpage-epilogue.1.in b/sdk/applications/cepgenerator/resources/manpage-epilogue.1.in
index 07eeb0e..31a40af 100644
--- a/sdk/applications/cepgenerator/resources/manpage-epilogue.1.in
+++ b/sdk/applications/cepgenerator/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/cepgenerator/resources/manpage-prologue.1.in b/sdk/applications/cepgenerator/resources/manpage-prologue.1.in
index 9fdc51f..58e180f 100644
--- a/sdk/applications/cepgenerator/resources/manpage-prologue.1.in
+++ b/sdk/applications/cepgenerator/resources/manpage-prologue.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Extension Project skeleton generator
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is a developer tool for CamiTK, the Computer Assisted
Medical Intervention Tool Kit.
diff --git a/sdk/applications/cepgenerator/testdata/actionAndComponent.xml b/sdk/applications/cepgenerator/testdata/actionAndComponent.xml
new file mode 100644
index 0000000..b5acf7b
--- /dev/null
+++ b/sdk/applications/cepgenerator/testdata/actionAndComponent.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<cep xmlns="http://camitk.imag.fr/cepcoreschema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://camitk.imag.fr/cepcoreschema Cep.xsd">
+ <name>Yet another example of CEP</name>
+ <contact>
+ <email>Emmanuel.Promayon at imag.fr</email>
+ </contact>
+ <description>This CEP contains a new type of component and an action that can do something with it.
+This test the link between an action and a component defined in the same CEP.</description>
+ <actionExtensions>
+ <actionExtension>
+ <name>Another Example Of An Action Extension</name>
+ <description>This extension description is really useless.</description>
+ <actions>
+ <action>
+ <name>DoSomethingOnSpecific</name>
+ <description>This description is void.</description>
+ <component>SpecificMeshBasedComponent</component>
+ <classification>
+ <family>Testing CepGenerator</family>
+ </classification>
+ <parameters>
+ <parameter defaultValue="100.0" description="Testing double" editable="true" name="testDouble" type="double" unit=""/>
+ </parameters>
+ </action>
+ </actions>
+ <dependencies>
+ <dependency name="specificcomponent" type="component"/>
+ </dependencies>
+ </actionExtension>
+ </actionExtensions>
+ <componentExtensions>
+ <componentExtension>
+ <name>Specific component</name>
+ <description>This extension description a new / specific component</description>
+ <components>
+ <component>
+ <name>SpecificMeshBasedComponent</name>
+ <description>My description is useless...</description>
+ <representation>Mesh</representation>
+ <properties>
+ <parameter defaultValue="false" description="Testing bools" editable="true" name="testBool" type="bool" unit=""/>
+ <parameter defaultValue="QColor(255, 255, 255, 255)" description="Testing color" editable="true" name="testColor" type="QColor" unit=""/>
+ <parameter defaultValue="QVector3D(0.0, 0.0, 0.0)" description="test 3D vector" editable="true" name="testVector3D" type="QVector3D" unit=""/>
+ </properties>
+ <fileSuffix>specific</fileSuffix>
+ </component>
+ </components>
+ </componentExtension>
+ </componentExtensions>
+</cep>
diff --git a/sdk/applications/config/resources/camitk-config.1.in b/sdk/applications/config/resources/camitk-config.1.in
index e1460a3..4d4aaa0 100644
--- a/sdk/applications/config/resources/camitk-config.1.in
+++ b/sdk/applications/config/resources/camitk-config.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Configuration Utility
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is the configuration utility for CamiTK,
a medical image analysis and modeling software.
@@ -50,8 +50,8 @@ Generate a time stamp that includes current system date and time
Generate a report bug template with the CamiTK diagnosis in it
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/config/resources/manpage-epilogue.1.in b/sdk/applications/config/resources/manpage-epilogue.1.in
index 07eeb0e..31a40af 100644
--- a/sdk/applications/config/resources/manpage-epilogue.1.in
+++ b/sdk/applications/config/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/config/resources/manpage-prologue.1.in b/sdk/applications/config/resources/manpage-prologue.1.in
index 2f720ae..33bef96 100644
--- a/sdk/applications/config/resources/manpage-prologue.1.in
+++ b/sdk/applications/config/resources/manpage-prologue.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Configuration Utility
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is the configuration utility for CamiTK,
a medical image analysis and modeling software.
diff --git a/sdk/applications/imp/main.cpp b/sdk/applications/imp/main.cpp
index 5c5082d..00ce0ed 100644
--- a/sdk/applications/imp/main.cpp
+++ b/sdk/applications/imp/main.cpp
@@ -41,7 +41,7 @@ using namespace camitk;
// (both texts should only be marginally different)
const char* description = "Please visit http://camitk.imag.fr for more information.\n"
- "(c) UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525\n\n"
+ "(c) Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525\n\n"
"camitk-imp is a medical image analysis and modeling software.\n"
"This is the flagship GUI application of a larger framework called CamiTK\n"
"(Computer Assisted Medical Interventions Tool Kit) designed to ease the\n"
diff --git a/sdk/applications/imp/resources/camitk-imp.1.in b/sdk/applications/imp/resources/camitk-imp.1.in
index 84bbd86..e97800b 100644
--- a/sdk/applications/imp/resources/camitk-imp.1.in
+++ b/sdk/applications/imp/resources/camitk-imp.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- GUI flagship application for CamiTK
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is a medical image analysis and modeling software.
This is the flagship GUI application of a larger framework called CamiTK
@@ -40,8 +40,8 @@ Disable CamiTK application console and redirect everything to the standard
output (default=off)
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorial for
.B camitk\- at APPLICATION_NAME@
diff --git a/sdk/applications/imp/resources/manpage-epilogue.1.in b/sdk/applications/imp/resources/manpage-epilogue.1.in
index 2c2be88..f2f1af1 100644
--- a/sdk/applications/imp/resources/manpage-epilogue.1.in
+++ b/sdk/applications/imp/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorial for
.B camitk\- at APPLICATION_NAME@
diff --git a/sdk/applications/imp/resources/manpage-prologue.1.in b/sdk/applications/imp/resources/manpage-prologue.1.in
index f130f53..6eee641 100644
--- a/sdk/applications/imp/resources/manpage-prologue.1.in
+++ b/sdk/applications/imp/resources/manpage-prologue.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- GUI flagship application for CamiTK
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is a medical image analysis and modeling software.
This is the flagship GUI application of a larger framework called CamiTK
diff --git a/sdk/applications/wizard/resources/camitk-wizard.1.in b/sdk/applications/wizard/resources/camitk-wizard.1.in
index 96a409e..4fefb53 100644
--- a/sdk/applications/wizard/resources/camitk-wizard.1.in
+++ b/sdk/applications/wizard/resources/camitk-wizard.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- extension wizard for CamiTK developers
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is a developer tool for CamiTK, the Computer
Assisted Medical Intervention Tool Kit.
@@ -43,8 +43,8 @@ Print usage information and exit\.
Print CamiTK version message and exit
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/wizard/resources/manpage-epilogue.1.in b/sdk/applications/wizard/resources/manpage-epilogue.1.in
index 07eeb0e..31a40af 100644
--- a/sdk/applications/wizard/resources/manpage-epilogue.1.in
+++ b/sdk/applications/wizard/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/applications/wizard/resources/manpage-prologue.1.in b/sdk/applications/wizard/resources/manpage-prologue.1.in
index cf6924e..f850510 100644
--- a/sdk/applications/wizard/resources/manpage-prologue.1.in
+++ b/sdk/applications/wizard/resources/manpage-prologue.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- extension wizard for CamiTK developers
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is a developer tool for CamiTK, the Computer
Assisted Medical Intervention Tool Kit.
diff --git a/sdk/applications/wizard/resources/newbieWizardDescription.html b/sdk/applications/wizard/resources/newbieWizardDescription.html
index 4dc7043..c00213f 100644
--- a/sdk/applications/wizard/resources/newbieWizardDescription.html
+++ b/sdk/applications/wizard/resources/newbieWizardDescription.html
@@ -12,7 +12,7 @@
for your extension. You then will have to complete one or 2 files, compile
and test it with a CamiTK application
</p>
- <p>The prerequisit for this module are:
+ <p>The prerequisites for this module are:
<ul>
<li>Knowing what a CamiTK Extension is (see <a href="http://www.camitk.fr">http://www.camitk.fr</a> for help)</li>
<li>Knowing the differences between <b><i>Action</i></b>, <b><i>Application</i></b>
diff --git a/sdk/cmake/modules/macros/camitk/CamiTKApplication.cmake b/sdk/cmake/modules/macros/camitk/CamiTKApplication.cmake
index 5657d6a..1a3d045 100644
--- a/sdk/cmake/modules/macros/camitk/CamiTKApplication.cmake
+++ b/sdk/cmake/modules/macros/camitk/CamiTKApplication.cmake
@@ -171,7 +171,7 @@ macro(camitk_application)
set(MACOSX_BUNDLE_BUNDLE_VERSION "${APPLICATION_TARGET_NAME} ${CAMITK_SHORT_VERSION_STRING}")
set(MACOSX_BUNDLE_LONG_VERSION_STRING "${APPLICATION_TARGET_NAME} ${CAMITK_SHORT_VERSION_STRING}")
set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${CAMITK_SHORT_VERSION_STRING}")
- set(MACOSX_BUNDLE_COPYRIGHT "2014 UJF")
+ set(MACOSX_BUNDLE_COPYRIGHT "Univ. Grenoble Alpes")
set(MACOSX_BUNDLE_ICON_FILE "${CMAKE_CURRENT_SOURCE_DIR}/resources/camitk-${APPLICATION_NAME}.icns")
set(MACOSX_BUNDLE_BUNDLE_NAME "${APPLICATION_TARGET_NAME}")
@@ -349,9 +349,13 @@ macro(camitk_application)
#########################################################################
# 1st CAMITKCORE LIBRARY DEPENDENCY
- add_dependencies(${APPLICATION_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
- # add the dependency to the core automoc target
- set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CAMITK_CORE_TARGET_LIB_NAME})
+ # add the target dependency (i.e., enable proper parallelization of the build process
+ # only if inside the sdk build
+ if(CAMITK_SDK_BUILD)
+ add_dependencies(${APPLICATION_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
+ # add the dependency to the core automoc target
+ set_property(TARGET ${APPLICATION_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CAMITK_CORE_TARGET_LIB_NAME})
+ endif()
# 2nd COMPONENTS DEPENDENCIES
if(${APPLICATION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION)
@@ -417,7 +421,7 @@ macro(camitk_application)
if(${APPLICATION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES)
set(CEP_LIBRARIES_DEPENDENCY_LIST "") #use for generating the project.xml file
foreach(CEP_LIBRARY_NEEDED ${${APPLICATION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES})
- # include directories from build, camitk (local or global install).
+ # include directories from build, camitk (local or global install).
include_directories(${CAMITK_BUILD_INCLUDE_DIR}/libraries/${CEP_LIBRARY_NEEDED})
include_directories(${CAMITK_INCLUDE_DIR}/libraries/${CEP_LIBRARY_NEEDED})
# file dependency
@@ -529,17 +533,11 @@ macro(camitk_application)
# FOLDER INSTALLATION
# Indicate where to install the application
-# if (NOT APPLE)
- install(TARGETS ${APPLICATION_TARGET_NAME}
- RUNTIME DESTINATION bin
- COMPONENT ${APPLICATION_TARGET_NAME}
- )
- # else ()
-# set (PLUGINS QtCore QtGui QtXml QtXmlPatterns)
-# include(DeployQt4)
-# install_qt4_executable("bin/camitk-${APPLICATION_NAME}.app" "${PLUGINS}")
-# endif()
-
+ install(TARGETS ${APPLICATION_TARGET_NAME}
+ RUNTIME DESTINATION bin
+ COMPONENT ${APPLICATION_TARGET_NAME}
+ )
+
#########################################################################
diff --git a/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake b/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
index d8d6b64..700fac5 100644
--- a/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
+++ b/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
@@ -424,10 +424,16 @@ macro(camitk_extension)
#########################################################################
# 1st CAMITKCORE LIBRARY DEPENDENCY
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
- # add the dependency to the core automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CAMITK_CORE_TARGET_LIB_NAME})
-
+ # add_dependencies(..) is only needed to enable parallel build during SDK build
+ # but generates an error for external CEP, where this target does not
+ # exists.
+ # Using target_link_libraries(..) is enough to link the extension to the CamiTK core library
+ if(CAMITK_SDK_BUILD)
+ add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
+ # add the dependency to the core automoc target
+ set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${CAMITK_CORE_TARGET_LIB_NAME})
+ endif()
+
# 2nd COMPONENTS DEPENDENCIES
if(${EXTENSION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION)
set(COMPONENTS_DEPENDENCY_LIST "") #use for generating the project.xml file
@@ -447,13 +453,9 @@ macro(camitk_extension)
# CMake / CDash dependencies
if(PACKAGING_NSIS)
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component_${COMPONENT_NEEDED})
- # add the dependency to the component automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component_${COMPONENT_NEEDED})
else()
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component-${COMPONENT_NEEDED})
set(COMPONENTS_DEPENDENCY_LIST ${COMPONENTS_DEPENDENCY_LIST} component-${COMPONENT_NEEDED})
- # add the dependency to the component automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component-${COMPONENT_NEEDED})
endif()
endforeach()
endif()
@@ -477,13 +479,9 @@ macro(camitk_extension)
# CMake / CDash dependencies
if (PACKAGING_NSIS)
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action_${ACTION_NEEDED})
- # add the dependency to the action automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action_${ACTION_NEEDED})
else()
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action-${ACTION_NEEDED})
set(ACTIONS_DEPENDENCY_LIST ${ACTIONS_DEPENDENCY_LIST} action-${ACTION_NEEDED})
- # add the dependency to the action automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action-${ACTION_NEEDED})
endif()
endforeach()
endif()
@@ -510,13 +508,11 @@ macro(camitk_extension)
# CMake / CDash dependencies
if (PACKAGING_NSIS)
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} library_${CEP_LIBRARY_NEEDED})
- # add the dependency to the library automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library_${CEP_LIBRARY_NEEDED})
else()
add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} library-${CEP_LIBRARY_NEEDED})
set(CEP_LIBRARIES_DEPENDENCY_LIST ${CEP_LIBRARIES_DEPENDENCY_LIST} library-${CEP_LIBRARY_NEEDED})
# add the dependency to the library automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-${CEP_LIBRARY_NEEDED})
+ set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-${CEP_LIBRARY_NEEDED})
endif()
endforeach()
endif()
@@ -694,7 +690,7 @@ macro(camitk_extension)
make_directory( ${CAMITK_BUILD_TESTDATA_DIR} )
endif()
- # copy the files to test data directory
+ # copy the files to test data directory
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory testdata ${CAMITK_BUILD_TESTDATA_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
diff --git a/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake.orig b/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake.orig
deleted file mode 100644
index 7b4ac0b..0000000
--- a/sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake.orig
+++ /dev/null
@@ -1,999 +0,0 @@
-#!
-#! @ingroup group_sdk_cmake_camitk
-#!
-#! Macro camitk_extension simplifies writing a camitk extension (component, action)
-#!
-#! The name of the extension is automatically the name of the directory from where this macro
-#! is called, unless it is overriden by the TARGET_NAME parameter.
-#!
-#! usage:
-#! \code
-#! camitk_extension( <type>
-#! [DISABLED]
-#! [NEEDS_ITK]
-#! [NEEDS_LIBXML2]
-#! [NEEDS_OPENCV]
-#! [NEEDS_IGSTK]
-#! [NEEDS_XSD]
-#! [NEEDS_GDCM]
-#! [NEEDS_ACTION_EXTENSION action1 action2 ...]
-#! [NEEDS_COMPONENT_EXTENSION component1 component2 ...]
-#! [NEEDS_CEP_LIBRARIES CEPLib1 CEPLib2 ...]
-#! [INCLUDE_DIRECTORIES dir1 dir2 ...]
-#! [DEFINES flag1 flag2 ...]
-#! [CXX_FLAGS flag1 flag2 ...]
-#! [EXTERNAL_SOURCES file1 file2 ...]
-#! [EXTERNAL_LIBRARIES lib1 lib2 ...]
-#! [HEADERS_TO_INSTALL header1.h header2.h ...]
-#! [INSTALL_ALL_HEADERS]
-#! [TARGET_NAME non-default-targetname]
-#! [TEST_APPLICATION application-name]
-#! [DESCRIPTION description]
-#! [EXTRA_TRANSLATE_LANGUAGE]
-#! [TEST_FILES file1 file2 ...]
-#! )
-#! \endcode
-#!
-#! \param <type> = REQUIRED. The selected type of extension you wish to build.
-# possible values : ACTION_EXTENSION or COMPONENT_EXTENSION.
-#! \param DISABLED = means this is a not a default extension, it will not be compiled automatically
-#! \param NEEDS_ITK = add this if your component needs ITK.
-#! Do not forget to add the needed list of ITK libraries in the LIBRARIES parameter
-#! \param NEEDS_LIBXML2 = add this if your component needs libxml2
-#! \param NEEDS_XSD = add this if your action needs Codesynthesis xsd cxx (xml schema compiler)
-#! \param NEEDS_OPENCV = add this if your component needs OpenCV
-#! \param NEEDS_IGSTK = add this if your component needs IgsTK
-#! \param NEEDS_XERCESC = add this if your action / component needs XercesC library
-#! \param NEEDS_GDCM = Add this, if your extension requires GDCM 2.x library
-#! \param NEEDS_CEP_LIBRARIES = list of needed CEP libraries (not external dependencies)
-#! \param NEEDS_COMPONENT_EXTENSION = list of needed component extensions
-#! \param NEEDS_ACTION_EXTENSION = list of needed component extensions
-#! \param INCLUDE_DIRECTORIES = additional include directories
-#! \param DEFINES = list of define flags to add at compilation time.
-#! \param CXX_FLAGS = list of compiler flags to add (such as warning levels (-Wall ...)).
-#! \param EXTERNAL_SOURCES = list of extra source/headers files (external to the current directory)
-#! that needed to be added to the SOURCES variable.
-#! Note: EXTERNAL_SOURCES are not installed
-#! \param EXTERNAL_LIBRARIES = external libraries to add to the link command
-#! \param HEADERS_TO_INSTALL = list of headers to install, if present this will automatically
-#! create an "install-COMPONENT_NAMEcomponent" target, that can be used
-#! anywhere else to manage dependencies to this component.
-#! The headers are installed ${CAMITK_BUILD_INCLUDE_DIR}/COMPONENT_NAME
-#! when the target "install-COMPONENT_NAMEcomponent" is called.
-#! \param INSTALL_ALL_HEADERS = install all of the headers (this is the lazy solution, please consider
-#! making a list and using HEADERS_TO_INSTALL parameter instead!
-#! \param TARGET_NAME = specify a target name different than the default (default is the action/component directory name)
-#! this can be very useful for example when you have action/component directory in your CEP that has
-#! the same name as one in the camitk opensource.
-#! \param CEP_NAME = specify the CEP_NAME, which is used to categorized the extension for packaging purpose
-#! No CEP_NAME provided will result in default categorization (generic extension).
-#! \param TEST_APPLICATION = The name of the application to provide for generate automatic basic tests on your extension. No option means no tests!
-#! \param DESCRIPTION = Simple description of the extension. Used for packaging presentation for instance.
-#! \param EXTRA_TRANSLATE_LANGUAGE = Additionnal extra language to translate the application
-#! \param TEST_FILES = Parameter of TestActions module : REQUIRED. List of files on which the action must applied.
-
-macro(camitk_extension)
-
-
- # Instruct CMake to run moc automatically when needed.
- set(CMAKE_AUTOMOC ON)
-
-
-
- #########################################################################
- # #
- # ARGUMENTS PARSING #
- # #
- # * Use a macro to create the CMAKE variables according to the #
- # provided options as input. #
- # #
- #########################################################################
-
- get_directory_name(${CMAKE_CURRENT_SOURCE_DIR} EXTENSION_NAME)
-
- parse_arguments(${EXTENSION_NAME_CMAKE} #prefix
- "NEEDS_TOOL;NEEDS_CEP_LIBRARIES;NEEDS_COMPONENT_EXTENSION;NEEDS_ACTION_EXTENSION;INCLUDE_DIRECTORIES;EXTERNAL_LIBRARIES;HEADERS_TO_INSTALL;DEFINES;CXX_FLAGS;EXTERNAL_SOURCES;TARGET_NAME;CEP_NAME;DESCRIPTION;TEST_APPLICATION;EXTRA_TRANSLATE_LANGUAGE;TEST_FILES" # possible lists
- "NEEDS_QT_MODULES;ACTION_EXTENSION;COMPONENT_EXTENSION;DISABLED;NEEDS_XERCESC;NEEDS_ITK;NEEDS_LIBXML2;NEEDS_XSD;NEEDS_QTXML;NEEDS_OPENCV;NEEDS_IGSTK;INSTALL_ALL_HEADERS;NEEDS_GDCM;DISABLE_TESTLEVEL1;DISABLE_TESTLEVEL2;DISABLE_TESTLEVEL3" # possible options
- ${ARGN}
- )
-
-
-
- #########################################################################
- # #
- # CREATE CMAKE VARIABLES #
- # #
- # * Create required and useful CMake variables for the macro #
- # #
- #########################################################################
-
- # TYPE EXTENSION : ACTION or COMPONENT
- if (${EXTENSION_NAME_CMAKE}_ACTION_EXTENSION)
- set(TYPE_EXTENSION "action")
- string(TOUPPER ${TYPE_EXTENSION} TYPE_EXTENSION_CMAKE)
- elseif(${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION)
- set(TYPE_EXTENSION "component")
- string(TOUPPER ${TYPE_EXTENSION} TYPE_EXTENSION_CMAKE)
- endif()
-
- # CMAKE CACHE VARIABLE
- # if it is the first cmake run, create the extension variable with a correct initial value
- if(NOT ${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_INTERNAL)
- # add option to enable/disable this extension and set it to true by default
- # Building the extension can be disabled by giving the argument DISABLED to the macro
- # or by passing the flag -D${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_DISABLED:BOOL=TRUE
- if(${EXTENSION_NAME_CMAKE}_DISABLED)
- set(${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_ENABLED FALSE)
- else()
- set(${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_ENABLED TRUE)
- endif()
- set(${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE} ${${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_ENABLED} CACHE BOOL "Build extension ${EXTENSION_NAME}")
- set(${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE}_INTERNAL TRUE CACHE INTERNAL "Is variable ${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME} already created?")
- endif()
-
- # if this extension is enabled, do everything needed
- # otherwise... do nothing
- if (${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE})
-
- # TARGET NAME
- # The target name is composed of the following: [action / component]-name
- # * action / component is the type of extension as prefix
- # * name is deduced from the input folder containing the calling CMakeLists.txt file of the extension.
- if (${EXTENSION_NAME_CMAKE}_TARGET_NAME)
- set(${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME ${${EXTENSION_NAME_CMAKE}_TARGET_NAME})
- else()
- set(${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME ${EXTENSION_NAME})
- endif()
- # replace "-" by "_" if the extension is being packaged with NSIS, the program to create a Windows installer.
- if (PACKAGING_NSIS)
- # NSIS requires that cpack component names do not feature space or "-" characters
- set(${TYPE_EXTENSION_CMAKE}_TARGET_NAME ${TYPE_EXTENSION}_${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME})
- else()
- set(${TYPE_EXTENSION_CMAKE}_TARGET_NAME ${TYPE_EXTENSION}-${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME})
- endif()
-
- message(STATUS "Building extension ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}")
-
-
-
- #########################################################################
- # #
- # INCLUDE DIRECTORIES #
- # #
- # * Include basic directories where to look header files #
- # * Include also additional user provided directories #
- # * These directories are used for compilation step #
- # #
- #########################################################################
- # BASIC DIRECTORIES
-
- include_directories(${CAMITK_INCLUDE_DIRECTORIES})
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-
- # USER INPUT DIRECTORIES
- include_directories(${${EXTENSION_NAME_CMAKE}_INCLUDE_DIRECTORIES})
-
-
-
- #########################################################################
- # #
- # GATHER RESSOURCES #
- # #
- # * Get all the headers (.h) and source files (.cpp) of the project #
- # * Create the needed Qt files (using moc and uic) #
- # * On Windows, Visual Studio, group .moc and .ui files #
- # in subdirectories #
- # #
- #########################################################################
-
- # get all headers, sources and do what is needed for Qt
- # one need to do this just before the add_library so that all defines, include directories and link directories
- # are set properly (gather_headers_and_sources include the call to Qt moc and uic)
- gather_headers_and_sources(${EXTENSION_NAME_CMAKE})
-
-
-
- #########################################################################
- # #
- # ADDITIONAL KNOWN EXTERNAL LIBRARY DEPENDENCIES #
- # #
- # * Look for specific library needed #
- # * Specific libraries are specified as option with the #
- # NEEDS_LIBRARY syntax (see macro syntax for more options) #
- # * Backward compatibility : Warn user if using old NEEDS_TOOL syntax #
- # #
- #########################################################################
-
- # Looking for ITK
- set(ITK_LIBRARIES "")
- if(${EXTENSION_NAME_CMAKE}_NEEDS_ITK)
- find_package(ITK REQUIRED PATHS /usr/lib/InsightToolkit)
- if(ITK_FOUND)
- include(${ITK_USE_FILE})
- set(ITK_VERSION ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR}.${ITK_VERSION_PATCH}) #ITK_VERSION is not always set
- set(CAMITK_ITK_VERSION ${ITK_VERSION_MAJOR}.${ITK_VERSION_MINOR})
- message(STATUS "${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}: Found ITK version ${ITK_VERSION}")
-
- if ((${ITK_VERSION} VERSION_GREATER "4") AND (${ITK_VERSION} VERSION_LESS "5")) # ITK 4.9 on Windows, maybe a lesser version for Linux.
- if(MSVC)
- set(ITK_DIR ${ITK_DIR}/../..)
- # Construct list of ITK libraries for linking = CAMITK_ITK_LIBRARIES
- foreach(ITK_LIBRARY ${ITK_LIBRARIES})
- string(SUBSTRING ${ITK_LIBRARY} 0 3 ${ITK_LIBRARY}_PREFIX)
- # Some libraries have not the expected 'itk' prefix. Add it then
- if((NOT ${${ITK_LIBRARY}_PREFIX} STREQUAL "itk") AND (NOT ${${ITK_LIBRARY}_PREFIX} STREQUAL "ITK"))
- set(ITK_LIBRARY itk${ITK_LIBRARY})
- endif()
- set(CAMITK_ITK_LIBRARIES ${CAMITK_ITK_LIBRARIES} debug ${ITK_DIR}/${ITK_LIBRARY}-${CAMITK_ITK_VERSION}${CAMITK_DEBUG_POSTFIX}.lib optimized ${ITK_DIR}/${ITK_LIBRARY}-${CAMITK_ITK_VERSION}.lib)
- endforeach()
- elseif(UNIX)
- set(CAMITK_ITK_LIBRARIES ${ITK_LIBRARIES})
- elseif(APPLE)
- message(WARNING "CamiTKExtension.cmake: ITK LIBRARY NOT SET FOR APPLE")
- endif()
- else()
- message(FATAL_ERROR "Wrong version of ITK : ${ITK_VERSION}. Required is at least 4.x to 4.9")
- endif()
- else()
- message(FATAL_ERROR "ITK not found but required for ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}")
- endif()
- endif()
-
- # LIBXML2
- set(LIBXML2_LIBRARY "")
- if(${EXTENSION_NAME_CMAKE}_NEEDS_LIBXML2)
- # LibXml2 is required
- find_package(Xml2)
- if (LIBXML2_FOUND)
- add_definitions(${LIBXML2_DEFINITIONS})
- include_directories(${LIBXML2_INCLUDE_DIR})
- set(LIBXML2_LIBRARY ${LIBXML2_LIBRARIES})
- else()
- # most probably win32 or crosscompiling
- message(STATUS "${EXTENSION_NAME}: libxml2 required")
- endif()
- endif()
-
- # OPENCV
- set(OpenCV_LIBRARIES "")
- if(${EXTENSION_NAME_CMAKE}_NEEDS_OPENCV)
- # OpenCV is required
- find_package( OpenCV REQUIRED )
- else ( )
- set(OpenCV_LIBRARIES "")
- endif()
-
- # IGSTK
- set(IGSTK_LIBRARIES "")
- if(${EXTENSION_NAME_CMAKE}_NEEDS_IGSTK)
- find_package(IGSTK REQUIRED)
- include(${IGSTK_USE_FILE})
- else()
- set(IGSTK_LIBRARIES "")
- endif()
-
- # XERCES-C
- set(XERCESC_LIBRARIES)
- if(${EXTENSION_NAME_CMAKE}_NEEDS_XERCESC)
- # XercesC is required
- find_package(XercesC REQUIRED)
- if (XERCESC_FOUND)
- include_directories(${XERCESC_INCLUDE_DIR})
- set(XERCESC_LIBRARIES ${XERCESC_LIBRARY})
- else()
- # most probably win32 or crosscompiling
- message(FATAL_ERROR "${EXTENSION_NAME}: xerces-c required. Please provide Xerces-C path.")
- endif()
- endif()
-
- # XSD
- if(${EXTENSION_NAME_CMAKE}_NEEDS_XSD)
- # XercesC is required
- find_package(XercesC REQUIRED)
- if (XERCESC_FOUND)
- include_directories(${XERCESC_INCLUDE_DIR})
- set(XERCESC_LIBRARIES ${XERCESC_LIBRARY})
- find_package(XSD REQUIRED)
- include_directories(${XSD_INCLUDE_DIR})
- else()
- # most probably win32 or crosscompiling
- message(FATAL_ERROR "${EXTENSION_NAME}: xerces-c required because of XSD cxx, please set XERCESC_INCLUDE_DIR")
- endif()
- endif()
-
- # GDCM 2.2.x
- set(GDCM_LIBRARIES)
- if(${EXTENSION_NAME_CMAKE}_NEEDS_GDCM)
- if(NOT GDCM_FOUND)
- # Look for GDCM library only if not found (for instance, ITK has already search for it)
- # Calling find_package(GDCM ..) more than once creates CMake errors.
- find_package(GDCM 2.0 REQUIRED)
- endif()
- if(GDCM_FOUND)
- include(${GDCM_USE_FILE})
- if (MSVC)
- set(GDCM_LIBRARIES
- debug ${GDCM_DIR}/../gdcmcharls${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmCommon${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmDICT${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmDSED${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmexpat${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmgetopt${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmIOD${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmjpeg8${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmjpeg12${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmjpeg16${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmMEXD${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmMSFF${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmopenjpeg${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmzlib${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../socketxx${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../vtkgdcm${CAMITK_DEBUG_POSTFIX}.lib
- debug ${GDCM_DIR}/../gdcmDSED${CAMITK_DEBUG_POSTFIX}.lib
- optimized gdcmcharls gdcmCommon gdcmDICT gdcmDSED gdcmexpat
- optimized gdcmgetopt gdcmIOD gdcmjpeg8 gdcmjpeg12 gdcmjpeg16
- optimized gdcmMEXD gdcmMSFF gdcmopenjpeg gdcmzlib socketxx vtkgdcm
- optimized gdcmDSED
- )
- else()
- set(GDCM_LIBRARIES gdcmCommon gdcmDICT gdcmDSED gdcmMEXD gdcmMSFF vtkgdcm)
- endif()
- else()
- message(ERROR "${EXTENSION_NAME}: GDCM 2.x library required. Please install GDCM.")
- endif()
- endif()
-
- # EXTERNAL LIBRARIES
- set(EXTERNAL_LIBRARIES)
- if(${EXTENSION_NAME_CMAKE}_EXTERNAL_LIBRARIES)
- foreach(EXTERNAL_LIBRARY ${${EXTENSION_NAME_CMAKE}_EXTERNAL_LIBRARIES})
- if (MSVC)
- set(EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES}
- debug ${EXTERNAL_LIBRARY}${CAMITK_DEBUG_POSTFIX}.lib
- optimized ${EXTERNAL_LIBRARY}
- )
- else()
- set(EXTERNAL_LIBRARIES ${EXTERNAL_LIBRARIES} ${EXTERNAL_LIBRARY})
- endif()
- endforeach()
- endif()
-
- # BACKWARD COMPATIBILITY
- # NEEDS_TOOLS option
- # TODO CAMITK_DEPRECATED. This option is marked as deprecated. It is to be removed in CamiTK 4.0
- if(${EXTENSION_NAME_CMAKE}_NEEDS_TOOL)
- message(WARNING "Warning: ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt: camitk_extension macro option NEEDS_TOOL is deprecated, please use NEEDS_CEP_LIBRARIES instead..")
- set(${EXTENSION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES ${${EXTENSION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES} ${${EXTENSION_NAME_CMAKE}_NEEDS_TOOL})
- endif()
-
-
-
- #########################################################################
- # #
- # LINK DIRECTORIES #
- # #
- # * Link directories are used to indicate the compiler where #
- # to look for folder containing libraries to link with. #
- # * Must be done BEFORE creating the CMake target with add_library #
- # #
- #########################################################################
-
- # CAMITK BASIC LIB DIRECTORIES
- link_directories(${CAMITK_LINK_DIRECTORIES})
-
-
-
- #########################################################################
- # #
- # TARGET COMPILATION DEFINITION #
- # #
- # * Additional sources files to consider at compilation (.cpp) #
- # * CMake project target definition #
- # #
- #########################################################################
- # EXTERNAL SOURCES
- set(${EXTENSION_NAME_CMAKE}_SOURCES ${${EXTENSION_NAME_CMAKE}_SOURCES} ${${EXTENSION_NAME_CMAKE}_EXTERNAL_SOURCES})
-
- # CMAKE TARGET DEFINITION
- add_library(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} SHARED ${${EXTENSION_NAME_CMAKE}_SOURCES})
-
-
-
- #########################################################################
- # #
- # QT LINKING LIBRARIES #
- # #
- # * Set at linking the Qt5 libraries #
- # #
- #########################################################################
- qt5_use_modules(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_QT_COMPONENTS})
-
-
-
- #########################################################################
- # #
- # CAMITK ACTION / COMPONENT / LIBRARIES DEPENDENCIES #
- # #
- # * Look for action / component / libraries dependencies #
- # * Specific actions / components / libraries are specified as option #
- # with the NEEDS_ACTION/COMPONENT_EXTENSION/CEP_LIBRARIES syntax #
- # * Add dependencies to library-camitkcore and the testing #
- # action/component if test are runned on it #
- # #
- #########################################################################
-
- # 1st CAMITKCORE LIBRARY DEPENDENCY
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_CORE_TARGET_LIB_NAME})
- # add the dependency to the core automoc target
-
- # 2nd COMPONENTS DEPENDENCIES
- if(${EXTENSION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION)
- set(COMPONENTS_DEPENDENCY_LIST "") #use for generating the project.xml file
- foreach(COMPONENT_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_COMPONENT_EXTENSION})
- # include directories from build, camitk (local or global install).
- include_directories(${CAMITK_BUILD_INCLUDE_DIR}/components/${COMPONENT_NEEDED})
- include_directories(${CAMITK_INCLUDE_DIR}/components/${COMPONENT_NEEDED})
- # file dependency
- if (MSVC)
- set(COMPONENT_EXTENSION_LIBRARIES ${COMPONENT_EXTENSION_LIBRARIES}
- debug ${CAMITK_BUILD_PRIVATE_LIB_DIR}/components/${COMPONENT_NEEDED}${CAMITK_DEBUG_POSTFIX}.lib
- optimized ${COMPONENT_NEEDED}
- )
- else()
- set(COMPONENT_EXTENSION_LIBRARIES ${COMPONENT_EXTENSION_LIBRARIES} ${COMPONENT_NEEDED})
- endif()
- # CMake / CDash dependencies
- if(PACKAGING_NSIS)
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component_${COMPONENT_NEEDED})
- else()
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} component-${COMPONENT_NEEDED})
- set(COMPONENTS_DEPENDENCY_LIST ${COMPONENTS_DEPENDENCY_LIST} component-${COMPONENT_NEEDED})
-<<<<<<< HEAD
- # add the dependency to the component automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS component-${COMPONENT_NEEDED})
-=======
->>>>>>> a46e035... FIXED no need to have the AUTOGEN_TARGET_DEPENDS everywhere
- endif()
- endforeach()
- endif()
-
- # 3rd ACTIONS DEPENDENCIES
- if(${EXTENSION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION)
- set(ACTIONS_DEPENDENCY_LIST "") #use for generating the project.xml file
- foreach(ACTION_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_ACTION_EXTENSION})
- # include directories from build, camitk (local or global install).
- include_directories(${CAMITK_BUILD_INCLUDE_DIR}/actions/${ACTION_NEEDED})
- include_directories(${CAMITK_INCLUDE_DIR}/actions/${ACTION_NEEDED})
- # file dependency
- if (MSVC)
- set(ACTION_EXTENSION_LIBRARIES ${ACTION_EXTENSION_LIBRARIES}
- debug ${CAMITK_BUILD_PRIVATE_LIB_DIR}/actions/${ACTION_NEEDED}${CAMITK_DEBUG_POSTFIX}.lib
- optimized ${ACTION_NEEDED}
- )
- else()
- set(ACTION_EXTENSION_LIBRARIES ${ACTION_EXTENSION_LIBRARIES} ${ACTION_NEEDED})
- endif()
- # CMake / CDash dependencies
- if (PACKAGING_NSIS)
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action_${ACTION_NEEDED})
- else()
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} action-${ACTION_NEEDED})
- set(ACTIONS_DEPENDENCY_LIST ${ACTIONS_DEPENDENCY_LIST} action-${ACTION_NEEDED})
- endif()
- endforeach()
- endif()
-
- # 4th CEP LIBRARIES DEPENDENCIES
- if(${EXTENSION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES)
- set(CEP_LIBRARIES_DEPENDENCY_LIST "") #use for generating the project.xml file
- foreach(CEP_LIBRARY_NEEDED ${${EXTENSION_NAME_CMAKE}_NEEDS_CEP_LIBRARIES})
- # include directories from build, camitk (local or global install).
- include_directories(${CAMITK_BUILD_INCLUDE_DIR}/libraries/${CEP_LIBRARY_NEEDED})
- include_directories(${CAMITK_INCLUDE_DIR}/libraries/${CEP_LIBRARY_NEEDED})
- # file dependency
- if (MSVC)
- set(CEP_LIBRARIES ${CEP_LIBRARIES} debug ${CEP_LIBRARY_NEEDED}${CAMITK_DEBUG_POSTFIX}.lib
- optimized ${CEP_LIBRARY_NEEDED}
- )
- else()
- if(PACKAGING_NSIS)
- set(CEP_LIBRARIES ${CEP_LIBRARIES} ${CEP_LIBRARY_NEEDED})
- else()
- set(CEP_LIBRARIES ${CEP_LIBRARIES} ${CEP_LIBRARY_NEEDED})
- endif()
- endif()
- # CMake / CDash dependencies
- if (PACKAGING_NSIS)
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} library_${CEP_LIBRARY_NEEDED})
- else()
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} library-${CEP_LIBRARY_NEEDED})
- set(CEP_LIBRARIES_DEPENDENCY_LIST ${CEP_LIBRARIES_DEPENDENCY_LIST} library-${CEP_LIBRARY_NEEDED})
- # add the dependency to the library automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS library-${CEP_LIBRARY_NEEDED})
- endif()
- endforeach()
- endif()
-
- # 5th DEPENDENCY ON TESTING APPLICATION
- # Those projects are used to run unitarian test on ACTION / COMPONENT extensions.
- set(APPLICATIONS_DEPENDENCY_LIST "")
- if(${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND BUILD_TESTING)
- # Add this dependencies for automatically constructing application-testactions components dependencies
- add_dependencies(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} application-test${TYPE_EXTENSION}s)
- set(APPLICATIONS_DEPENDENCY_LIST "application-test${TYPE_EXTENSION}s")
- # add the dependency to the test application automoc target
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY AUTOGEN_TARGET_DEPENDS application-test${TYPE_EXTENSION}s)
- endif()
-
- if((CEP_NAME STREQUAL "SDK") OR (CEP_NAME STREQUAL "modeling") OR (CEP_NAME STREQUAL "imaging"))
- # 6th TEST-COMPONENT APPLICATION DEPENDENCY ON THIS COMPONENT
- if(${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND BUILD_TESTING)
- add_dependencies(application-testactions ${COMPONENT_TARGET_NAME})
- # add this component automoc target to the dependency of the test application
- set_property(TARGET application-testactions APPEND PROPERTY AUTOGEN_TARGET_DEPENDS ${COMPONENT_TARGET_NAME})
- endif()
-
- # 7th TEST-ACTION APPLICATION DEPENDENCY ON ACTION-APPLICATION
- if(${TYPE_EXTENSION_CMAKE}_TARGET_NAME STREQUAL "action-application" AND BUILD_TESTING)
- add_dependencies(application-testcomponents action-application)
- # add this component automoc target to the dependency of the test application
- set_property(TARGET application-testcomponents APPEND PROPERTY AUTOGEN_TARGET_DEPENDS action-application)
- endif()
- endif()
-
-
- #########################################################################
- # #
- # COMPILATION FLAG #
- # #
- # * Flags are options to give to the compiler #
- # * Add user input flags #
- # * Add platform specific flags #
- # #
- #########################################################################
-
- # USER INPUT DEFINES COMPILER FLAG
- if(${EXTENSION_NAME_CMAKE}_DEFINES)
- foreach (FLAG ${${EXTENSION_NAME_CMAKE}_DEFINES})
- add_definitions(-D${FLAG})
- endforeach()
- endif()
-
- # USER INPUT CUSTOM COMPILER FLAG
- if(${EXTENSION_NAME_CMAKE}_CXX_FLAGS)
- foreach (FLAG ${${EXTENSION_NAME_CMAKE}_CXX_FLAGS})
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}")
- endforeach()
- endif()
-
- # PLATFORM SPECIFIC COMPILER FLAG
- # 64bits and other platform with relocation needs -fPIC
- include(TestCXXAcceptsFlag)
- check_cxx_accepts_flag(-fPIC FPIC_FLAG_ACCEPTED)
- # no need to add -fPIC on mingw, otherwise it generates a warning: -fPIC ignored for target (all code is position independent) [enabled by default]
- # msvc is also accepting the flag, but then produce warning D9002 : ignoring unknown option '-fPIC' cl
- if(FPIC_FLAG_ACCEPTED AND NOT WIN32)
- set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} APPEND PROPERTY COMPILE_FLAGS -fPIC)
- endif()
-
-
-
- #########################################################################
- # #
- # LINKING #
- # #
- # * Linking is the last stage of compilation #
- # * Indicate what libraries to use for linking the target #
- # #
- #########################################################################
- # LINKING LIBRARIES
- # Any component or action has to be linked with ${CAMITK_CORE_LIBRARIES} and with all its dependencies
- target_link_libraries(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} ${CAMITK_CORE_LIBRARIES} ${CAMITK_LIBRARIES} ${COMPONENT_EXTENSION_LIBRARIES} ${ACTION_EXTENSION_LIBRARIES} ${CEP_LIBRARIES} ${CAMITK_ITK_LIBRARIES} ${LIBXML2_LIBRARY} ${OpenCV_LIBRARIES} ${IGSTK_LIBRARIES} ${XERCESC_LIBRARIES} ${GDCM_LIBRARIES} ${EXTERNAL_LIBRARIES})
-
-
-
- #########################################################################
- # #
- # OUTPUT #
- # #
- # * Define the output directory (location and name) #
- # * Define the output name of the library #
- # * Add ${CAMITK_DEBUG_POSTFIX} suffix to Debug MSVC built libraries #
- # * Additional Linux .so files information #
- # #
- #########################################################################
-
- # OUTPUT LIBRARY NAME
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- PROPERTIES OUTPUT_NAME ${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}
- )
-
- # OUTPUT DIRECTORY LOCATION AND NAME
- # Output directory (all extensions are private)
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- )
- # Output directory (for dll plateform, this is still the same, extensions are private)
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- )
- # Output directory (for dll plateform, this is still the same, extensions are private)
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s
- )
-
- # OUTPUT LIBRARY NAME MSVC in DEBUG mode
- if (MSVC)
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTIES DEBUG_POSTFIX ${CAMITK_DEBUG_POSTFIX})
- endif()
-
- # ADDITIONAL LINUX .so FILE INFORMATION
- set(${TYPE_EXTENSION_CMAKE}_LIBRARY_PROPERTIES ${${TYPE_EXTENSION_CMAKE}_LIBRARY_PROPERTIES}
- VERSION "${CAMITK_VERSION_MAJOR}.${CAMITK_VERSION_MINOR}.${CAMITK_VERSION_PATCH}"
- SOVERSION "${CAMITK_VERSION_MAJOR}"
- )
- # set the library specific info (SONAME...)
- set_target_properties(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTIES ${${TYPE_EXTENSION_CMAKE}_LIBRARY_PROPERTIES} LINK_INTERFACE_LIBRARIES "")
-
- # see http://www.cmake.org/pipermail/cmake/2012-April/049889.html
- # target properties (outputname and remove soname)
- # set_property(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} PROPERTY NO_SONAME 1)
- # in CEP the version patch might not have been set
- if (NOT CAMITK_VERSION_PATCH)
- set(CAMITK_VERSION_PATCH 0)
- endif()
-
-
-
- #########################################################################
- # #
- # INSTALLATION #
- # #
- # * When installing the project, header files (.h) and test data are #
- # copied into a installation folder to determine. #
- # * Indicate in this section, where to install your project and which #
- # files to copy into that folder (during local/global installation) #
- # #
- #########################################################################
-
- # FOLDER INSTALLATION
- # Indicate where to install the action/component
- install(TARGETS ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- # TODO always use private lib, even for runtime
- RUNTIME DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}/${TYPE_EXTENSION}s
- LIBRARY DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}/${TYPE_EXTENSION}s
- ARCHIVE DESTINATION lib/${CAMITK_SHORT_VERSION_STRING}/${TYPE_EXTENSION}s
- COMPONENT ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
-
- # HEADERS INSTALLATION
- # Build target to install provided headers to install (with HEADERS_TO_INSTALL option)
- if(${EXTENSION_NAME_CMAKE}_HEADERS_TO_INSTALL)
- export_headers(${${EXTENSION_NAME_CMAKE}_HEADERS_TO_INSTALL} COMPONENT ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} GROUP ${TYPE_EXTENSION}s)
- endif()
-
- # Build target to install all header files(with INSTALL_ALL_HEADERS option)
- if(${EXTENSION_NAME_CMAKE}_INSTALL_ALL_HEADERS)
- export_headers(${${EXTENSION_NAME_CMAKE}_HEADERS} COMPONENT ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} GROUP ${TYPE_EXTENSION}s)
- endif()
-
- # TESTDATA INSTALLATION
- if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata)
- # Check test data dir directory
- if (NOT EXISTS ${CAMITK_BUILD_TESTDATA_DIR})
- make_directory( ${CAMITK_BUILD_TESTDATA_DIR} )
- endif()
-
- # copy the files to test data directory
- execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory testdata ${CAMITK_BUILD_TESTDATA_DIR}
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- )
-
- # during installation, copy the files to install directory
- set (TESTDATA_DEST_DIR share/${CAMITK_SHORT_VERSION_STRING}/testdata)
- install(DIRECTORY testdata/
- #DESTINATION share/testdata
- #DESTINATION share/${CAMITK_SHORT_VERSION_STRING}/testdata
- DESTINATION ${TESTDATA_DEST_DIR}
- # COMPONENT ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- PATTERN ".svn" EXCLUDE
- PATTERN "*~" EXCLUDE
- )
- endif()
-
- # CTESTDATA INSTALLATION
- if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/testdata/ctestdata)
- # Check test data dir directory
- if (NOT EXISTS ${CAMITK_BUILD_CTESTDATA_DIR})
- add_custom_command(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E make_directory ${CAMITK_BUILD_CTESTDATA_DIR}
- COMMENT "Creating build-time share directory for test data ${CAMITK_BUILD_CTESTDATA_DIR}"
- VERBATIM
- )
- endif()
-
- # At build time, copy the files to test data directory
- add_custom_command(TARGET ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory testdata/ctestdata ${CAMITK_BUILD_CTESTDATA_DIR}
- COMMENT "Installing build-time test data for ${EXTENSION_NAME}"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- VERBATIM
- )
-
- # during installation, copy the files to install directory
- set (CTESTDATA_DEST_DIR share/${CAMITK_SHORT_VERSION_STRING}/testdata/ctestdata)
- install(DIRECTORY testdata/ctestdata
- DESTINATION ${CTESTDATA_DEST_DIR}
- PATTERN ".svn" EXCLUDE
- PATTERN "*~" EXCLUDE
- )
- endif()
-
-
-
- #########################################################################
- # #
- # CDASH SUBPROJECT DESCRIPTION #
- # #
- # * Update the XML description of the subprojects dependencies #
- # for CDash. #
- # #
- #########################################################################
- # CDASH XML SUBPROJECTS DESCRIPTION UPDATE
- camitk_sub_project_add(${TYPE_EXTENSION_CMAKE} ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} DEPENDENCIES library-camitkcore ${COMPONENTS_DEPENDENCY_LIST} ${ACTIONS_DEPENDENCY_LIST} ${CEP_LIBRARIES_DEPENDENCY_LIST} ${APPLICATIONS_DEPENDENCY_LIST})
-
-
-
- #########################################################################
- # #
- # PACKAGING CATEGORIZATION #
- # #
- # * On Windows, when building a package (win32 installer), the #
- # install shield wizard proposes you to select which component #
- # to install. #
- # * Each component to install has a short description following its #
- # name to understand its role. #
- # * This section deals with the categorization and the description #
- # of the component in this installer. #
- # #
- #########################################################################
-
- # WINDOWS INSTALLER CATEGORIZATION
- if(${EXTENSION_NAME_CMAKE}_CEP_NAME)
- if (${EXTENSION_NAME_CMAKE}_CEP_NAME MATCHES "SDK")
- # The default SDK extensions are categorized as "required" and are not "unselectable" by the user at installation time
- cpack_add_component(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- DISPLAY_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- DESCRIPTION ${${EXTENSION_NAME_CMAKE}_DESCRIPTION}
- REQUIRED
- GROUP SDK
- )
-
- else()
- # Extension is selectable for installation in the wizard of the installer
- cpack_add_component(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- DISPLAY_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- DESCRIPTION ${${EXTENSION_NAME_CMAKE}_DESCRIPTION}
- GROUP ${${EXTENSION_NAME_CMAKE}_CEP_NAME}
- )
- endif()
- else()
- # Extension if not categorized for packaging presentation
- cpack_add_component(${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- DISPLAY_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- DESCRIPTION ${${EXTENSION_NAME_CMAKE}_DESCRIPTION}
- )
- endif()
-
-
- #####################################################################################
- # #
- # TRANSLATION #
- # #
- # * CAMITK_TRANSLATIONS contains the list of language to translate #
- # the QString to. #
- # #
- # * Create the translate.pro file which contains 4 sections: #
- # - HEADERS: list of .h/.hpp files to look for tr("") QString #
- # - SOURCES: list of .cpp files to look for tr("") QString #
- # - FORMS: list of .ui files to look for tr("") QString #
- # - TRANSLATIONS: list of .ts files which use CAMITK_TRANSLATIONS #
- # to define each .ts file #
- # #
- # * Execute lupdate program to update the .ts files with new QString #
- # found. #
- # #
- # * Execute lrelease program to create .qm files (binary equivalent of #
- # .ts files #
- # #
- # * Create translate.qrc which contains the list of .qm files. #
- # * Create the flags.qrc file which contains the list of .png flags #
- # images #
- # #
- #####################################################################################
- if(CAMITK_TRANSLATE)
- if(${EXTENSION_NAME_CMAKE}_EXTRA_TRANSLATE_LANGUAGE)
- if(${EXTENSION_NAME} STREQUAL "application")
- camitk_translate(USE_FLAGS
- EXTRA_LANGUAGE ${${EXTENSION_NAME_CMAKE}_EXTRA_TRANSLATE_LANGUAGE})
- else()
- camitk_translate(EXTRA_LANGUAGE ${${EXTENSION_NAME_CMAKE}_EXTRA_TRANSLATE_LANGUAGE})
- endif()
- else()
- if(${EXTENSION_NAME} STREQUAL "application")
- camitk_translate(USE_FLAGS)
- else()
- camitk_translate()
- endif()
- endif()
- endif()
-
-
-
- #########################################################################
- # #
- # CTEST - COMPONENT TESTS DESCRIPTION #
- # #
- #########################################################################
- if( ${EXTENSION_NAME_CMAKE}_COMPONENT_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS AND BUILD_TESTING)
- camitk_init_test( ${${EXTENSION_NAME_CMAKE}_TEST_APPLICATION} )
- camitk_parse_test_add_separator(EXTENSION_TYPE ${TYPE_EXTENSION} EXTENSION_NAME ${EXTENSION_NAME})
-
- # Retrieve the current directory name to properly name the test
- get_directory_name( ${CMAKE_CURRENT_SOURCE_DIR} COMP_DIR_NAME )
-
- # Retrieve the files in testdata directory - a test will be applied for each of these files
- get_subdirectoryfiles( ${CMAKE_CURRENT_SOURCE_DIR}/testdata/ctestdata TESTFILES )
-
- # Different the test level to proceed
- set( LEVEL0 0 )
- set( LEVEL1 1 )
- set( LEVEL2 2 )
- set( LEVEL3 3 )
- set( TESTLEVEL ${LEVEL3} )
-
- # 1st test should pass because application test runs with no arguments - shows usage and exit success
- camitk_add_test( TEST_SUFFIX "-LEVEL0-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- camitk_parse_test_add(NAME ${CAMITK_TEST_NAME} LEVEL 0 DESCRIPTION "Launch application testcomponent with no arguments.")
-
- # According options defined in Cmakelist enable or disable some tests
- set(TEST_DESCRIPTION "Test opening the component, saving it as a file and compare the saved file with the original one.")
- if( ${EXTENSION_NAME_CMAKE}_DISABLE_TESTLEVEL1 )
- set(TESTLEVEL 0 )
- set(TEST_DESCRIPTION "Run camitk-config." )
- elseif( ${EXTENSION_NAME_CMAKE}_DISABLE_TESTLEVEL2 )
- set( TESTLEVEL ${LEVEL1} )
- set(TEST_DESCRIPTION "Test opening the component.")
- elseif( ${EXTENSION_NAME_CMAKE}_DISABLE_TESTLEVEL3 )
- set( TESTLEVEL ${LEVEL2} )
- set(TEST_DESCRIPTION "Test opening the component and saving it as a file.")
- endif()
-
- set( LEVELORIGIN ${TESTLEVEL} ) #store the test level value in a const variable
-
- foreach( COMPONENT_TESTDATA_FILE ${TESTFILES} )
- # Give the file name (full path cut)
- get_directory_name( ${COMPONENT_TESTDATA_FILE} DATA_FILE )
-
- # Test procedure: Open an extension and a component- save it - Compare saved file to original file(level3)
- if( ${TESTLEVEL} EQUAL ${LEVEL3} )
- if(MSVC)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}${CAMITK_DEBUG_POSTFIX}.dll -l ${TESTLEVEL}"
- PASS_FILE_OUTPUT ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE}
- TEST_SUFFIX "-LEVEL${TESTLEVEL}-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- elseif(APPLE)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.dylib -l ${TESTLEVEL}"
- PASS_FILE_OUTPUT ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE}
- TEST_SUFFIX "-LEVEL${TESTLEVEL}-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- elseif(UNIX)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.so -l ${TESTLEVEL}"
- PASS_FILE_OUTPUT ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE}
- TEST_SUFFIX "-LEVEL${TESTLEVEL}-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- endif()
- camitk_parse_test_add(NAME ${CAMITK_TEST_NAME} LEVEL ${TESTLEVEL} DESCRIPTION ${TEST_DESCRIPTION})
- MATH(EXPR TESTLEVEL "${TESTLEVEL}-1") #Decrease the test level to proceed less arduous tests
- endif()
-
- # Test procedure: Open an extension and a component(level1) - save it(level2)
- while( ${TESTLEVEL} GREATER 0)
- if(MSVC)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}${CAMITK_DEBUG_POSTFIX}.dll -l ${TESTLEVEL}" TEST_SUFFIX [LEVEL${TESTLEVEL}]
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- elseif(APPLE)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.dylib -l ${TESTLEVEL}"
- TEST_SUFFIX "-LEVEL${TESTLEVEL}-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- elseif(UNIX)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${DATA_FILE} -c ${CAMITK_BUILD_PRIVATE_LIB_DIR}/${TYPE_EXTENSION}s/lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.so -l ${TESTLEVEL}"
- TEST_SUFFIX "-LEVEL${TESTLEVEL}-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- endif()
- camitk_parse_test_add(NAME ${CAMITK_TEST_NAME} LEVEL ${TESTLEVEL} DESCRIPTION ${TEST_DESCRIPTION})
- MATH(EXPR TESTLEVEL "${TESTLEVEL}-1")# Decrease the test level to proceed less arduous tests
- endwhile()
- set( TESTLEVEL ${LEVELORIGIN} )
- endforeach()
-
- #########################################################################
- # #
- # CTEST - ACTION TESTS DESCRIPTION #
- # #
- #########################################################################
- elseif( ${EXTENSION_NAME_CMAKE}_ACTION_EXTENSION AND ${EXTENSION_NAME_CMAKE}_TEST_APPLICATION AND NOT PACKAGING_NSIS)
- camitk_init_test( ${${EXTENSION_NAME_CMAKE}_TEST_APPLICATION} )
- camitk_parse_test_add_separator(EXTENSION_TYPE ${TYPE_EXTENSION} EXTENSION_NAME ${EXTENSION_NAME})
-
- # Retrieve the current directory name to properly name the test
- get_directory_name( ${CMAKE_CURRENT_SOURCE_DIR} COMP_DIR_NAME )
-
- # Test should pass because application test runs with no arguments - shows usage and exit success
- camitk_add_test( TEST_SUFFIX "-LEVEL0-" PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME} )
- camitk_parse_test_add(NAME ${CAMITK_TEST_NAME} LEVEL 0 DESCRIPTION "Launch application testaction with no arguments.")
-
- #get the names of actions .dlls in lib directory
- get_subdirectoryfiles( ${CAMITK_BUILD_PRIVATE_LIB_DIR}/actions/ ACTIONSDLLS )
-
- foreach( ACTION_TESTDATA_FILE ${${EXTENSION_NAME_CMAKE}_TEST_FILES} )
- # Next line is only useful macro debug => comment from now
- # message( STATUS "Action extension: " ${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME} " Test file: " ${ACTION_TESTDATA_FILE} )
-
- if( NOT ( ${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME} MATCHES "application" ) )# We do not apply tests on actions like (close, save, save as)
- # Test procedure: Open a file - load an action extension - Apply an action on the component wrapping the file
- if(MSVC)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${ACTION_TESTDATA_FILE} -a ${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}${CAMITK_DEBUG_POSTFIX}.dll"
- TEST_SUFFIX "-LEVEL1-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- elseif(APPLE)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${ACTION_TESTDATA_FILE} -a lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.dylib"
- TEST_SUFFIX "-LEVEL1-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- elseif(UNIX)
- camitk_add_test( EXECUTABLE_ARGS "-i ${CAMITK_BUILD_TESTDATA_DIR}/ctestdata/${ACTION_TESTDATA_FILE} -a lib${${TYPE_EXTENSION_CMAKE}_OUTPUT_NAME}.so"
- TEST_SUFFIX "-LEVEL1-"
- PROJECT_NAME ${${TYPE_EXTENSION_CMAKE}_TARGET_NAME}
- )
- endif()
- camitk_parse_test_add(NAME ${CAMITK_TEST_NAME} LEVEL 1 DESCRIPTION "Open a file, load the action and apply it on the component.")
- endif()
- endforeach()
- endif()
- endif() # endif(${TYPE_EXTENSION_CMAKE}_${EXTENSION_NAME_CMAKE})
-
-endmacro()
-
-# Old macro to configure a new action to the framework
-# Use camitk_extension macro instead
-# TODO CAMITK_DEPRECATED. This macro is marked as deprecated. It is to be removed in CamiTK 4.0
-macro(action_extension)
- message(WARNING "Deprecated macro action_extension detected : please use camitk_extension(ACTION_EXTENSION ...) instead.")
- camitk_extension(ACTION_EXTENSION ${ARGN})
-endmacro()
-
-# Old macro to configure a new component to the framework
-# Use camitk_extension macro instead
-# TODO CAMITK_DEPRECATED. This macro is marked as deprecated. It is to be removed in CamiTK 4.0
-macro(component_extension)
- message(WARNING "Deprecated macro component_extension detected : please use camitk_extension(COMPONENT_EXTENSION ...) instead.")
- camitk_extension(COMPONENT_EXTENSION ${ARGN})
-endmacro()
-
-# TODO write a viewer_extension macro in CamiTK
diff --git a/sdk/cmake/modules/macros/camitk/CamiTKExtensionProject.cmake b/sdk/cmake/modules/macros/camitk/CamiTKExtensionProject.cmake
index e54fd3d..4204fb9 100644
--- a/sdk/cmake/modules/macros/camitk/CamiTKExtensionProject.cmake
+++ b/sdk/cmake/modules/macros/camitk/CamiTKExtensionProject.cmake
@@ -103,6 +103,9 @@ macro(camitk_extension_project)
else()
set(CEP_DEFAULT_APPLICATION "camitk-imp")
endif()
+
+ # simply target name so that the custom target name does not contains any space
+ string(REGEX REPLACE " " "" SIMPLIFIED_CEP_NAME ${CEP_NAME})
# if this is a single CEP, provides the installation facilities
# otherwise, just add include(CamiTKInstall) to get the installation facilities
@@ -110,7 +113,7 @@ macro(camitk_extension_project)
#-- camitk_global_install == install in CAMITK_DIR
if (CAMITK_SDK_BUILD)
# if the SDK is currently being build => install in CMAKE_INSTALL_PREFIX
- add_custom_target(${CEP_NAME}_global_install
+ add_custom_target(${SIMPLIFIED_CEP_NAME}_global_install
# Second cmake to install
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
COMMENT "Global Installation in ${CMAKE_INSTALL_PREFIX}"
@@ -118,7 +121,7 @@ macro(camitk_extension_project)
else()
# this is called from a normal CEP build => install in CAMITK_DIR
- add_custom_target(${CEP_NAME}_global_install
+ add_custom_target(${SIMPLIFIED_CEP_NAME}_global_install
# First cmake to redefine install prefix
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_DIR} ${CMAKE_BINARY_DIR}
# Second cmake to install
@@ -128,7 +131,7 @@ macro(camitk_extension_project)
endif()
# camitk_local_install == install in User Config directory
- add_custom_target(${CEP_NAME}_local_install
+ add_custom_target(${SIMPLIFIED_CEP_NAME}_local_install
# First cmake to redefine install prefix
COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX:PATH=${CAMITK_USER_DIR} ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install --config ${CMAKE_CFG_INTDIR}
@@ -138,7 +141,7 @@ macro(camitk_extension_project)
# Add an update_translate targete to configure all the .qrc files for the different extensions of this CEP on demand.
# .qrc files consider up to date .ts resources files for translation
- add_custom_target(${CEP_NAME}_updatetranslate
+ add_custom_target(${SIMPLIFIED_CEP_NAME}_updatetranslate
COMMAND ${CMAKE_COMMAND} -E echo "Updating translation for ${CEP_NAME}"
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=TRUE ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -DCAMITK_TRANSLATE=FALSE ${CMAKE_BINARY_DIR}
diff --git a/sdk/cmake/modules/macros/camitk/CamiTKLibrary.cmake b/sdk/cmake/modules/macros/camitk/CamiTKLibrary.cmake
index 3cacce6..4ae0da6 100644
--- a/sdk/cmake/modules/macros/camitk/CamiTKLibrary.cmake
+++ b/sdk/cmake/modules/macros/camitk/CamiTKLibrary.cmake
@@ -361,7 +361,7 @@ macro(camitk_library)
set(LIBRARIES_DEPENDENCY_LIST "") #use for generating the project.xml file
if(${DEFAULT_LIBRARY_NAME_CMAKE}_NEEDS_CEP_LIBRARIES)
foreach(CEP_LIBRARY_NEEDED ${${DEFAULT_LIBRARY_NAME_CMAKE}_NEEDS_CEP_LIBRARIES})
- # include directories from build, camitk (local or global install).
+ # include directories from build, camitk (local or global install).
include_directories(${CAMITK_BUILD_INCLUDE_DIR}/libraries/${CEP_LIBRARY_NEEDED})
include_directories(${CAMITK_INCLUDE_DIR}/libraries/${CEP_LIBRARY_NEEDED})
# file dependency
diff --git a/sdk/cmake/modules/macros/camitk/packaging/CamiTKCEPPackaging.cmake b/sdk/cmake/modules/macros/camitk/packaging/CamiTKCEPPackaging.cmake
index 8d4fd41..abc0249 100644
--- a/sdk/cmake/modules/macros/camitk/packaging/CamiTKCEPPackaging.cmake
+++ b/sdk/cmake/modules/macros/camitk/packaging/CamiTKCEPPackaging.cmake
@@ -61,7 +61,7 @@ string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PAC
if (CAMITK_CEP_PACKAGING_VENDOR)
set(CPACK_PACKAGE_VENDOR ${CAMITK_CEP_PACKAGING_VENDOR})
else()
- set(CPACK_PACKAGE_VENDOR "UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525")
+ set(CPACK_PACKAGE_VENDOR "Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525")
endif()
if (CAMITK_CEP_PACKAGING_CONTACT)
set(CPACK_PACKAGE_CONTACT ${CAMITK_CEP_PACKAGING_CONTACT})
@@ -409,7 +409,10 @@ include(CPack)
set(CEP_PACKAGING_DIR "${CMAKE_BINARY_DIR}/CamiTKExtensionPackage")
set(CEP_PACKAGE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.cep")
-add_custom_target(camitk_extension_${PROJECT_NAME}_package
+# simply target name so that the custom target name does not contains any space
+string(REGEX REPLACE " " "" SIMPLIFIED_PROJECT_NAME ${PROJECT_NAME})
+
+add_custom_target(camitk_extension_${SIMPLIFIED_PROJECT_NAME}_package
# configure for packaging
COMMAND ${CMAKE_COMMAND} -DPACKAGING_NSIS:BOOL=ON ${CMAKE_BINARY_DIR}
# build first
diff --git a/sdk/cmake/modules/macros/camitk/packaging/CamiTKOpenSourcePackaging.cmake b/sdk/cmake/modules/macros/camitk/packaging/CamiTKOpenSourcePackaging.cmake
index 0055747..4d254d6 100644
--- a/sdk/cmake/modules/macros/camitk/packaging/CamiTKOpenSourcePackaging.cmake
+++ b/sdk/cmake/modules/macros/camitk/packaging/CamiTKOpenSourcePackaging.cmake
@@ -1,6 +1,15 @@
#!@ingroup group_sdk_cmake_camitk_packaging
#!
-# ! To make an installer,
+#! ==================== Source Tar ball ====================
+#!
+#! To make a source tar ball, use the custom target "camitk_package_source"
+#! - make camitk_package_source
+#! (it generates the correct CamiTKVersion.h)
+#! WARNING it is VERY important to use "make camitk_package_source" and NOT just "make package_source"
+#!
+#! ==================== Windows User Package ====================
+#!
+#! To make an installer (setup.exe) for the user package:
#! - configure cmake with -DPACKAGING_NSIS:BOOL=TRUE (on windows AND unix)
#! - use the custom target camitk_package, e.g "make camitk_package"
#!
@@ -10,27 +19,25 @@
#! Launch the camitkopensource.sln visual studio solution file.
#! Build all in Release (do it again if some .h files missing errors occured)
#! Build camitk_package target.
-
+#!
+#! On windows for the NSIS packager, to generate different components that can be opt out at install time, see
+#! http://www.itk.org/Wiki/CMake:Component_Install_With_CPack
+#!
+#! More generally see http://www.itk.org/Wiki/CMake:CPackConfiguration
+#!
+#! ==================== Linux User Package ====================
+#!
#! On UNIX platforms
#! cmake -DCMAKE_SKIP_RPATH:BOOL=ON -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release -DCEP_IMAGING:BOOL=TRUE -DCEP_MODELING:BOOL=TRUE -DPACKAGING_NSIS:BOOL=TRUE -DCMAKE_INSTALL_PREFIX=/usr
#!
#! On debian/ubuntu, you need to have package "dpkg" (to build DEB packages) and package "rpm" (to build RPM packages) installed:
#! apt-get install dpkg rpm
#!
-#! To make a source tar ball, just use the custom target camitk_package_sourc
-#! - make camitk_package_source
-#! (it generates the correct CamiTKVersion.h)
-#!
#! To check the content of a deb package:
#! dpkg --contents package.deb
#! To install the content of a deb in a subdirectory instead of system-wide:
#! dpkg --vextract package.deb subdirectory
#!
-#! On windows for the NSIS packager, to generate different components that can be opt out at install time, see
-#! http://www.itk.org/Wiki/CMake:Component_Install_With_CPack
-#!
-#! More generally see http://www.itk.org/Wiki/CMake:CPackConfiguration
-
#! There is a bug deb package (cmake 2.8.9 on Debian Wheezy): permission for directories are not rights
#! Here is how to fix it (inspired from https://github.com/paralect/robomongo/blob/master/install/linux/fixup_deb.sh.in )
#! set PACKAGE_FILENAME="camitk-3.3.0-debian-7.x-wheezy_amd64.deb"
@@ -45,7 +52,6 @@
#! fakeroot dpkg -b camitk-deb $PACKAGE_FILENAME
#! rm -rf camitk-deb
-
macro(camitk_opensource_packaging)
#! package name
@@ -57,9 +63,9 @@ set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSIO
string(TOLOWER "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CAMITK_VER_NICKNAME}-${LSB_DISTRIB}_${CPACK_PACKAGE_ARCHITECTURE}" CPACK_PACKAGE_FILE_NAME)
#! contact information
-set(CPACK_PACKAGE_VENDOR "UJF-Grenoble 1, CNRS, TIMC-IMAG UMR 5525")
+set(CPACK_PACKAGE_VENDOR "Univ. Grenoble Alpes, CNRS, TIMC-IMAG UMR 5525")
set(CPACK_PACKAGE_CONTACT "http://camitk.imag.fr")
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "CamiTK Developers <camitk-team at imag.fr>")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Emmanuel Promayon <Emmanuel.Promayon at imag.fr>")
#! resource files
set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
diff --git a/sdk/components/CMakeLists.txt b/sdk/components/CMakeLists.txt
index 31f809f..e3b2f3a 100644
--- a/sdk/components/CMakeLists.txt
+++ b/sdk/components/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro appropriately
# find components
get_subdirectories(COMPONENTS_LIST)
diff --git a/sdk/components/off/OffExtension.cpp b/sdk/components/off/OffExtension.cpp
index a1bc040..ce4b4d1 100644
--- a/sdk/components/off/OffExtension.cpp
+++ b/sdk/components/off/OffExtension.cpp
@@ -44,7 +44,7 @@ QString OffExtension::getName() const {
}
QString OffExtension::getDescription() const {
- return tr("OFF <em>.off</em> files in <b>CamiTK</b>.(very few support!) <br>(c)TIMC-IMAG UJF 2012");
+ return tr("OFF <em>.off</em> files in <b>CamiTK</b> <br>(c) Univ. Grenoble Alpes");
}
QStringList OffExtension::getFileExtensions() const {
diff --git a/sdk/libraries/CMakeLists.txt b/sdk/libraries/CMakeLists.txt
index 35dc7a2..b771dc3 100644
--- a/sdk/libraries/CMakeLists.txt
+++ b/sdk/libraries/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a library, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_library() macro apropriately
+# In your CMakeLists.txt, use the camitk_library() macro appropriately
# Recursively update the shiboken path variable containing the CamiTK SDK tree structure
set(SHIBOKEN_CAMITK_SDK_PATH ${SHIBOKEN_CAMITK_SDK_PATH}:${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "")
diff --git a/sdk/libraries/cepgenerator/ActionGenerator.cpp b/sdk/libraries/cepgenerator/ActionGenerator.cpp
index 5f0ff55..2edd966 100644
--- a/sdk/libraries/cepgenerator/ActionGenerator.cpp
+++ b/sdk/libraries/cepgenerator/ActionGenerator.cpp
@@ -65,13 +65,28 @@ ActionGenerator::ActionGenerator( Action & domAction, QString licence) {
createFromDom(domAction);
}
+// -------------------- getComponentNamespace --------------------
+QString ActionGenerator::getComponentNamespace() {
+ if (componentName == "Component"
+ || componentName == "SimplisticComponent"
+ || componentName == "MeshComponent"
+ || componentName == "ImageComponent"
+ || componentName == "ImageAcquisitionComponent") {
+ return "camitk::";
+ }
+ else {
+ return "";
+ }
+}
+
+// -------------------- createFromDom --------------------
void ActionGenerator::createFromDom(Action & dom) {
std::cout << "Creating action..." << std::endl;
- this->name = QString(dom.name().c_str());
- this->description = QString(dom.description().c_str()).simplified();
+ this->name = QString(dom.name().c_str());
+ this->description = QString(dom.description().c_str()).simplified();
this->className = ClassNameHandler::getClassName(this->name);
this->componentName = QString(dom.component().c_str());
-
+
// classification
// 1- Family
this->family = QString(dom.classification().family().c_str());
@@ -136,6 +151,7 @@ void ActionGenerator::writeHFile(QString directoryName) {
text.replace(QRegExp("@LICENCE@"), licence);
text.replace(QRegExp("@HEADDEF@"), className.toUpper());
text.replace(QRegExp("@COMPONENTNAME@"), componentName);
+ text.replace(QRegExp("@COMPONENTNAMESPACE@"), getComponentNamespace());
text.replace(QRegExp("@ACTIONCLASSNAME@"), className);
if (text.contains(QRegExp("@IF_NOCOMP@"))) {
diff --git a/sdk/libraries/cepgenerator/ActionGenerator.h b/sdk/libraries/cepgenerator/ActionGenerator.h
index a10e62a..9473d69 100644
--- a/sdk/libraries/cepgenerator/ActionGenerator.h
+++ b/sdk/libraries/cepgenerator/ActionGenerator.h
@@ -94,6 +94,9 @@ private:
QVector<ParameterGenerator *> actionParameters;
+ /// Check if this action's component is in CamiTK namespace
+ /// @returns "camitk::" if the component is declared in the CamiTK namespace or "" otherwise
+ QString getComponentNamespace();
};
#endif
diff --git a/sdk/libraries/cepgenerator/resources/Action.cpp.in b/sdk/libraries/cepgenerator/resources/Action.cpp.in
index 315727c..555dfff 100644
--- a/sdk/libraries/cepgenerator/resources/Action.cpp.in
+++ b/sdk/libraries/cepgenerator/resources/Action.cpp.in
@@ -141,8 +141,7 @@ void @ACTIONCLASSNAME@::process(@COMPONENTNAME@ * comp) {
// Creating the output image
vtkSmartPointer<vtkImageData> outputImage = vtkSmartPointer<vtkImageData>::New();
outputImage->SetDimensions(dims);
- outputImage->SetScalarType(inputImage->GetScalarType());
- outputImage->SetNumberOfScalarComponents(numberOfScalarComponents);
+ outputImage->AllocateScalars(inputImage->GetScalarType(), numberOfScalarComponents);
// Here, we arbitrarily fill the output image with the exact same data as the input image.
// Thus this action just copy the input image (an example of stupid action...).
@@ -240,7 +239,6 @@ vtkSmartPointer<vtkImageData> @ACTIONCLASSNAME@::itkProcess(vtkSmartPointer<vtkI
resultImage->GetExtent(extent);
result->SetExtent(extent);
result->DeepCopy(resultImage);
- result->Update();
// Set CamiTK progress bar back to zero (the processing filter is over)
observer->Reset();
diff --git a/sdk/libraries/cepgenerator/resources/Action.h.in b/sdk/libraries/cepgenerator/resources/Action.h.in
index 90828bb..82a766d 100644
--- a/sdk/libraries/cepgenerator/resources/Action.h.in
+++ b/sdk/libraries/cepgenerator/resources/Action.h.in
@@ -30,15 +30,15 @@ public slots:
@IF_DEFCOMPONENT@
private:
/// helper method to simplify the target component processing
- virtual void process(camitk::@COMPONENTNAME@ *);
-
- @IF_ITKFILTER@
+ virtual void process(@COMPONENTNAMESPACE@@COMPONENTNAME@ *);
+
+ @IF_ITKFILTER@
vtkSmartPointer<vtkImageData> implementProcess(vtkSmartPointer<vtkImageData> img);
- /** Where the ITK Pipeline is implemented */
+ /** Where the ITK Pipeline is implemented */
template <class InputPixelType, class OutputPixelType, const int dim>
vtkSmartPointer<vtkImageData> itkProcess(vtkSmartPointer<vtkImageData> img);
- @ENDIF_ITKFILTER@
+ @ENDIF_ITKFILTER@
@ENDIF_DEFCOMPONENT@
};
diff --git a/sdk/libraries/cepgenerator/resources/ActionExtension.cpp.in b/sdk/libraries/cepgenerator/resources/ActionExtension.cpp.in
index aab630e..674062b 100644
--- a/sdk/libraries/cepgenerator/resources/ActionExtension.cpp.in
+++ b/sdk/libraries/cepgenerator/resources/ActionExtension.cpp.in
@@ -5,9 +5,6 @@
// include generated actions headers
@INCLUDEACTIONHEADERS@
-// --------------- declare the extension -------------------
-Q_EXPORT_PLUGIN2(@EXTENSIONCLASSNAMELOW@, @EXTENSIONCLASSNAME@);
-
// --------------- getActions -------------------
void @EXTENSIONCLASSNAME@::init() {
@BEGIN_REGISTERACTIONS@
diff --git a/sdk/libraries/cepgenerator/resources/ActionExtension.h.in b/sdk/libraries/cepgenerator/resources/ActionExtension.h.in
index 4283cd5..14e2ee3 100644
--- a/sdk/libraries/cepgenerator/resources/ActionExtension.h.in
+++ b/sdk/libraries/cepgenerator/resources/ActionExtension.h.in
@@ -8,6 +8,7 @@
class @EXTENSIONCLASSNAME@ : public camitk::ActionExtension {
Q_OBJECT
Q_INTERFACES(camitk::ActionExtension);
+ Q_PLUGIN_METADATA(IID "fr.imag.camitk.wizardgenerated.action. at EXTENSIONCLASSNAME@")
public:
/// Constructor
diff --git a/sdk/libraries/cepgenerator/resources/Component.cpp.in b/sdk/libraries/cepgenerator/resources/Component.cpp.in
index 6217883..74cccb0 100644
--- a/sdk/libraries/cepgenerator/resources/Component.cpp.in
+++ b/sdk/libraries/cepgenerator/resources/Component.cpp.in
@@ -69,8 +69,7 @@ using namespace camitk;
vtkSmartPointer<vtkImageData> image = NULL;
image = vtkSmartPointer<vtkImageData>::New();
image->SetDimensions(3,3,3);
- image->SetScalarType(VTK_UNSIGNED_CHAR);
- image->SetNumberOfScalarComponents(1);
+ image->AllocateScalars(VTK_UNSIGNED_CHAR, 1);
// Here, we arbitrarily fill the image data
int* dims = image->GetDimensions();
diff --git a/sdk/libraries/cepgenerator/resources/ComponentExtension.cpp.in b/sdk/libraries/cepgenerator/resources/ComponentExtension.cpp.in
index 7d7a66e..6793ace 100644
--- a/sdk/libraries/cepgenerator/resources/ComponentExtension.cpp.in
+++ b/sdk/libraries/cepgenerator/resources/ComponentExtension.cpp.in
@@ -13,8 +13,6 @@
using namespace camitk;
-// --------------- Extension Declaration -------------------
-Q_EXPORT_PLUGIN2(@EXTENSIONCLASSNAMELOW@, @EXTENSIONCLASSNAME@);
// --------------- GetFileExtensions -------------------
QStringList @EXTENSIONCLASSNAME@::getFileExtensions() const {
diff --git a/sdk/libraries/cepgenerator/resources/ComponentExtension.h.in b/sdk/libraries/cepgenerator/resources/ComponentExtension.h.in
index e55c106..7e846da 100644
--- a/sdk/libraries/cepgenerator/resources/ComponentExtension.h.in
+++ b/sdk/libraries/cepgenerator/resources/ComponentExtension.h.in
@@ -10,6 +10,7 @@
class @EXTENSIONCLASSNAME@ : public camitk::ComponentExtension {
Q_OBJECT
Q_INTERFACES(camitk::ComponentExtension);
+ Q_PLUGIN_METADATA(IID "fr.imag.camitk.wizardgenerated.component. at EXTENSIONCLASSNAME@")
public:
/// Constructor
diff --git a/sdk/libraries/cepgenerator/resources/actions.CMakeLists.txt.in b/sdk/libraries/cepgenerator/resources/actions.CMakeLists.txt.in
index f450f39..9bc1e48 100644
--- a/sdk/libraries/cepgenerator/resources/actions.CMakeLists.txt.in
+++ b/sdk/libraries/cepgenerator/resources/actions.CMakeLists.txt.in
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(ACTION_EXTENSION ...) macro appropriately
# find components
get_subdirectories(ACTIONS_LIST)
diff --git a/sdk/libraries/cepgenerator/resources/applications.CMakeLists.txt.in b/sdk/libraries/cepgenerator/resources/applications.CMakeLists.txt.in
index ac9e4d5..2249132 100644
--- a/sdk/libraries/cepgenerator/resources/applications.CMakeLists.txt.in
+++ b/sdk/libraries/cepgenerator/resources/applications.CMakeLists.txt.in
@@ -4,7 +4,7 @@
# To add an application, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the application_extension() macro apropriately
+# In your CMakeLists.txt, use the application_extension() macro appropriately
# Find applications
get_subdirectories(APPLICATIONS_LIST)
diff --git a/sdk/libraries/cepgenerator/resources/cep.CMakeLists.txt.in b/sdk/libraries/cepgenerator/resources/cep.CMakeLists.txt.in
index 43be0fe..f1c8f56 100644
--- a/sdk/libraries/cepgenerator/resources/cep.CMakeLists.txt.in
+++ b/sdk/libraries/cepgenerator/resources/cep.CMakeLists.txt.in
@@ -1,7 +1,7 @@
#--------------------------------------------
# CamiTK Extension Project
#--------------------------------------------
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.0)
# Find CamiTK SDK
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/sdk/libraries/cepgenerator/resources/components.CMakeLists.txt.in b/sdk/libraries/cepgenerator/resources/components.CMakeLists.txt.in
index 5331480..ee966bf 100644
--- a/sdk/libraries/cepgenerator/resources/components.CMakeLists.txt.in
+++ b/sdk/libraries/cepgenerator/resources/components.CMakeLists.txt.in
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro appropriately
# find components
get_subdirectories(COMPONENTS_LIST)
diff --git a/sdk/libraries/cepgenerator/resources/libraries.CMakeLists.txt.in b/sdk/libraries/cepgenerator/resources/libraries.CMakeLists.txt.in
index e74edc7..e3044ef 100644
--- a/sdk/libraries/cepgenerator/resources/libraries.CMakeLists.txt.in
+++ b/sdk/libraries/cepgenerator/resources/libraries.CMakeLists.txt.in
@@ -4,7 +4,7 @@
# To add a library, just add a subdirectory (the application name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_library() macro apropriately
+# In your CMakeLists.txt, use the camitk_library() macro appropriately
# Find applications
get_subdirectories(LIBRARY_LIST)
diff --git a/modeling/libraries/mml/monitoring/AnsysBatchWriter.h b/sdk/libraries/core/CamiTKVersion.h
similarity index 60%
copy from modeling/libraries/mml/monitoring/AnsysBatchWriter.h
copy to sdk/libraries/core/CamiTKVersion.h
index df00c14..e78b768 100644
--- a/modeling/libraries/mml/monitoring/AnsysBatchWriter.h
+++ b/sdk/libraries/core/CamiTKVersion.h
@@ -23,34 +23,13 @@
* $CAMITK_LICENCE_END$
****************************************************************************/
-#ifndef SIMULATOR_SIMULATORS_ANSYS_ANSYSBATCHWRITER_H
-#define SIMULATOR_SIMULATORS_ANSYS_ANSYSBATCHWRITER_H
-
-#include <string>
-
-#include "MonitoringManager.h"
-
-/**
- *
- * @ingroup group_cepmodeling_libraries_mml
- *
- * @brief
- * Ansys batch writer allow to write a part of a batch file
- */
-class AnsysBatchWriter {
-
-public:
- /// constructor
- AnsysBatchWriter(MonitoringManager* monitoringManager);
- /// destructor
- virtual ~AnsysBatchWriter();
-
- /// write a part of batch file into a string
- virtual std::string write()=0;
-
-protected:
- /// monitoring manager
- MonitoringManager* monitoringManager;
-};
-
-#endif // SIMULATOR_SIMULATORS_ANSYS_ANSYSBATCHWRITER_H
\ No newline at end of file
+// CMake will automatically generate the corresponding CamiTKVersion.h in the build tree
+// and replace the @variables using the configuration details.
+
+namespace camitk
+{
+const char * Core::version = "CamiTK 4.0.3";
+const char * Core::shortVersion = "camitk-4.0";
+const char * Core::soVersion = "4";
+const char * Core::debugPostfix = "-debug";
+}
diff --git a/sdk/libraries/core/utils/ObjectController.h b/sdk/libraries/core/utils/ObjectController.h
index 9d7787d..794b9cb 100644
--- a/sdk/libraries/core/utils/ObjectController.h
+++ b/sdk/libraries/core/utils/ObjectController.h
@@ -99,7 +99,7 @@ class ObjectControllerPrivate;
Three different view mode are available to represent/interact with the property values:
- TREE based on a list view
- GROUPBOX same as TREE, but each group of properties are viewed in a group box
- - BUTTON same as GROUPBOX, but buttons allow to show/hide the sub properties
+ - BUTTON same as GROUPBOX, but buttons allow the user to show/hide the sub properties
The view mode can be changed at any time, even at run-time (see the "objectcontroller" application).
@@ -172,7 +172,7 @@ public:
enum ViewMode {
TREE, ///< The property browser can be shown like a QListView
GROUPBOX, ///< It is like the TREE but with a delimitation to indicate the arborescence of the property type
- BUTTON ///< It is like the GROUPBOX but the buttons allow to control the comput display of arborescence
+ BUTTON ///< It is like the GROUPBOX but the buttons allow the user to control the comput display of arborescence
};
/// constructor of object controller with in parameters the parent widget and the view mode (default : TREE)
diff --git a/sdk/testapplications/CMakeLists.txt b/sdk/testapplications/CMakeLists.txt
index f718a1f..c642163 100644
--- a/sdk/testapplications/CMakeLists.txt
+++ b/sdk/testapplications/CMakeLists.txt
@@ -4,7 +4,7 @@
# To add a component, just add a subdirectory (the component name is the
# directory name). Add all your code there and a text file called
# CMakeLists.txt
-# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro apropriately
+# In your CMakeLists.txt, use the camitk_extension(COMPONENT_EXTENSION ...) macro appropriately
# find components
get_subdirectories(APPS_TEST_LIST)
diff --git a/sdk/testapplications/testactions/resources/camitk-testactions.1.in b/sdk/testapplications/testactions/resources/camitk-testactions.1.in
index 7b20ef4..7f104c5 100644
--- a/sdk/testapplications/testactions/resources/camitk-testactions.1.in
+++ b/sdk/testapplications/testactions/resources/camitk-testactions.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Tests Actions
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is able to execute a bench of unit tests on CamiTK actions.
.PP
@@ -35,8 +35,8 @@ input file on which the tested action will process - give full path - file
is not modified
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/testapplications/testactions/resources/manpage-epilogue.1.in b/sdk/testapplications/testactions/resources/manpage-epilogue.1.in
index 07eeb0e..31a40af 100644
--- a/sdk/testapplications/testactions/resources/manpage-epilogue.1.in
+++ b/sdk/testapplications/testactions/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/testapplications/testactions/resources/manpage-prologue.1.in b/sdk/testapplications/testactions/resources/manpage-prologue.1.in
index 559c889..6f09474 100644
--- a/sdk/testapplications/testactions/resources/manpage-prologue.1.in
+++ b/sdk/testapplications/testactions/resources/manpage-prologue.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Tests Actions
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is able to execute a bench of unit tests on CamiTK actions.
.PP
diff --git a/sdk/testapplications/testcomponents/main.cpp b/sdk/testapplications/testcomponents/main.cpp
index 6325f06..64f4879 100644
--- a/sdk/testapplications/testcomponents/main.cpp
+++ b/sdk/testapplications/testcomponents/main.cpp
@@ -109,13 +109,13 @@ int main(int argc, char *argv[]) {
std::cout << "FAILED " << std::endl;
return EXIT_FAILURE;
}
- std::cout << " SUCESS " << std::endl;
+ std::cout << " SUCCESS " << std::endl;
std::cout << "Closing component " << ifile.fileName().toStdString();
if ( !Application::close(comp) ) {
std::cout << " FAILED" << std::endl;
return EXIT_FAILURE;
}
- std::cout << " SUCESS " << std::endl;
+ std::cout << " SUCCESS " << std::endl;
// we successfully saved and closed our component, yehhaww !
return EXIT_SUCCESS;
}
diff --git a/sdk/testapplications/testcomponents/resources/camitk-testcomponents.1.in b/sdk/testapplications/testcomponents/resources/camitk-testcomponents.1.in
index e4d3360..be0e883 100644
--- a/sdk/testapplications/testcomponents/resources/camitk-testcomponents.1.in
+++ b/sdk/testapplications/testcomponents/resources/camitk-testcomponents.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Tests Components
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is able to execute a bench of unit tests on CamiTK components.
.PP
@@ -41,8 +41,8 @@ library)
The test level to proceed
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/testapplications/testcomponents/resources/manpage-epilogue.1.in b/sdk/testapplications/testcomponents/resources/manpage-epilogue.1.in
index 07eeb0e..31a40af 100644
--- a/sdk/testapplications/testcomponents/resources/manpage-epilogue.1.in
+++ b/sdk/testapplications/testcomponents/resources/manpage-epilogue.1.in
@@ -1,6 +1,6 @@
.SH "AUTHORS"
-CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the UJF\-Grenoble 1, CNRS,
-in the TIMC\-IMAG UMR 5525 laboratory.
+CamiTK and camitk\- at APPLICATION_NAME@ is currently developed by the Univ. Grenoble Alpes,
+CNRS in the TIMC\-IMAG UMR 5525 laboratory (GMCAO).
.SH "SEE ALSO"
The full documentation and tutorials for
.B CamiTK
diff --git a/sdk/testapplications/testcomponents/resources/manpage-prologue.1.in b/sdk/testapplications/testcomponents/resources/manpage-prologue.1.in
index 5c25e5b..66bdd4c 100644
--- a/sdk/testapplications/testcomponents/resources/manpage-prologue.1.in
+++ b/sdk/testapplications/testcomponents/resources/manpage-prologue.1.in
@@ -9,7 +9,7 @@ camitk- at APPLICATION_NAME@ \- CamiTK Tests Components
.br
Please visit http://camitk.imag.fr for more information.
.br
-(c) UJF\-Grenoble 1, CNRS, TIMC\-IMAG UMR 5525
+(c) Univ. Grenoble Alpes, CNRS, TIMC\-IMAG UMR 5525
.PP
camitk\- at APPLICATION_NAME@ is able to execute a bench of unit tests on CamiTK components.
.PP
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/camitk.git
More information about the debian-med-commit
mailing list