ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-02-03 18:30:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of salome:modules/geom

Browse Source
This commit is contained in:
vsr 2014-04-17 16:25:47 +04:00
commit b1571aacef
4 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/GEOMGUI/GEOMGUI_Selection.cxx
View File

@ -85,18 +85,30 @@
else \
str = QString(); }
#define VTK_DISPLAY_MODE_TO_STRING( str, dm ) { \
if ( dm == 0 ) \
str = QString( "Wireframe" ); \
else if ( dm == 1 ) \
str = QString( "Shading" ); \
else if ( dm == 3 ) \
str = QString( "ShadingWithEdges" ); \
else \
str = QString(); }
#define USE_VISUAL_PROP_MAP
#ifdef USE_VISUAL_PROP_MAP
#define VTK_DISPLAY_MODE_TO_STRING( str, dm ) { \
if ( dm == 0 ) \
str = QString( "Wireframe" ); \
else if ( dm == 1 ) \
str = QString( "Shading" ); \
else if ( dm == 2 ) \
str = QString( "ShadingWithEdges" ); \
else \
str = QString(); }
#else
#define VTK_DISPLAY_MODE_TO_STRING( str, dm ) { \
if ( dm == 0 ) \
str = QString( "Wireframe" ); \
else if ( dm == 1 ) \
str = QString( "Shading" ); \
else if ( dm == 3 ) \
str = QString( "ShadingWithEdges" ); \
else \
str = QString(); }
#endif
GEOMGUI_Selection::GEOMGUI_Selection()
: LightApp_Selection()
{

2
src/GEOMGUI/GEOM_Displayer.cxx
View File

@ -1089,7 +1089,7 @@ void GEOM_Displayer::updateActorProperties( GEOM_Actor* actor, bool create )
}
// - standalone edge color
c = propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>();
c = propMap.value( GEOM::propertyName( GEOM::LineColor ) ).value<QColor>();
actor->SetIsolatedEdgeColor( c.redF(), c.greenF(), c.blueF() );
c = propMap.value( GEOM::propertyName( GEOM::WireframeColor ) ).value<QColor>();

9
src/OBJECT/GEOM_Actor.cxx
View File

@ -309,9 +309,9 @@ setDisplayMode(int theMode)
if ( theMode == (int)eShadingWithEdges ) {
// Coloring edges
myIsolatedEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0],
myEdgesInShadingColor[1],
myEdgesInShadingColor[2]);
myIsolatedEdgeActor->GetProperty()->SetColor(myIsolatedEdgeColor[0],
myIsolatedEdgeColor[1],
myIsolatedEdgeColor[2]);
myOneFaceEdgeActor->GetProperty()->SetColor(myEdgesInShadingColor[0],
myEdgesInShadingColor[1],
myEdgesInShadingColor[2]);
@ -757,8 +757,7 @@ void GEOM_Actor::SetPointColor(double r, double g, double b)
void GEOM_Actor::SetIsolatedEdgeColor(double r, double g, double b)
{
myIsolatedEdgeColor[0] = r; myIsolatedEdgeColor[1] = g; myIsolatedEdgeColor[2] = b;
if ( myDisplayMode != (int)eShadingWithEdges )
myIsolatedEdgeActor->GetProperty()->SetColor(r, g, b);
myIsolatedEdgeActor->GetProperty()->SetColor(r, g, b);
}
/*!

2
src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
View File

@ -218,7 +218,7 @@ void RepairGUI_FreeBoundDlg::SelectionIntoArgument()
myObj = anObj;
myEditCurrentArgument->setText(GEOMBase::GetName(myObj));
displayPreview(true, false, true, true, 3);
displayPreview(true, false, true, true, 3, 0);
}
//=================================================================================