Adjust to HEAD modifications

diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index f787a02d9e198b5eef3f555becfd2de83b030320..b568b22d06131eb90b94608deee7cfc8a4f8b81f 100644 (file)
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -70,6 +70,8 @@ LIB_SRC =     VisuGUI.cxx \
                VisuGUI_CutPlanesDlg.cxx \
                VisuGUI_StreamLinesDlg.cxx \
                VisuGUI_VectorsDlg.cxx \
+               VisuGUI_Displayer.cxx \
+               VisuGUI_SetupPlot2dDlg.cxx \
                VisuGUI_BuildProgressDlg.cxx \
                VisuGUI_Timer.cxx
 
@@ -93,6 +95,7 @@ LIB_MOC =     VisuGUI.h \
                VisuGUI_CutPlanesDlg.h \
                VisuGUI_StreamLinesDlg.h \
                VisuGUI_VectorsDlg.h \
+               VisuGUI_SetupPlot2dDlg.h \
                VisuGUI_BuildProgressDlg.h
 
 LIB_CLIENT_IDL = SALOME_Exception.idl \

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 0282d6ba569b9ad7ae003eb585ead66567dd1b73..36bf2d61cb2191154558d16a4630584b5b753b74 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -166,7 +166,8 @@ VisuGUI::
 OnImportFromFile()
 {
   if(MYDEBUG) MESSAGE("VisuGUI::OnImportFromFile()");
-  CheckLock(GetCStudy(GetAppStudy(this)));
+  if ( CheckLock(GetCStudy(GetAppStudy(this))) )
+    return;
 
   VisuGUI_BuildProgressDlg* aBuildProgressDlg = new VisuGUI_BuildProgressDlg( GetDesktop(this) );
   aBuildProgressDlg->setGenerator( GetVisuGen(this) );
@@ -583,11 +584,11 @@ OnDisplayPrs()
       if(aPrsObject){
         if(MYDEBUG) MESSAGE("VisuGUI::OnDisplayPrs : Prs3d object");
         //UpdateViewer( this, aPrsObject );
-       displayer()->Display( anIO->getEntry() );
-
        SVTK_ViewWindow* vw = GetViewWindow( this, /*create=*/true );
-        if ( vw ) {
-          vw->highlight(anIO, 1);
+        if ( vw )
+       {
+         displayer()->Display( anIO->getEntry() );
+         vw->highlight(anIO, 1);
         }
         continue;
       }
@@ -2424,13 +2425,13 @@ createPopupMenus()
   QString aPrsVisible   = "(($type in {'VISU::TMESH' " + aPrsAll + "}) and isVisible)";
   QString aPrsInvisible = "(($type in {'VISU::TMESH' " + aPrsAll + "})" + andInvisible + ")";
 
-  QString anEraseRule = "selcount>0 and (" + aPrsVisible +
+  QString anEraseRule = "selcount>0 and ({true} in $canBeDisplayed) and (" + aPrsVisible +
     " or (client='ObjectBrowser' and (" + aTableOrCont + orCurveVisible + ")))";
 
-  QString aDisplayRule = "selcount>0 and (" + aPrsInvisible +
+  QString aDisplayRule = "selcount>0 and ({true} in $canBeDisplayed) and (" + aPrsInvisible +
     " or (client='ObjectBrowser' and (" + aTableOrCont + orCurveInvisible + ")))";
 
-  QString aDOnlyRule = "selcount>0 and (($type in {'VISU::TMESH' " + aPrsAll + "})"
+  QString aDOnlyRule = "selcount>0 and ({true} in $canBeDisplayed) and (($type in {'VISU::TMESH' " + aPrsAll + "})"
     " or (client='ObjectBrowser' and ((type='VISU::TTABLE' and nbChildren>0) or"
     " ($type in {'VISU::TCURVE' 'VISU::TCONTAINER'}))))";
 
@@ -2899,9 +2900,7 @@ void VisuGUI::createPreferences()
   setPreferenceProperty( nbsteps,  "max",  200  );
 
   int importGr = addPreference( tr( "MED files import" ), srangeTab );
-  setPreferenceProperty( importGr, "columns", 1 );
   addPreference( tr( "Full MED loading" ), importGr, LightApp_Preferences::Bool, "VISU", "full_med_loading" );
-  addPreference( tr( "Close progress dialog at finish" ), importGr, LightApp_Preferences::Bool, "VISU", "close_at_finish" );
 }
 
 void VisuGUI::preferencesChanged( const QString&, const QString& )

diff --git a/src/VISUGUI/VisuGUI_Displayer.cxx b/src/VISUGUI/VisuGUI_Displayer.cxx
index bcfffa772294744ddb3810aca7e4ef7ed5c8c996..fbd29789d8b285b25568e019a1032586ea9dd8ec 100644 (file)
--- a/src/VISUGUI/VisuGUI_Displayer.cxx
+++ b/src/VISUGUI/VisuGUI_Displayer.cxx
@@ -116,11 +116,9 @@ void VisuGUI_Displayer::buildPrs3d( SVTK_ViewWindow* wnd, VISU::Prs3d_i* thePrs
   VISU_Actor* newAct = VISU::FindActor( wnd, thePrs );
   if( !newAct )
   {
-    VISU_Actor* a = thePrs->CreateActor();
-    if( a )
-      newAct = a->GetParent();
+    newAct = thePrs->CreateActor();
   }
-  if( newAct && newAct )
+  if( newAct )
   {
     wnd->AddActor( newAct );
     wnd->Repaint();