OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0031765: Coding Rules - eliminate GCC compiler warnings -Wcatch-value in IVtk

Browse Source 
Catched exceptions are now passed by reference and error message is printed.
Added Standard_FALLTHROUGH to IVtkOCC_ShapePickerAlgo::SetSelectionMode().
This commit is contained in:
kgv 2020-09-14 14:08:26 +03:00 committed by bugmaster
parent f2006a6f19
commit 9df0497931
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/IVtkOCC/IVtkOCC_SelectableObject.cxx
View File

@ -13,9 +13,11 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <IVtkOCC_SelectableObject.hxx>
#include <AIS_Shape.hxx> #include <AIS_Shape.hxx>
#include <BRepBndLib.hxx> #include <BRepBndLib.hxx>
#include <IVtkOCC_SelectableObject.hxx> #include <Message.hxx>
#include <Select3D_SensitiveBox.hxx> #include <Select3D_SensitiveBox.hxx>
#include <SelectMgr_Selection.hxx> #include <SelectMgr_Selection.hxx>
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
@ -130,14 +132,15 @@ void IVtkOCC_SelectableObject::ComputeSelection (const Handle(SelectMgr_Selectio
myOCCTDrawer->DeviationAngle(), myOCCTDrawer->DeviationAngle(),
isAutoTriangulation); isAutoTriangulation);
} }
catch (Standard_Failure) catch (const Standard_Failure& anException)
{ {
Message::SendFail (TCollection_AsciiString("Error: IVtkOCC_SelectableObject::ComputeSelection(") + theMode + ") has failed ("
+ anException.GetMessageString() + ")");
if (theMode == 0) if (theMode == 0)
{ {
Bnd_Box aBndBox = BoundingBox(); Bnd_Box aBndBox = BoundingBox();
Handle(StdSelect_BRepOwner) aOwner = new StdSelect_BRepOwner (anOcctShape, this); Handle(StdSelect_BRepOwner) aOwner = new StdSelect_BRepOwner (anOcctShape, this);
Handle(Select3D_SensitiveBox) aSensitiveBox = Handle(Select3D_SensitiveBox) aSensitiveBox = new Select3D_SensitiveBox (aOwner, aBndBox);
new Select3D_SensitiveBox (aOwner, aBndBox);
theSelection->Add (aSensitiveBox); theSelection->Add (aSensitiveBox);
} }
} }

18
src/IVtkOCC/IVtkOCC_ShapeMesher.cxx
View File

@ -13,6 +13,8 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <IVtkOCC_ShapeMesher.hxx>
#include <Adaptor3d_IsoCurve.hxx> #include <Adaptor3d_IsoCurve.hxx>
#include <Bnd_Box.hxx> #include <Bnd_Box.hxx>
#include <BRep_Tool.hxx> #include <BRep_Tool.hxx>
@ -29,7 +31,7 @@
#include <GeomAdaptor_Curve.hxx> #include <GeomAdaptor_Curve.hxx>
#include <gp_Dir2d.hxx> #include <gp_Dir2d.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <IVtkOCC_ShapeMesher.hxx> #include <Message.hxx>
#include <NCollection_Array1.hxx> #include <NCollection_Array1.hxx>
#include <Poly_Polygon3D.hxx> #include <Poly_Polygon3D.hxx>
#include <Poly_PolygonOnTriangulation.hxx> #include <Poly_PolygonOnTriangulation.hxx>
@ -136,8 +138,11 @@ void IVtkOCC_ShapeMesher::meshShape()
anAlgo->Perform(); anAlgo->Perform();
} }
} }
catch (Standard_Failure) catch (const Standard_Failure& anException)
{ } {
Message::SendFail (TCollection_AsciiString("Error: IVtkOCC_ShapeMesher::meshShape() triangulation builder has failed (")
+ anException.GetMessageString() + ")");
}
} }
//================================================================ //================================================================
@ -230,8 +235,11 @@ void IVtkOCC_ShapeMesher::addWireFrameFaces()
addWFFace (anOcctFace, addWFFace (anOcctFace,
GetShapeObj()->GetSubShapeId (anOcctFace)); GetShapeObj()->GetSubShapeId (anOcctFace));
} }
catch (Standard_Failure) catch (const Standard_Failure& anException)
{ } {
Message::SendFail (TCollection_AsciiString("Error: addWireFrameFaces() wireframe presentation builder has failed (")
+ anException.GetMessageString() + ")");
}
} }
} }

14
src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx
View File

@ -128,24 +128,26 @@ void IVtkOCC_ShapePickerAlgo::SetSelectionMode (const IVtk_IShape::Handle& theSh
// Update the selection for the given mode according to its status. // Update the selection for the given mode according to its status.
const Handle(SelectMgr_Selection)& aSel = aSelObj->Selection (theMode); const Handle(SelectMgr_Selection)& aSel = aSelObj->Selection (theMode);
switch (aSel->UpdateStatus()) switch (aSel->UpdateStatus())
{ {
case SelectMgr_TOU_Full: case SelectMgr_TOU_Full:
{
// Recompute the sensitive primitives which correspond to the mode. // Recompute the sensitive primitives which correspond to the mode.
myViewerSelector->RemoveSelectionOfObject (aSelObj, aSelObj->Selection (theMode)); myViewerSelector->RemoveSelectionOfObject (aSelObj, aSelObj->Selection (theMode));
aSelObj->RecomputePrimitives (theMode); aSelObj->RecomputePrimitives (theMode);
myViewerSelector->AddSelectionToObject (aSelObj, aSelObj->Selection (theMode)); myViewerSelector->AddSelectionToObject (aSelObj, aSelObj->Selection (theMode));
myViewerSelector->RebuildObjectsTree(); myViewerSelector->RebuildObjectsTree();
myViewerSelector->RebuildSensitivesTree (aSelObj); myViewerSelector->RebuildSensitivesTree (aSelObj);
}
Standard_FALLTHROUGH
case SelectMgr_TOU_Partial: case SelectMgr_TOU_Partial:
{
if (aSelObj->HasTransformation())
{ {
if (aSelObj->HasTransformation()) myViewerSelector->RebuildObjectsTree();
{
myViewerSelector->RebuildObjectsTree();
}
break;
} }
break;
}
default: default:
break; break;
} }