]> SALOME platform Git repositories - modules/smesh.git/commitdiff
Salome HOME
GPUSPHGUI: fix errors relating to eCustomControl
authoreap <eap@opencascade.com>
Fri, 2 Mar 2018 19:08:10 +0000 (22:08 +0300)
committereap <eap@opencascade.com>
Fri, 2 Mar 2018 19:08:10 +0000 (22:08 +0300)
src/SMESHGUI/SMESHGUI.cxx
src/SMESHGUI/SMESHGUI_Selection.cxx

index cefb6fc1482c73b67d587e33fa932f40afe55e08..9e2ad2b31847fc6399112dd0084dc00f98601607 100644 (file)
@@ -1670,7 +1670,9 @@ namespace
     ActionControl.Bind( SMESHOp::OpOverConstrainedVolume, SMESH_Actor::eOverConstrainedVolume );
     ActionControl.Bind( SMESHOp::OpEqualVolume,           SMESH_Actor::eCoincidentElems3D );
 
-    return theReversed ? ActionControl.Find2( theID ) : ActionControl.Find1( theID );
+    if ( theReversed )
+      return ActionControl.IsBound2( theID ) ? ActionControl.Find2( theID ) : 0;
+    return   ActionControl.IsBound1( theID ) ? ActionControl.Find1( theID ) : 0;
   }
 
   void Control( int theCommandID )
index ce969aea5f2f1f177894fee4b671f642d2adad7f..7a39a5e2f405f32ff3fa7b253ade2b556ec3423d 100644 (file)
@@ -362,6 +362,7 @@ QString SMESHGUI_Selection::controlMode( int ind ) const
     case SMESH_Actor::eCoincidentElems1D:     mode = "eCoincidentElems1D";     break;
     case SMESH_Actor::eCoincidentElems2D:     mode = "eCoincidentElems2D";     break;
     case SMESH_Actor::eCoincidentElems3D:     mode = "eCoincidentElems3D";     break;
+    case SMESH_Actor::eCustomControl:         mode = "eCustomControl";         break;
     default:break;
     }
   }