Skip to content

add m_configfile to Tool #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brichards64 merged 6 commits into from
Jul 30, 2025
Merged

add m_configfile to Tool #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48e47dc
add m_configfile to Tool
marc1uk Mar 1, 2025
986d872
Update MyTool.cpp
marc1uk Mar 1, 2025
53cf58c
Update MyToolDynamicMultiThread.cpp
marc1uk Mar 1, 2025
96ec479
Update MyToolMultiThread.cpp
marc1uk Mar 1, 2025
6adc380
Update MyToolThread.cpp
marc1uk Mar 1, 2025
bba1866
Merge branch 'main' into patch-4
brichards64 Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions UserTools/template/MyTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ MyTool::MyTool():Tool(){}
bool MyTool::Initialise(std::string configfile, DataModel &data){

InitialiseTool(data);
m_configfile = configfile;
InitialiseConfiguration(configfile);
//m_variables.Print();

Expand Down
1 change: 1 addition & 0 deletions UserTools/template/MyToolDynamicMultiThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ MyToolDynamicMultiThread::MyToolDynamicMultiThread():Tool(){}
bool MyToolDynamicMultiThread::Initialise(std::string configfile, DataModel &data){

InitialiseTool(data);
m_configfile = configfile;
InitialiseConfiguration(configfile);
//m_variables.Print();

Expand Down
3 changes: 2 additions & 1 deletion UserTools/template/MyToolMultiThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ MyToolMultiThread::MyToolMultiThread():Tool(){}

bool MyToolMultiThread::Initialise(std::string configfile, DataModel &data){

InitialiseTool(data);
InitialiseTool(data);
m_configfile = configfile;
InitialiseConfiguration(configfile);
//m_variables.Print();

Expand Down
1 change: 1 addition & 0 deletions UserTools/template/MyToolThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ MyToolThread::MyToolThread():Tool(){}
bool MyToolThread::Initialise(std::string configfile, DataModel &data){

InitialiseTool(data);
m_configfile = configfile;
InitialiseConfiguration(configfile);
//m_variables.Print();

Expand Down
4 changes: 2 additions & 2 deletions src/Tool/Tool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ namespace ToolFramework{
DataModel* m_data; ///< Pointer to transiant DataModel class
Logging* m_log; ///< Pointer to logging class
int m_verbose; ///< verbosity variable for direct logging level
std::string m_configfile; ///< path to configuration file
MsgL ML(int messagelevel) {return MsgL(messagelevel,m_verbose);} ///< Function for setting logging level instream @param messagelevel the verboisty level at which to show the message. Checked against internal verbosity level.
void MLC() {*(m_log)<<MsgL(0,m_verbose);} ///< Function for clearing logging level
template <typename T> void Log(T message, int messagelevel, int verbosity){m_log->Log("-"+m_tool_name+"-: "+message,messagelevel,verbosity);}
Expand All @@ -58,9 +59,8 @@ namespace ToolFramework{
m_variables>>vars_json;
reinterpret_cast<DataModelBase*>(m_data)->vars.Set(m_tool_name,vars_json);
}

private:

};

}
Expand Down