Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ada1900
)
23236: EDF 12346 - Problem with Local Size
author
eap
<eap@opencascade.com>
Fri, 12 Feb 2016 16:16:28 +0000
(19:16 +0300)
committer
vsr
<vsr@opencascade.com>
Fri, 19 Feb 2016 14:27:12 +0000
(17:27 +0300)
src/PluginUtils/GeomSelectionTools.cxx
patch
|
blob
|
history
diff --git
a/src/PluginUtils/GeomSelectionTools.cxx
b/src/PluginUtils/GeomSelectionTools.cxx
index 03151a6405b4420d3df7b491b9ff234e8acb4b48..9faf99ec3efda40548f27b713f64d4b3f6553a32 100644
(file)
--- a/
src/PluginUtils/GeomSelectionTools.cxx
+++ b/
src/PluginUtils/GeomSelectionTools.cxx
@@
-28,17
+28,15
@@
#include <SalomeApp_Application.h>
#include <SUIT_Session.h>
#include <SalomeApp_Application.h>
#include <SUIT_Session.h>
-#include <SALOME_ListIO.hxx>
-#include <GEOM_Client.hxx>
-#include <SMESHGUI_Utils.h>
-#include <boost/shared_ptr.hpp>
#include <GEOMImpl_Types.hxx>
#include <GEOMImpl_Types.hxx>
+#include <GEOM_Client.hxx>
#include <GEOM_wrap.hxx>
#include <GEOM_wrap.hxx>
+#include <SALOME_ListIO.hxx>
+#include <SMESHGUI_Utils.h>
-#include <TopoDS.hxx>
-#include <BRep_Tool.hxx>
-#include <Handle_Geom_Surface.hxx>
#include <BRepAdaptor_Surface.hxx>
#include <BRepAdaptor_Surface.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Iterator.hxx>
#include "utilities.h"
#include "utilities.h"
@@
-237,6
+235,12
@@
TopAbs_ShapeEnum GeomSelectionTools::entryToShapeType(std::string entry){
// MESSAGE("GEOM client is OK and GEOM engine is not null");
S = aClient->GetShape( _geomEngine, aShape );
ShapeType=S.ShapeType();
// MESSAGE("GEOM client is OK and GEOM engine is not null");
S = aClient->GetShape( _geomEngine, aShape );
ShapeType=S.ShapeType();
+ if ( ShapeType == TopAbs_COMPOUND )
+ {
+ TopoDS_Iterator it( S );
+ if ( it.More() )
+ ShapeType = it.Value().ShapeType();
+ }
}
}
}
}
}
}
@@
-275,7
+279,6
@@
GeomAbs_SurfaceType GeomSelectionTools::getFaceInformation(TopoDS_Shape S)
GeomAbs_SurfaceType surf_type=GeomAbs_OtherSurface ;
if (!S.IsNull() && S.ShapeType()==TopAbs_FACE){
TopoDS_Face f=TopoDS::Face(S);
GeomAbs_SurfaceType surf_type=GeomAbs_OtherSurface ;
if (!S.IsNull() && S.ShapeType()==TopAbs_FACE){
TopoDS_Face f=TopoDS::Face(S);
- Handle(Geom_Surface) surf = BRep_Tool::Surface(f);
BRepAdaptor_Surface surf_adap(f);
/* Global Information */
BRepAdaptor_Surface surf_adap(f);
/* Global Information */