eap [Thu, 3 Mar 2011 16:34:29 +0000 (16:34 +0000)]
0021196: [CEA 456] Integration and merge modification for debian packages
roll back kernel-install-without-docs.patch
eap [Wed, 2 Mar 2011 15:16:29 +0000 (15:16 +0000)]
fix "Replacing smeshDC by smesh"
make temporary smesh.py in the current dir to avoid overwriting
smesh.py when building in SMESH_SRC
eap [Wed, 2 Mar 2011 15:16:11 +0000 (15:16 +0000)]
fix "Replacing smeshDC by smesh"
1) make global functions of class smeshDC only, class Mesh and others remain untouched
2) make temporary smesh.py in the current dir to avoid overwriting
smesh.py when building in SMESH_SRC
eap [Wed, 2 Mar 2011 09:38:28 +0000 (09:38 +0000)]
0021196: [CEA 456] Integration and merge modification for debian packages
smesh-install-python.patch
This patch helps to install Python packages in the dedicated Python path
eap [Wed, 2 Mar 2011 09:37:30 +0000 (09:37 +0000)]
0021196: [CEA 456] Integration and merge modification for debian packages
smesh-fix-clean.patch
This patch is for cleaning completely the build directory
eap [Wed, 2 Mar 2011 09:36:44 +0000 (09:36 +0000)]
0021196: [CEA 456] Integration and merge modification for debian packages
smesh-fix-clean.patch
This patch is for cleaning completely the build directory
smesh-install-without-docs.patch
We think that building and installing the documentation should not
be the default behavior but reserved to interested users
vsr [Fri, 10 Dec 2010 13:15:53 +0000 (13:15 +0000)]
Merge from PHASE_25_BR 09/12/2010
eap [Tue, 30 Nov 2010 17:43:56 +0000 (17:43 +0000)]
0020749: EDF 1291 SMESH : Create 2D Mesh from 3D improvement
wrap MakeBoundaryMesh()
eap [Tue, 30 Nov 2010 17:43:19 +0000 (17:43 +0000)]
0020749: EDF 1291 SMESH : Create 2D Mesh from 3D improvement
fix type of created group and python dump
vsr [Mon, 29 Nov 2010 13:42:44 +0000 (13:42 +0000)]
0020742: EDF 1270 SMESH : Delete Group with contents and remove Orphan Nodes
Additional change: move "Remove Groups" menu item to the Modification/Remove submenu
eap [Mon, 29 Nov 2010 12:27:56 +0000 (12:27 +0000)]
+ // Try to associate by common vertices of an edge
+ ...
eap [Mon, 29 Nov 2010 10:13:58 +0000 (10:13 +0000)]
- //delete myDlg;
+ //delete myDlg; since WA_DeleteOnClose==true
eap [Mon, 29 Nov 2010 10:13:41 +0000 (10:13 +0000)]
untabify
eap [Mon, 29 Nov 2010 10:12:42 +0000 (10:12 +0000)]
0021087: EDF 1673 GEOM: Start and End length hypotheses don't always match edges orientation
Make orientation FORWARD to show direction of 3D curve
vsr [Fri, 26 Nov 2010 11:45:59 +0000 (11:45 +0000)]
Merge from V5_1_5_BR branch 26/11/2010
eap [Thu, 25 Nov 2010 14:32:42 +0000 (14:32 +0000)]
0021086: EDF 1686 GEOM: Bad triangle in a BLSURF + GHS3D mesh after converting to quadratic
Store the fixed node position in the node
+ bool toCheckPosOnShape(int shapeID ) const;
+ void setPosOnShapeValidity(int shapeID, bool ok ) const;
eap [Wed, 24 Nov 2010 15:22:54 +0000 (15:22 +0000)]
0021084: EDF 1696 SMESH: Convert to quadratic generates contorted triangles
Bend links of triangles iff a boundary link is bent towards inside of a QFace
vsr [Tue, 23 Nov 2010 16:47:54 +0000 (16:47 +0000)]
Merge from V5_1_5_BR 23/11/2010
eap [Fri, 19 Nov 2010 09:26:23 +0000 (09:26 +0000)]
020716: EDF 1229 SMESH : Improvement of reversed edges dialog box
add geom filters
vsr [Fri, 19 Nov 2010 07:46:36 +0000 (07:46 +0000)]
0020946: EDF 1466 SMESH: Add a new control criteria: Max element length
Rename "Max Element LEngth 2D/3D" control to "Element Diameter 2D/3D"
eap [Fri, 19 Nov 2010 07:25:45 +0000 (07:25 +0000)]
020716: EDF 1229 SMESH : Improvement of reversed edges dialog box
convert reversedEdges into indices
eap [Fri, 19 Nov 2010 07:15:47 +0000 (07:15 +0000)]
020716: EDF 1229 SMESH : Improvement of reversed edges dialog box
fix taking into account ( reversing edges + hyp propagation )
eap [Thu, 18 Nov 2010 14:38:17 +0000 (14:38 +0000)]
untabify
vsr [Thu, 18 Nov 2010 10:40:04 +0000 (10:40 +0000)]
Fix complilation problem on Mandriva 2010 (gcc 4.4)
eap [Thu, 18 Nov 2010 10:10:09 +0000 (10:10 +0000)]
0021077: EDF 1695 SMESH: Netgen works bad with 1D hypothesis on an elliptic torus
Make propagation work w/o any hypotheses assigned to edges where an
1D hypothesis is propagated to.
eap [Thu, 18 Nov 2010 10:05:38 +0000 (10:05 +0000)]
improve code readability
eap [Thu, 18 Nov 2010 10:04:05 +0000 (10:04 +0000)]
-// $Header:
eap [Tue, 16 Nov 2010 07:05:07 +0000 (07:05 +0000)]
0021074: EDF 1682 MESH: Bug with start and end length hypothesis
fix compensateError()
vsr [Mon, 15 Nov 2010 06:52:35 +0000 (06:52 +0000)]
Merge from PHASE_25_BR 14/11/2010
vsr [Sat, 13 Nov 2010 11:11:03 +0000 (11:11 +0000)]
Merge from BR_WIN_INDUS_514 13/11/2010
vsr [Fri, 12 Nov 2010 14:22:21 +0000 (14:22 +0000)]
Merge from V5_1_5_BR branch 12/11/2010
eap [Fri, 29 Oct 2010 13:24:11 +0000 (13:24 +0000)]
0021058: EDF 1674 SMESH: SetTriangleVertex ends in error with strange message
prevent problems with TopAbs_INTERNAL shapes
gdd [Tue, 5 Oct 2010 14:55:24 +0000 (14:55 +0000)]
Length GUI: replaced slider by SMESHGUI_SpinBox. Previously the value was unknown until study was dumped.
vsr [Mon, 4 Oct 2010 14:16:14 +0000 (14:16 +0000)]
Merge from BR_WIN_INDUS_514 04/10/2010
eap [Mon, 4 Oct 2010 11:39:25 +0000 (11:39 +0000)]
0020889: EDF 1433 SMESH: SplitHexaToTetra: add the 24 tetras mode
* Add HEXA_TO_24 splitting mode
eap [Mon, 4 Oct 2010 11:38:57 +0000 (11:38 +0000)]
+</ol>
eap [Mon, 4 Oct 2010 11:30:00 +0000 (11:30 +0000)]
0020889: EDF 1433 SMESH: SplitHexaToTetra: add the 24 tetras mode
* Add HEXA_TO_24 splitting mode
eap [Mon, 4 Oct 2010 11:29:01 +0000 (11:29 +0000)]
0020889: EDF 1433 SMESH: SplitHexaToTetra: add the 24 tetras mode
* Add Hex_24Tet splitting mode
eap [Mon, 4 Oct 2010 11:27:58 +0000 (11:27 +0000)]
0020889: EDF 1433 SMESH: SplitHexaToTetra: add the 24 tetras mode
void SMESH_MeshEditor_i::SplitVolumesIntoTetra (SMESH::SMESH_IDSource_ptr elems,
CORBA::Short methodFlags)
throw (SALOME::SALOME_Exception)
{
Unexpect aCatch(SALOME_SalomeException);
+ initData();
eap [Mon, 4 Oct 2010 11:25:52 +0000 (11:25 +0000)]
+ SMDS_MeshFace* AddPolygonalFace (const std::vector<const SMDS_MeshNode*>& nodes,
+ SMDS_MeshVolume* AddPolyhedralVolume (const std::vector<const SMDS_MeshNode*>& nodes,
eap [Mon, 4 Oct 2010 11:24:14 +0000 (11:24 +0000)]
0020889: EDF 1433 SMESH: SplitHexaToTetra: add the 24 tetras mode
* Add HEXA_TO_24 splitting mode
* Fix ConvertToQuadratic() to avoid disappearance of poly elements
eap [Mon, 4 Oct 2010 11:19:48 +0000 (11:19 +0000)]
Do not pass vector arguments by value
eap [Mon, 4 Oct 2010 11:18:24 +0000 (11:18 +0000)]
0020889: EDF 1433 SMESH: SplitHexaToTetra: add the 24 tetras mode
* Fix IsLinked()
* Add GetFaceBaryCenter():
vsr [Mon, 4 Oct 2010 09:57:42 +0000 (09:57 +0000)]
Fix configure problem (caused by previous integration).
AC_PROG_MKDIR_P is not available for autoconf 2.59 (Debian Sarge, Mandriva 2006)
eap [Mon, 4 Oct 2010 06:01:04 +0000 (06:01 +0000)]
inline TCollection_AsciiString ElementTypeString (SMESH::ElementType theElemType)
{
...
+ CASE2STRING( ELEM0D );
gdd [Fri, 1 Oct 2010 15:06:10 +0000 (15:06 +0000)]
Patch for the generation of the documentation
eap [Fri, 1 Oct 2010 12:53:07 +0000 (12:53 +0000)]
0021015: EDF 1578 SMESH: Free nodes are removed when translating a mesh
* Pass empty set of elements if the whole mesh is to be transformed
* Fix incorrect treatment of groups of nodes
* Call SMESH_MeshEditor::Transform() from Scale*()
eap [Fri, 1 Oct 2010 12:48:49 +0000 (12:48 +0000)]
0021015: EDF 1578 SMESH: Free nodes are removed when translating a mesh
* Treate orphan nodes in Transform()
* Remove Scale() as being a paricular case of Transform()
eap [Fri, 1 Oct 2010 12:44:05 +0000 (12:44 +0000)]
- theObject = self.editor.MakeIDSource(theObject)
+ theObject = self.editor.MakeIDSource(theObject, SMESH.ALL)
eap [Fri, 1 Oct 2010 07:29:53 +0000 (07:29 +0000)]
improve comment for Scale
eap [Thu, 30 Sep 2010 13:25:40 +0000 (13:25 +0000)]
0021016: [CEA] non regression test KO
Implement
SMDS_ElemIteratorPtr Q2TAdaptor_Triangle::elementsIterator(SMDSAbs_ElementType type) const
vsr [Wed, 29 Sep 2010 08:00:24 +0000 (08:00 +0000)]
0021012: [CEA] Different names between GUI and TUI function
eap [Wed, 29 Sep 2010 07:58:16 +0000 (07:58 +0000)]
-#include "SMDS_FaceOfNodes.hxx"
eap [Tue, 28 Sep 2010 11:29:20 +0000 (11:29 +0000)]
0021006: EDF 1546 SMESH : Convert To Quadratic fails
+ const SMDS_MeshNode* getMediumNodeOnComposedWire(const SMDS_MeshNode* n1,
+ const SMDS_MeshNode* n2,
+ bool force3d);
gdd [Tue, 28 Sep 2010 08:06:46 +0000 (08:06 +0000)]
RNC: Completed the documentation of GetElementsByType with the values taken by ElementType
gdd [Mon, 27 Sep 2010 15:28:50 +0000 (15:28 +0000)]
Merge from BR_pypkg (python packaging)
gdd [Mon, 27 Sep 2010 09:35:03 +0000 (09:35 +0000)]
RNC: Fixed documentation of SetGeometricMesh
Parameter theGeometricMesh takes the value 0 or 1
eap [Mon, 27 Sep 2010 06:30:22 +0000 (06:30 +0000)]
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
One more redesign
eap [Mon, 27 Sep 2010 06:21:30 +0000 (06:21 +0000)]
Remove unused method
- bool emptyInverseElements();
vsr [Mon, 27 Sep 2010 06:17:50 +0000 (06:17 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
vsr [Sun, 26 Sep 2010 16:14:05 +0000 (16:14 +0000)]
Improve dialog box's layout
vsr [Sun, 26 Sep 2010 06:47:43 +0000 (06:47 +0000)]
Remove compilation warning
vsr [Fri, 24 Sep 2010 13:08:23 +0000 (13:08 +0000)]
EDF 1575 SMESH: Filters and precision preferences
vsr [Fri, 24 Sep 2010 08:28:34 +0000 (08:28 +0000)]
Fix crash in Length2D::GetValues() and MultiConnection2D::GetValues() methods.
vsr [Wed, 22 Sep 2010 13:58:13 +0000 (13:58 +0000)]
Hack libtool (!) to workaround problem with wrong linkage of native libraries
eap [Wed, 22 Sep 2010 11:41:25 +0000 (11:41 +0000)]
issue
0020959: HEXA_3D fails on shell
Fix DependsOn() for a not-closed SHELL not in SOLID
eap [Wed, 22 Sep 2010 11:24:21 +0000 (11:24 +0000)]
0020986: EDF 1557 SMESH: Convert to quadratic with medium node on geometry fails on a GHS3D mesh
Optimize FixQuadraticElements()
eap [Wed, 22 Sep 2010 10:01:32 +0000 (10:01 +0000)]
0020996: EDF 1549 SMESH: Projection 1D/2D algorithms fail
implement FindFaceAssociation() by UV correspondence which is used
in case if correspondent vertices belong to inner wires
gdd [Tue, 21 Sep 2010 13:48:27 +0000 (13:48 +0000)]
GDD:
- fix documentation of ConvertToQuadratic (inform about theForce3d parameter)
- New function PrintDoubleValue added in PluginUtils
eap [Tue, 21 Sep 2010 07:53:49 +0000 (07:53 +0000)]
0020996: EDF 1549 SMESH: Projection 1D/2D algorithms fail
Fix FindFaceAssociation():
1) exit from loop on outer_wire_algo as soon as solution is found
2) treat edges of inner wires
eap [Tue, 21 Sep 2010 07:48:09 +0000 (07:48 +0000)]
Correct name of an argument
static int GetOrderedEdges (const TopoDS_Face& theFace,
TopoDS_Vertex theFirstVertex,
std::list< TopoDS_Edge >& theEdges,
- std::list< int > & theNbVertexInWires,
+ std::list< int > & theNbEdgesInWires,
const bool theShapeAnalysisAlgo=false);
ouv [Mon, 20 Sep 2010 13:00:13 +0000 (13:00 +0000)]
Issue
0020226: [CEA 329] Invalid glyphs position in vector fields on polyhedrons cell.
eap [Fri, 17 Sep 2010 05:36:15 +0000 (05:36 +0000)]
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
- if ( !subMeshId )
+ if ( !subMeshId && ! _impl->GetMeshDS()->IsGroupOfSubShapes( myLocSubShape ))
THROW_SALOME_CORBA_EXCEPTION("not sub-shape of the main shape", SALOME::BAD_PARAM);
eap [Fri, 17 Sep 2010 05:35:42 +0000 (05:35 +0000)]
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
Fix fillAncestorsMap(theShape) for the case if a sub-shape of
theShape is not in _mapAncestors
eap [Fri, 17 Sep 2010 05:34:11 +0000 (05:34 +0000)]
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
Move all checks of shape validity from AddCompoundSubmesh() to IsGroupOfSubShapes()
eap [Wed, 15 Sep 2010 15:11:26 +0000 (15:11 +0000)]
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
bool IsLinked (const SMDS_MeshNode* theNode1,
const SMDS_MeshNode* theNode2,
+ const bool theIgnoreMediumNodes=false) const;
// Return true if theNode1 is linked with theNode2.
+ // If theIgnoreMediumNodes then corner nodes of quadratic cell are considered linked as well
eap [Wed, 15 Sep 2010 15:08:58 +0000 (15:08 +0000)]
0020982: EDF 1547 SMESH: Creation of non-conformal quadratic pyramids
Replace VTK_CONVEX_POINT_SET with VTK_QUADRATIC_PYRAMID
dmv [Wed, 15 Sep 2010 14:59:58 +0000 (14:59 +0000)]
0020983: EDF 1569 SMESH: Numbering Display Elements with several groups selected does not work
eap [Wed, 15 Sep 2010 13:25:26 +0000 (13:25 +0000)]
indentation
eap [Wed, 15 Sep 2010 13:25:06 +0000 (13:25 +0000)]
0020876: EDF 1246 SMESH: DoubleNodes fonctions available in the GUI
Add an argument to DoubleNodeXXX() creating groups
eap [Wed, 15 Sep 2010 12:46:19 +0000 (12:46 +0000)]
0020876: EDF 1246 SMESH: DoubleNodes fonctions available in the GUI
No need in new commands in smeshDC.py, so DoubleNodeXXXNew() is replaced by DoubleNodeXXX()
eap [Wed, 15 Sep 2010 12:09:30 +0000 (12:09 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
## Finds groups of ajacent nodes within Tolerance.
# @param Tolerance the value of tolerance
# @param SubMeshOrGroup SubMesh or Group
+ # @param exceptNodes list of either SubMeshes, Groups or node IDs to exclude from search
# @return the list of groups of nodes
# @ingroup l2_modif_trsf
- def FindCoincidentNodesOnPart (self, SubMeshOrGroup, Tolerance):
+ def FindCoincidentNodesOnPart (self, SubMeshOrGroup, Tolerance, exceptNodes=[]):
eap [Wed, 15 Sep 2010 11:52:34 +0000 (11:52 +0000)]
Use TIDSortedNodeSet instead of set< const SMDS_MeshNode*> when looking for coincident nodes
eap [Wed, 15 Sep 2010 11:51:57 +0000 (11:51 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
+ /*!
+ * Returns types of elements it contains
+ */
+ virtual SMESH::array_of_ElementType* GetTypes();
eap [Wed, 15 Sep 2010 11:50:48 +0000 (11:50 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
+ TPythonDump&
+ operator<<(const SMESH::ListOfIDSources& theList);
+
eap [Wed, 15 Sep 2010 11:50:13 +0000 (11:50 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
+ // set "FindCoincidentNodesOnPart()" instead of "FindCoincidentNodesOnPartBut()"
+ if ( !isPyMeshMethod && method == "FindCoincidentNodesOnPartBut")
+ {
+ isPyMeshMethod=true;
+ theCommand->SetMethod("FindCoincidentNodesOnPart");
+ }
eap [Wed, 15 Sep 2010 11:49:07 +0000 (11:49 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
interface SMESH_MeshEditor
{
- SMESH_IDSource MakeIDSource(in long_array IDsOfElements);
+ SMESH_IDSource MakeIDSource(in long_array IDsOfElements, in ElementType type);
+ void FindCoincidentNodesOnPartBut (in SMESH_IDSource SubMeshOrGroup,
+ in double Tolerance,
+ out array_of_long_array GroupsOfNodes,
+ in ListOfIDSources ExceptSubMeshOrGroups);
+
eap [Wed, 15 Sep 2010 11:47:53 +0000 (11:47 +0000)]
0020746: EDF 1274 SMESH : MergeAllNodesButNodesFromGroup feature
- SMESH_IDSource MakeIDSource(in long_array IDsOfElements);
+ SMESH_IDSource MakeIDSource(in long_array IDsOfElements, in ElementType type);
+ void FindCoincidentNodesOnPartBut (in SMESH_IDSource SubMeshOrGroup,
+ in double Tolerance,
+ out array_of_long_array GroupsOfNodes,
+ in ListOfIDSources ExceptSubMeshOrGroups);
+
eap [Wed, 15 Sep 2010 11:45:49 +0000 (11:45 +0000)]
+ interface SMESH_IDSource;
+ typedef sequence<SMESH_IDSource> ListOfIDSources;
+ typedef sequence<ElementType> array_of_ElementType ;
interface SMESH_IDSource
{
+
+ /*!
+ * Returns types of elements it contains
+ */
+ array_of_ElementType GetTypes();
};
eap [Wed, 15 Sep 2010 11:42:59 +0000 (11:42 +0000)]
rename SMESHGUI_EditMeshDlg to SMESHGUI_MergeDlg
eap [Wed, 15 Sep 2010 11:41:11 +0000 (11:41 +0000)]
Use TIDSortedNodeSet instead of set< const SMDS_MeshNode*> when looking for coincident nodes
+typedef std::set< const SMDS_MeshNode*, TIDCompare > TIDSortedNodeSet;
dmv [Mon, 13 Sep 2010 14:23:50 +0000 (14:23 +0000)]
WinTC5.1.4: Application crash after open Linux study
dmv [Thu, 9 Sep 2010 09:08:23 +0000 (09:08 +0000)]
0020082: EDF 869 GEOM : Edges Orientation indicator/reverse
gdd [Wed, 8 Sep 2010 07:21:54 +0000 (07:21 +0000)]
GDD: Some mispell corrections
eap [Tue, 7 Sep 2010 06:35:44 +0000 (06:35 +0000)]
use linked nodes to get an upward direction when defining orientation
eap [Fri, 3 Sep 2010 14:19:16 +0000 (14:19 +0000)]
0020968:
EDF1545 SMESH: Problem in de creation of a mesh group on geometry
Detect not computed sub-shapes in case if algo computes many
submeshes at once
eap [Thu, 2 Sep 2010 06:30:53 +0000 (06:30 +0000)]
0020963: EDF 1528 SMESH: How to combine Netgen1D2D with sizemap with Quadrangle(Mapping) ?
- sm->ComputeStateEngine(SMESH_subMesh::COMPUTE);
+ _gen->Compute( theMesh, _mainEdge, /*anUpward=*/true);
sm->ComputeStateEngine() fails if vertices it depends on are not yet created
eap [Thu, 2 Sep 2010 06:26:55 +0000 (06:26 +0000)]
improve comment
eap [Thu, 2 Sep 2010 06:26:23 +0000 (06:26 +0000)]
bool SMESH_HypoFilter::IsMoreLocalThanPredicate::IsOk(const SMESH_Hypothesis* aHyp,
const TopoDS_Shape& aShape) const
{
+ // issue
0020963
+ // if aShape is COMPOUND (i.e. most probably a GEOM group) then
+ // it is more local if it contains shapes of less dimension than _shapeType
+ ...
eap [Wed, 1 Sep 2010 11:00:43 +0000 (11:00 +0000)]
0020959: EDF 1531: HEXA_3D fails on shell
in DependsOn(), do not make a sub-mesh of a not closed SHELL