diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 759b72bf7..67847f3fb 100755 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -29,6 +29,7 @@ # include # include # include +# include #endif #include @@ -60,6 +61,8 @@ #include #include +# include + //to simplify parsing input files we use the boost lib #include @@ -393,6 +396,19 @@ std::set FemMesh::getSurfaceNodes(long ElemId,short FaceId, float Angle) c return result; } +std::set FemMesh::getSurfaceNodes(const TopoDS_Face &face)const +{ + + std::set result; + const SMESHDS_Mesh* data = myMesh->GetMeshDS(); + + BRepAlgo_NormalProjection algo; + + + return result; +} + + void FemMesh::readNastran(const std::string &Filename) { diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h index 274104b3f..7db0d1e1c 100755 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -35,6 +35,7 @@ class SMESH_Gen; class SMESH_Mesh; class SMESH_Hypothesis; class TopoDS_Shape; +class TopoDS_Face; namespace Fem { @@ -81,7 +82,10 @@ public: /** @name search and retraivel */ //@{ + /// retriving by region growing std::set getSurfaceNodes(long ElemId,short FaceId, float Angle=360)const; + /// retrivinb by face + std::set getSurfaceNodes(const TopoDS_Face &face)const; //@} /** @name Placement control */ diff --git a/src/Mod/Machining_Distortion/DefineMisalignment.ui b/src/Mod/Machining_Distortion/DefineMisalignment.ui new file mode 100644 index 000000000..17d0121c2 --- /dev/null +++ b/src/Mod/Machining_Distortion/DefineMisalignment.ui @@ -0,0 +1,317 @@ + + + Form + + + + 0 + 0 + 278 + 144 + + + + Form + + + + + + + + From + + + Qt::AlignCenter + + + + + + + To + + + Qt::AlignCenter + + + + + + + Intervall + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + 1 + + + + + + + Angle X-Axis + + + Qt::AlignCenter + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + 1 + + + + + + + Angle Y-Axis + + + Qt::AlignCenter + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + 1 + + + + + + + Angle Z-Axis + + + Qt::AlignCenter + + + + + + + + 60 + 20 + + + + Qt::LeftToRight + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 20 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + + + + + + 60 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + -99 + + + 1 + + + + + + + Z-Level + + + Qt::AlignCenter + + + + + + + + + + + + diff --git a/src/Mod/Machining_Distortion/postprocess.ui b/src/Mod/Machining_Distortion/postprocess.ui index fdd46ed19..be630321e 100755 --- a/src/Mod/Machining_Distortion/postprocess.ui +++ b/src/Mod/Machining_Distortion/postprocess.ui @@ -7,7 +7,7 @@ 0 0 425 - 240 + 167