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

slightly improved documentation

parent 7b24b3f3
No related branches found
Tags 01.10.00
No related merge requests found
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
* \page configreader ConfigReader Module * \page configreader ConfigReader Module
* *
* This Module provides the following features: * This Module provides the following features:
* - Read values from an xml config file to have them available at * - read values from an xml config file to have them available at server initialization,
* server initialization. * - expose above values as process variables; these may connect to other ApplicationCore modules if needed.
* - Expose above values as process variables; these may connect
* to other Application core modules if needed.
* *
* \section usage Example usage * \section usage Example usage
* - A server application using the config reader may look like: * - A server application using the config reader may look like:
...@@ -26,14 +24,14 @@ ...@@ -26,14 +24,14 @@
* *
* - Values from validConfig.xml can be accessed at server startup: * - Values from validConfig.xml can be accessed at server startup:
* \code * \code
* Server::Server(){ * Server::Server() {
* auto config_var = config.get<int8_t>("module1/var8"); * auto config_var = config.get<int8_t>("module1/var8");
* auto config_arr = config.get<std::vector<int8>>("module1/submodule/intArray"); * auto config_arr = config.get<std::vector<int8>>("module1/submodule/intArray");
* // ... * // ...
* } * }
* \endcode * \endcode
* *
* - Configuration may be published as Process Variables to other modules: * - Configuration may be published as process variables to other application modules, the control system or devices:
* \code * \code
* void Server::defineConnections() { * void Server::defineConnections() {
* config.connectTo(testModule); * config.connectTo(testModule);
...@@ -71,7 +69,7 @@ ...@@ -71,7 +69,7 @@
#define CHIMERATK_APPLICATION_CORE_CONFIG_READER_H #define CHIMERATK_APPLICATION_CORE_CONFIG_READER_H
#include <map> #include <map>
#include<unordered_map> #include <unordered_map>
#include <ChimeraTK/SupportedUserTypes.h> #include <ChimeraTK/SupportedUserTypes.h>
...@@ -128,10 +126,9 @@ namespace ChimeraTK { ...@@ -128,10 +126,9 @@ namespace ChimeraTK {
const T& get(const std::string& variableName) const; const T& get(const std::string& variableName) const;
protected: protected:
/** File name */ /** File name */
std::string _fileName; std::string _fileName;
/** List to hold VariableNodes corresponding to xml modules **/ /** List to hold VariableNodes corresponding to xml modules **/
std::unique_ptr<ModuleList> _moduleList; std::unique_ptr<ModuleList> _moduleList;
...@@ -194,7 +191,6 @@ namespace ChimeraTK { ...@@ -194,7 +191,6 @@ namespace ChimeraTK {
template<typename T> template<typename T>
const std::vector<T>& get_impl(const std::string& variableName, std::vector<T>*) const; const std::vector<T>& get_impl(const std::string& variableName, std::vector<T>*) const;
friend struct FunctorFill; friend struct FunctorFill;
friend struct ArrayFunctorFill; friend struct ArrayFunctorFill;
friend struct FunctorSetValues; friend struct FunctorSetValues;
......
...@@ -3,4 +3,5 @@ ...@@ -3,4 +3,5 @@
* Module documentation: * Module documentation:
* - \subpage loggingdoc * - \subpage loggingdoc
* - \subpage historydoc * - \subpage historydoc
* - \subpage configreader
*/ */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment