Merge branch 'master' into agy/NewPV1_For_850

[modules/gui.git] / src / SalomeApp / SalomeApp_Study.cxx

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 0bd5244e30c6ce36d20f903269e12af788cb38c3..b60de1a8a0d93a4a544f82f5cdad2f5b72642599 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -161,6 +161,12 @@ public:
             if (oldFather) {
               oldFather->removeChild(suit_obj, false);
               SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( myStudy->application() );
+//              MESSAGE("myStudy: " << myStudy->id() << " app " << app);
+//              MESSAGE("objectBrowser: "<< app->objectBrowser());
+              if (!app->objectBrowser()) {
+                MESSAGE("Object Browser not found. Problem ??");
+                return;
+              }
               SUIT_AbstractModel* model = dynamic_cast<SUIT_AbstractModel*>(app->objectBrowser()->model());
               model->forgetObject( suit_obj );
                 
@@ -190,22 +196,22 @@ public:
           //aFatherDO->insertChild(suit_obj, pos);
           aFatherDO->updateItem();
 
-         /* Define visibility state */
-         bool isComponent = dynamic_cast<SalomeApp_ModuleObject*>( suit_obj ) != 0;
-         if ( suit_obj && !isComponent && myStudy->visibilityState( theID.c_str() ) == Qtx::UnpresentableState ) {
-           QString moduleTitle = ((CAM_Application*)myStudy->application())->moduleTitle(suit_obj->componentDataType());
-           if (!moduleTitle.isEmpty()) {
-             LightApp_Displayer* aDisplayer = LightApp_Displayer::FindDisplayer(moduleTitle,false);
-             if (aDisplayer) {
-               if(aDisplayer->canBeDisplayed(theID.c_str())) {
-                 myStudy->setVisibilityState( theID.c_str(), Qtx::HiddenState ); //hide the just added object
-                 //MESSAGE("Object with entry : "<< theID <<" CAN be displayed !!!");
-               }
-               else
-                 MESSAGE("Object with entry : "<< theID <<" CAN'T be displayed !!!");
-             }
-           }
-         }
+          /* Define visibility state */
+          bool isComponent = dynamic_cast<SalomeApp_ModuleObject*>( suit_obj ) != 0;
+          if ( suit_obj && !isComponent && myStudy->visibilityState( theID.c_str() ) == Qtx::UnpresentableState ) {
+            QString moduleTitle = ((CAM_Application*)myStudy->application())->moduleTitle(suit_obj->componentDataType());
+            if (!moduleTitle.isEmpty()) {
+              LightApp_Displayer* aDisplayer = LightApp_Displayer::FindDisplayer(moduleTitle,false);
+              if (aDisplayer) {
+                if(aDisplayer->canBeDisplayed(theID.c_str())) {
+                  myStudy->setVisibilityState( theID.c_str(), Qtx::HiddenState ); //hide the just added object
+                  //MESSAGE("Object with entry : "<< theID <<" CAN be displayed !!!");
+                }
+                //else
+                  //MESSAGE("Object with entry : "<< theID <<" CAN'T be displayed !!!");
+              }
+            }
+          }
         } // END: work with tree nodes structure
         else { // BEGIN: work with study structure
           EntryMapIter it = entry2SuitObject.find( theID );
@@ -334,8 +340,8 @@ public:
                 myStudy->setVisibilityState( theID.c_str(), Qtx::HiddenState );
                 //MESSAGE("Object with entry : "<< theID <<" CAN be displayed !!!");
               }
-              else
-                MESSAGE("Object with entry : "<< theID <<" CAN'T be displayed !!!");
+              //else
+                //MESSAGE("Object with entry : "<< theID <<" CAN'T be displayed !!!");
             }
           }
         }
@@ -344,8 +350,8 @@ public:
 #ifndef DISABLE_PYCONSOLE
     case 6: //NoteBook variables were modified
       {
-       myStudy->onNoteBookVarUpdate( QString( theID.c_str() ) );
-       break;
+        myStudy->onNoteBookVarUpdate( QString( theID.c_str() ) );
+        break;
       }
 #endif
     default:MESSAGE("Unknown event: "  << event);break;
@@ -1113,6 +1119,8 @@ bool SalomeApp_Study::openDataModel( const QString& studyName, CAM_DataModel* dm
     // for this module by LightApp_Engine_i::Load()
     bool isMultiFile = false; // TODO: decide, how to access this parameter
     RemoveTemporaryFiles( dm->module()->name().toStdString().c_str(), isMultiFile );
+    std::vector<std::string> listOfFiles   ;
+    SetListOfFiles( dm->module()->name().toStdString().c_str(), listOfFiles );
 
     // Something has been read -> create data model tree
     LightApp_DataModel* aDM = dynamic_cast<LightApp_DataModel*>( dm );