Merge branch 'V8_5_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b19f314b963a6348360a258e9304bb58d45ab955..a48b296a4783ef68455ac7718424443381ae9022 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ ENDIF(WIN32)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

diff --git a/CTestTestfileInstall.cmake b/CTestTestfileInstall.cmake
index f1f002aa5762bd33dc0e918e08366a4def285ad5..6bc1687ee050069fad234325aeed23e389fee20c 100644 (file)
--- a/CTestTestfileInstall.cmake
+++ b/CTestTestfileInstall.cmake
@@ -17,7 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(SALOME_TEST_DRIVER "$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/appliskel/salome_test_driver.py")
+SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
 
 SET(COMPONENT_NAME GEOM)
 SET(TIMEOUT        300)

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 1c6c9f3779b660cc24d8dad26d80aaed133b85be..94972c6d5caf9c067df5b5094d736d9d5317f0fa 100755 (executable)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -69,7 +69,7 @@
     <parameter name="geom_preview"        value="true"  />
     <parameter name="hide_input_object"   value="true"  />
     <parameter name="material"            value="[ Default ]" />
-    <parameter name="predef_materials"    value="true" />
+    <parameter name="predef_materials"    value="false" />
     <parameter name="edge_width"          value="1" />
     <parameter name="isolines_width"      value="1" />
     <parameter name="preview_edge_width"  value="1" />

diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 6925d8d22f242750d14137c811a78aef4846b8ee..64943f7419a994cc91a348ce121e68841c66222a 100755 (executable)
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -839,10 +839,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
   AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect );
   
   // - free boundaries color
-  anAspect = AISShape->Attributes()->FreeBoundaryAspect();
-  anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : 
+  Handle(Prs3d_LineAspect) aFreeBoundaryAspect =
+    new Prs3d_LineAspect (Quantity_NOC_RED, Aspect_TOL_SOLID, 1.0);
+  *aFreeBoundaryAspect->Aspect() = *AISShape->Attributes()->FreeBoundaryAspect()->Aspect();
+  aFreeBoundaryAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : 
                       SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::FreeBndColor ) ).value<QColor>() ) );
-  AISShape->Attributes()->SetFreeBoundaryAspect( anAspect );
+  AISShape->Attributes()->SetFreeBoundaryAspect( aFreeBoundaryAspect );
   
   // - standalone edges color
   anAspect = AISShape->Attributes()->WireAspect();

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 4a21919d867a3187506f99aae2d3a4b76507ac7a..7dd7a7eb3f25a0d966b386070f35fb1b5b88c8eb 100755 (executable)
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -2266,7 +2266,11 @@ void GeometryGUI::contextMenuPopup( const QString& client, QMenu* menu, QString&
   getApp()->selectionMgr()->selectedObjects( lst );
 
   //Add submenu for predefined materials
-  bool isPredefMat = SUIT_Session::session()->resourceMgr()->booleanValue( "Geometry", "predef_materials" );
+  // RNV: '#23552: Unable to use the contextual menu of Object Browser window' issue: 
+  //      Temporary solution: do not show 'Materials' submenu forcibly
+  //bool isPredefMat = SUIT_Session::session()->resourceMgr()->booleanValue( "Geometry", "predef_materials" );
+  bool isPredefMat = false;
+  
   if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() > 0 ) {
     QtxPopupMgr* mgr = popupMgr();
     //get parrent for submenu
@@ -2386,8 +2390,9 @@ void GeometryGUI::createPreferences()
   int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup,
                             LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" );
 
-  addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup,
-                 LightApp_Preferences::Bool, "Geometry", "predef_materials" );
+  // RNV: Temporary hide this preference, because of the '#23552: Unable to use the contextual menu of Object Browser window' issue
+  //addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup,
+  //               LightApp_Preferences::Bool, "Geometry", "predef_materials" );
 
   int material = addPreference( tr( "PREF_MATERIAL" ), genGroup,
                                 LightApp_Preferences::Selector,