fix conflict between stadard mode and salome_on_demand mode

[modules/gui.git] / src / SalomeApprc_utils / SalomeApprc_utils.cxx

diff --git a/src/SalomeApprc_utils/SalomeApprc_utils.cxx b/src/SalomeApprc_utils/SalomeApprc_utils.cxx
index 17a8ed214627ba7a5feb73649fa1684e990938e7..21b57a2eaf83183f50a2c491aa240b918b3edbcb 100644 (file)
--- a/src/SalomeApprc_utils/SalomeApprc_utils.cxx
+++ b/src/SalomeApprc_utils/SalomeApprc_utils.cxx
@@ -1,7 +1,11 @@
 #include "SalomeApprc_utils.h"
 
-void AddComponents_from_salomeappdir(const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
+void UpdateCompInfo_with_salomeappdir(const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
 {
+       // Remove module list and  module_root_dirs list
+       ResMgr->remove("launch", "user_modules");
+       ResMgr->remove("user_modules");
+
        QFileInfoList salomexd_list = salomeappdir.entryInfoList(QStringList() << "*.salomexd",QDir::Files);
        foreach(QFileInfo filename, salomexd_list)
     {
@@ -46,8 +50,12 @@ void AddComponents_from_salomeappdir(const QDir& salomeappdir, SUIT_ResourceMgr*
     }
 }
 
-void AddComponents_from_salomemodules(const QString& salomemodules, const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
+void UpdateCompInfo_with_salomemodules(const QString& salomemodules, const QDir& salomeappdir, SUIT_ResourceMgr* ResMgr)
 {
+       // Remove module list and  module_root_dirs list
+       ResMgr->remove("launch", "user_modules");
+       ResMgr->remove("user_modules");
+
        QRegularExpression sep(":|,");
        QStringList components_list = salomemodules.split(sep,QString::SkipEmptyParts);
        foreach (QString comp, components_list)
@@ -61,11 +69,10 @@ void AddComponents_from_salomemodules(const QString& salomemodules, const QDir&
                AddGuiComponent(comp, comp_root_dir, ResMgr);
        }
 
-
 }
 void AddGuiComponent(const QString& comp, const QString& CompRoot, SUIT_ResourceMgr* ResMgr)
 {
-       QStringList CompsResMgr;
+       QStringList CompsResMgr = ResMgr->stringValue("launch", "user_modules").split(";", QString::SkipEmptyParts);
        ResMgr->setValue( "user_modules", comp, CompRoot );
 
        CompsResMgr << comp;