ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V8_5_BR'

Browse Source
This commit is contained in:
vsr 2018-05-31 17:07:12 +03:00
commit 017ac3494a
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -33,7 +33,7 @@ ENDIF(WIN32)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8) 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}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})

2
CTestTestfileInstall.cmake
View File

@ -17,7 +17,7 @@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # 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(COMPONENT_NAME GEOM)
SET(TIMEOUT 300) SET(TIMEOUT 300)

2
resources/SalomeApp.xml.in
View File

@ -69,7 +69,7 @@
<parameter name="geom_preview" value="true" /> <parameter name="geom_preview" value="true" />
<parameter name="hide_input_object" value="true" /> <parameter name="hide_input_object" value="true" />
<parameter name="material" value="[ Default ]" /> <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="edge_width" value="1" />
<parameter name="isolines_width" value="1" /> <parameter name="isolines_width" value="1" />
<parameter name="preview_edge_width" value="1" /> <parameter name="preview_edge_width" value="1" />

8
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -839,10 +839,12 @@ void GEOM_Displayer::updateShapeProperties( const Handle(GEOM_AISShape)& AISShap
AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect ); AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect );
// - free boundaries color // - free boundaries color
anAspect = AISShape->Attributes()->FreeBoundaryAspect(); Handle(Prs3d_LineAspect) aFreeBoundaryAspect =
anAspect->SetColor( HasColor() ? (Quantity_NameOfColor)GetColor() : 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>() ) ); SalomeApp_Tools::color( propMap.value( GEOM::propertyName( GEOM::FreeBndColor ) ).value<QColor>() ) );
AISShape->Attributes()->SetFreeBoundaryAspect( anAspect ); AISShape->Attributes()->SetFreeBoundaryAspect( aFreeBoundaryAspect );
// - standalone edges color // - standalone edges color
anAspect = AISShape->Attributes()->WireAspect(); anAspect = AISShape->Attributes()->WireAspect();

11
src/GEOMGUI/GeometryGUI.cxx
View File

@ -2266,7 +2266,11 @@ void GeometryGUI::contextMenuPopup( const QString& client, QMenu* menu, QString&
getApp()->selectionMgr()->selectedObjects( lst ); getApp()->selectionMgr()->selectedObjects( lst );
//Add submenu for predefined materials //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 ) { if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() > 0 ) {
QtxPopupMgr* mgr = popupMgr(); QtxPopupMgr* mgr = popupMgr();
//get parrent for submenu //get parrent for submenu
@ -2386,8 +2390,9 @@ void GeometryGUI::createPreferences()
int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup, int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup,
LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" ); LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" );
addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup, // RNV: Temporary hide this preference, because of the '#23552: Unable to use the contextual menu of Object Browser window' issue
LightApp_Preferences::Bool, "Geometry", "predef_materials" ); //addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup,
// LightApp_Preferences::Bool, "Geometry", "predef_materials" );
int material = addPreference( tr( "PREF_MATERIAL" ), genGroup, int material = addPreference( tr( "PREF_MATERIAL" ), genGroup,
LightApp_Preferences::Selector, LightApp_Preferences::Selector,