Skip to content
Snippets Groups Projects
Commit 3ecb5404 authored by Nick Draper's avatar Nick Draper
Browse files

re #10489 added python support

parent 7fb3d6ff
No related branches found
No related tags found
No related merge requests found
...@@ -206,9 +206,6 @@ public: ...@@ -206,9 +206,6 @@ public:
auto directories = ConfigService::Instance().getInstrumentDirectories(); auto directories = ConfigService::Instance().getInstrumentDirectories();
TS_ASSERT_LESS_THAN(1,directories.size()); TS_ASSERT_LESS_THAN(1,directories.size());
//the first entry should be the AppDataDir + instrument //the first entry should be the AppDataDir + instrument
std::cout<<std::endl<<directories[0]<<std::endl;
std::cout<<std::endl<<ConfigService::Instance().getAppDataDir()<<std::endl;
std::cout<<std::endl<<directories[0].find("instruxxment")<<std::endl;
TSM_ASSERT_LESS_THAN("Could not find the appData directory in getInstrumentDirectories()[0]",directories[0].find(ConfigService::Instance().getAppDataDir()),directories[0].size()); TSM_ASSERT_LESS_THAN("Could not find the appData directory in getInstrumentDirectories()[0]",directories[0].find(ConfigService::Instance().getAppDataDir()),directories[0].size());
TSM_ASSERT_LESS_THAN("Could not find the 'instrument' directory in getInstrumentDirectories()[0]",directories[0].find("instrument"),directories[0].size()); TSM_ASSERT_LESS_THAN("Could not find the 'instrument' directory in getInstrumentDirectories()[0]",directories[0].find("instrument"),directories[0].size());
......
...@@ -53,6 +53,9 @@ void export_ConfigService() ...@@ -53,6 +53,9 @@ void export_ConfigService()
.def("getInstrumentDirectory", &ConfigServiceImpl::getInstrumentDirectory, .def("getInstrumentDirectory", &ConfigServiceImpl::getInstrumentDirectory,
"Returns the directory used for the instrument definitions") "Returns the directory used for the instrument definitions")
.def("getInstrumentDirectories", &ConfigServiceImpl::getInstrumentDirectories, return_value_policy<reference_existing_object>(),
"Returns the list of directories searched for the instrument definitions")
.def("getFacilityNames", &ConfigServiceImpl::getFacilityNames, "Returns the default facility") .def("getFacilityNames", &ConfigServiceImpl::getFacilityNames, "Returns the default facility")
.def("getFacilities", &ConfigServiceImpl::getFacilities, "Returns the default facility") .def("getFacilities", &ConfigServiceImpl::getFacilities, "Returns the default facility")
......
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