From 65e19de6111473d5c3c20ab8914391a76fcf6205 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 20 Apr 2018 09:27:36 +0300 Subject: [PATCH 1/6] Increment version: 8.5.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b19f314b9..432822605 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,11 @@ 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}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Common CMake macros # =================== From 0ab4dbdbf06ff04803d5af9e530dbf2a04901268 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 8 May 2018 14:32:49 +0300 Subject: [PATCH 2/6] 0023558: [CEA 2242] : Bad display of shared edges in wireframe mode --- src/GEOMGUI/GEOM_Displayer.cxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 6925d8d22..64943f741 100755 --- 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() ) ); - AISShape->Attributes()->SetFreeBoundaryAspect( anAspect ); + AISShape->Attributes()->SetFreeBoundaryAspect( aFreeBoundaryAspect ); // - standalone edges color anAspect = AISShape->Attributes()->WireAspect(); From 6393b7515a8a9ef7424766819491e975491a372e Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 27 Apr 2018 12:33:56 +0300 Subject: [PATCH 3/6] 0023551: [EDF] Help menu : option to set links - Move Geometry's User Guide and Developer Guide to the lower level, in order to be aligned with GEOM plug-ins --- resources/SalomeApp.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 570750174..1c6c9f377 100755 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -30,8 +30,8 @@
- - + +
From 2e791424001c734f62d1209824d7cd82d85f892e Mon Sep 17 00:00:00 2001 From: rnv Date: Sat, 28 Apr 2018 12:10:19 +0300 Subject: [PATCH 4/6] Fix for '23553: Replace ABSOLUTE_APPLI_PATH by KERNEL_ROOT_DIR in GEOM and SMESH cmakefiles' issue. --- CTestTestfileInstall.cmake | 2 +- src/XAO/tests/CTestTestfileInstall.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CTestTestfileInstall.cmake b/CTestTestfileInstall.cmake index f1f002aa5..6bc1687ee 100644 --- 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/src/XAO/tests/CTestTestfileInstall.cmake b/src/XAO/tests/CTestTestfileInstall.cmake index 443de4580..92184882c 100644 --- a/src/XAO/tests/CTestTestfileInstall.cmake +++ b/src/XAO/tests/CTestTestfileInstall.cmake @@ -20,4 +20,4 @@ ADD_TEST(GEOM_TestXAO python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestXAO) SET_TESTS_PROPERTIES(GEOM_TestXAO PROPERTIES LABELS "${COMPONENT_NAME}" - ENVIRONMENT "XAO_DATA_DIR=$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/test/GEOM/xao/data") + ENVIRONMENT "XAO_DATA_DIR=$ENV{GEOM_ROOT_DIR}/bin/salome/test/xao/data") From a3a641c09a72b8a3f480aa6e688acf05618e674f Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 14 May 2018 19:37:07 +0300 Subject: [PATCH 5/6] Revert (partially) previous commit - the solution for ABSOLUTE_APPLI_PATH is to be looked for later --- src/XAO/tests/CTestTestfileInstall.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/XAO/tests/CTestTestfileInstall.cmake b/src/XAO/tests/CTestTestfileInstall.cmake index 92184882c..443de4580 100644 --- a/src/XAO/tests/CTestTestfileInstall.cmake +++ b/src/XAO/tests/CTestTestfileInstall.cmake @@ -20,4 +20,4 @@ ADD_TEST(GEOM_TestXAO python ${SALOME_TEST_DRIVER} ${TIMEOUT} TestXAO) SET_TESTS_PROPERTIES(GEOM_TestXAO PROPERTIES LABELS "${COMPONENT_NAME}" - ENVIRONMENT "XAO_DATA_DIR=$ENV{GEOM_ROOT_DIR}/bin/salome/test/xao/data") + ENVIRONMENT "XAO_DATA_DIR=$ENV{ABSOLUTE_APPLI_PATH}/bin/salome/test/GEOM/xao/data") From 1be0dcd9a7556a9a0c6a1a81bdcf3c5bfbd3c202 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 29 May 2018 16:00:15 +0300 Subject: [PATCH 6/6] Temporary fix for '23552: Unable to use the contextual menu of Object Browser window' issue. --- resources/SalomeApp.xml.in | 2 +- src/GEOMGUI/GeometryGUI.cxx | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 1c6c9f377..94972c6d5 100755 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -69,7 +69,7 @@ - + diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 4a21919d8..7dd7a7eb3 100755 --- 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,