]>
SALOME platform Git repositories - modules/smesh.git/log
eap [Wed, 3 Jul 2013 16:12:38 +0000 (16:12 +0000)]
Compute Progress bar
SMESH_subMeshIteratorPtr getDependsOnIterator(const bool includeSelf,
- const bool complexShapeFirst) const;
+ const bool complexShapeFirst=false) const;
+ int GetComputeCost() const;
TopoDS_Shape getCollection(SMESH_Gen * theGen,
SMESH_Algo* theAlgo,
bool & theSubComputed,
bool & theSubFailed,
+ int & theComputeCost);
+ int _computeCost; // how costly is to compute this sub-mesh
eap [Wed, 3 Jul 2013 16:10:31 +0000 (16:10 +0000)]
Compute Progress bar
+ double GetComputeProgress() const;
+ SMESH_Hypothesis * GetHypothesis(const int aHypID) const;
eap [Wed, 3 Jul 2013 16:09:54 +0000 (16:09 +0000)]
- std::map < int, SMESH_Algo * >_mapAlgo;
- std::map < int, SMESH_0D_Algo * >_map0D_Algo;
- std::map < int, SMESH_1D_Algo * >_map1D_Algo;
- std::map < int, SMESH_2D_Algo * >_map2D_Algo;
- std::map < int, SMESH_3D_Algo * >_map3D_Algo;
eap [Wed, 3 Jul 2013 16:09:28 +0000 (16:09 +0000)]
Compute Progress bar
+ virtual double GetProgress() const;
+ double GetProgressByTic() const;
+ int& GetComputeCost() { return _computeCost; }
+ int _computeCost; //!< "compute cost" of shapes being Compute()d
+ int _progressTic; //!< counter of calls from SMESH_Mesh::GetComputeProgress()
+ double _progress; //!< progress of Compute() [0.,1.]
eap [Wed, 3 Jul 2013 16:07:54 +0000 (16:07 +0000)]
SMESH_Gen::_map1D_Algo no longer exists
eap [Wed, 3 Jul 2013 16:06:14 +0000 (16:06 +0000)]
1)
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
+ static CORBA::Long* GetTemporaryIDs( SMESH::SMESH_IDSource_ptr& idSource, int& nbIds );
+ virtual SMESH::long_array* GetNbElementsByType();
eap [Wed, 3 Jul 2013 16:05:46 +0000 (16:05 +0000)]
1)
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
+ static CORBA::Long* GetTemporaryIDs( SMESH::SMESH_IDSource_ptr& idSource, int& nbIds );
eap [Wed, 3 Jul 2013 16:05:28 +0000 (16:05 +0000)]
1)
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
+ virtual SMESH::long_array* GetNbElementsByType();
+ static SMDS_ElemIteratorPtr GetElements(SMESH::SMESH_IDSource_ptr obj,
+ SMESH::ElementType type);
2) Compute Progress bar
+ CORBA::Double GetComputeProgress();
eap [Wed, 3 Jul 2013 16:04:07 +0000 (16:04 +0000)]
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
+ virtual SMESH::long_array* GetNbElementsByType();
eap [Wed, 3 Jul 2013 16:03:14 +0000 (16:03 +0000)]
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
interface SMESH_IDSource
{
+ long NbSatisfying( in SMESH::SMESH_IDSource obj );
interface NumericalFunctor: Functor
{
+ Histogram GetLocalHistogram( in short nbIntervals, in boolean isLogarithmic,
+ in SMESH::SMESH_IDSource obj );
eap [Wed, 3 Jul 2013 16:02:20 +0000 (16:02 +0000)]
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
Optimization for large meshes
eap [Wed, 3 Jul 2013 16:01:42 +0000 (16:01 +0000)]
Compute progress bar
eap [Wed, 3 Jul 2013 16:00:57 +0000 (16:00 +0000)]
untabify
eap [Wed, 3 Jul 2013 16:00:19 +0000 (16:00 +0000)]
1)
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
interface SMESH_IDSource
{
+ long_array GetNbElementsByType();
2) Compute progress bar
interface SMESH_Mesh
{
+ double GetComputeProgress();
eap [Wed, 3 Jul 2013 15:58:19 +0000 (15:58 +0000)]
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
interface Predicate: Functor
{
+ long NbSatisfying( in SMESH::SMESH_IDSource obj );
interface NumericalFunctor: Functor
{
+ Histogram GetLocalHistogram( in short nbIntervals, in boolean isLogarithmic,
+ in SMESH::SMESH_IDSource obj );
eap [Tue, 2 Jul 2013 14:27:15 +0000 (14:27 +0000)]
0022238 : Study dump produced by SMESH refers to undefined variable names
void fixFunctorType()
{
+ ASSERT( undef2newItems.rbegin()->first == SMESH::FT_Undefined );
eap [Tue, 2 Jul 2013 13:39:05 +0000 (13:39 +0000)]
0022238 : Study dump produced by SMESH refers to undefined variable names
Fix CheckObjectPresence() again
+ ASSERT( thePartIndex > 0 );
eap [Tue, 2 Jul 2013 12:02:33 +0000 (12:02 +0000)]
0022238 : Study dump produced by SMESH refers to undefined variable names
Remove "aStudyBuilder.RemoveObjectWithChildren(SO)" for SO whose
creation command was removed or commented
mpa [Thu, 27 Jun 2013 12:35:43 +0000 (12:35 +0000)]
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
eap [Wed, 26 Jun 2013 11:17:07 +0000 (11:17 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
Remove dependency on MED
eap [Tue, 25 Jun 2013 18:17:26 +0000 (18:17 +0000)]
- $(MED_LDFLAGS) -lSalomeIDLMED \
eap [Tue, 25 Jun 2013 15:23:19 +0000 (15:23 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
eap [Tue, 25 Jun 2013 15:22:50 +0000 (15:22 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
-echo
-echo ---------------------------------------------
-echo Testing Med
-echo ---------------------------------------------
-echo
-
-CHECK_MED
eap [Tue, 25 Jun 2013 13:51:49 +0000 (13:51 +0000)]
Bug: not all fields available after switching from the 3-d to an other constructor
+ myTextLabel2->show();
+ mySelectButton2->show();
+ myLineEdit2->show();
eap [Tue, 25 Jun 2013 11:58:31 +0000 (11:58 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
-#include "MED.idl"
+ struct MedFileInfo
+ {
eap [Tue, 25 Jun 2013 11:57:48 +0000 (11:57 +0000)]
-// $Header:
eap [Tue, 25 Jun 2013 11:57:19 +0000 (11:57 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
MED.idl no more exists
- aStr<<"bash -c \""<<getenv("MED_ROOT_DIR")<<"/bin/salome/mprint_version \'"<<theFileName<<"\'\"";
+ aStr<<"bash -c \""<<getenv("SMESH_ROOT_DIR")<<"/bin/salome/mprint_version \'"<<theFileName<<"\'\"";
eap [Tue, 25 Jun 2013 11:56:49 +0000 (11:56 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
MED.idl no more exists
SALOME_MED::MedFileInfo -> SMESH::MedFileInfo
eap [Tue, 25 Jun 2013 11:56:05 +0000 (11:56 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
MED.idl no more exists
eap [Tue, 25 Jun 2013 11:55:34 +0000 (11:55 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
MED.idl no more exists
- ## Gets MED Mesh
- # @return an instance of SALOME_MED::MESH
- # @ingroup l1_auxiliary
- def GetMEDMesh(self):
- return self.mesh.GetMEDMesh()
eap [Tue, 25 Jun 2013 09:14:40 +0000 (09:14 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
+ ../MEDWrapper/Factory/libMEDWrapper.la \
+ ../MEDWrapper/Base/libMEDWrapperBase.la \
+ ../MEDWrapper/V2_2/libMEDWrapper_V2_2.la \
eap [Mon, 24 Jun 2013 10:09:43 +0000 (10:09 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
+#include "MED_Factory.hxx"
eap [Mon, 24 Jun 2013 10:08:26 +0000 (10:08 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
+ -I$(srcdir)/../MEDWrapper/Base \
+ -I$(srcdir)/../MEDWrapper/Factory \
- $(MED_LDFLAGS) \
- -lMEDWrapper \
- -lMEDWrapper_V2_2 \
- -lSalomeIDLMED \
eap [Mon, 24 Jun 2013 10:07:56 +0000 (10:07 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
+ -I$(srcdir)/../MEDWrapper/Base \
eap [Mon, 24 Jun 2013 10:07:44 +0000 (10:07 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
-#include <MED_Common.hxx>
+#include "MED_Common.hxx"
eap [Mon, 24 Jun 2013 10:07:19 +0000 (10:07 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
- $(MED_CXXFLAGS) \
+ -I$(srcdir)/../MEDWrapper/Base \
eap [Mon, 24 Jun 2013 10:06:53 +0000 (10:06 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
- void SetFile(const std::string& theFileName);
+ virtual void SetFile(const std::string& theFileName);
eap [Mon, 24 Jun 2013 10:06:18 +0000 (10:06 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
+ MEDWrapper \
eap [Mon, 24 Jun 2013 10:02:47 +0000 (10:02 +0000)]
CoTech decision: move MEDWrapper from MED to SMESH
+ src/MEDWrapper/Makefile \
+ src/MEDWrapper/Base/Makefile \
+ src/MEDWrapper/Factory/Makefile \
+ src/MEDWrapper/V2_2/Makefile \
eap [Mon, 24 Jun 2013 10:01:25 +0000 (10:01 +0000)]
remove a wring comment
eap [Fri, 21 Jun 2013 10:40:14 +0000 (10:40 +0000)]
Add English translations to unfinished ones
eap [Fri, 21 Jun 2013 08:36:07 +0000 (08:36 +0000)]
Synchronizing with SMESH_msg_en.ts
eap [Fri, 21 Jun 2013 08:35:49 +0000 (08:35 +0000)]
<source>SMESH_GIGABYTE</source>
- <translation>%1 G</translation>
+ <translation>%1 GB</translation>
vsr [Fri, 21 Jun 2013 06:29:36 +0000 (06:29 +0000)]
0022169 : [CEA 750] Chose before visualization mesh element type to display
vsr [Fri, 21 Jun 2013 05:33:07 +0000 (05:33 +0000)]
0022169 : [CEA 750] Chose before visualization mesh element type to display
eap [Thu, 20 Jun 2013 14:29:16 +0000 (14:29 +0000)]
Show free RAM while computing the mesh
eap [Thu, 20 Jun 2013 13:05:03 +0000 (13:05 +0000)]
+ SUIT_OverrideCursor wc;
kga [Wed, 19 Jun 2013 07:46:33 +0000 (07:46 +0000)]
0020976 : EDF 1471 SMESH: New ergonomy to display quality controls
fix v1
cvw [Tue, 18 Jun 2013 08:34:04 +0000 (08:34 +0000)]
deprecated v7 import smesh, studyBuilder modification
cvw [Tue, 18 Jun 2013 08:31:15 +0000 (08:31 +0000)]
merge from BR_pluginMGCleaner tag mergeto_v7_main_17jun13
cvw [Mon, 17 Jun 2013 14:56:45 +0000 (14:56 +0000)]
merge from BR_pluginMGCleaner tag mergeto_v7_main_17jun13
cvw [Mon, 17 Jun 2013 14:49:25 +0000 (14:49 +0000)]
best warning on qlineedit for double value
cvw [Fri, 14 Jun 2013 11:56:20 +0000 (11:56 +0000)]
deprecated import smesh smeshBuilder
cvw [Thu, 13 Jun 2013 14:18:09 +0000 (14:18 +0000)]
add for MGCleaner
cvw [Thu, 13 Jun 2013 13:50:31 +0000 (13:50 +0000)]
add SMESH plugin MGCleaner
cvw [Thu, 13 Jun 2013 13:47:53 +0000 (13:47 +0000)]
bug
cvw [Thu, 13 Jun 2013 13:38:35 +0000 (13:38 +0000)]
add SMESH plugin MGCleaner
eap [Tue, 11 Jun 2013 11:51:44 +0000 (11:51 +0000)]
21952: EDF 2383 SMESH : Add an option to write planar meshes as 3D meshes in MED files
Correct position of autoDimension in ExportMED()
eap [Tue, 11 Jun 2013 10:24:55 +0000 (10:24 +0000)]
0022229 : [CEA 829] Error "Edge multiple times in surface mesh"
Fix IsReversedSubMesh(), avoid getting uv on a faces at a singularity
point of sphere
eap [Fri, 7 Jun 2013 09:00:36 +0000 (09:00 +0000)]
tree -> three
eap [Wed, 5 Jun 2013 15:13:53 +0000 (15:13 +0000)]
0021952 : Add an option to write planar meshes as 3D meshes in MED files
eap [Wed, 5 Jun 2013 10:04:09 +0000 (10:04 +0000)]
avoid "unused variable" compilation warnings
eap [Wed, 5 Jun 2013 09:59:53 +0000 (09:59 +0000)]
avoid compilation warnings
eap [Wed, 5 Jun 2013 09:49:03 +0000 (09:49 +0000)]
avoid compilation warnings in release mode
eap [Wed, 5 Jun 2013 09:39:43 +0000 (09:39 +0000)]
avoid compilation warnings in release mode
eap [Tue, 4 Jun 2013 15:05:51 +0000 (15:05 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
eap [Tue, 4 Jun 2013 15:05:28 +0000 (15:05 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
Have a separate SMESH_MesherHelper in each TSideFace in order to get a
correct UV on periodic FACE
eap [Tue, 4 Jun 2013 15:03:15 +0000 (15:03 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
In GetUVPtStruct(), update normParam when reloading points from a proxy
mesh in a reversed order
eap [Tue, 4 Jun 2013 15:00:45 +0000 (15:00 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
In ComputeParameters(), more attempts to get a correct result
eap [Tue, 4 Jun 2013 14:59:12 +0000 (14:59 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
Redesign onCriterionChanged() to avoid SIGSEGV on a comboItem of an
improper side
eap [Tue, 4 Jun 2013 14:58:08 +0000 (14:58 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
Make const GetNodeU()
eap [Tue, 4 Jun 2013 14:56:41 +0000 (14:56 +0000)]
0022103 : EDF 2550 SMESH : Allow viscous layer with 3D extrusion
= Allow viscous layers on boundary EDGEs of a 2D sub-mesh
eap [Fri, 31 May 2013 13:48:35 +0000 (13:48 +0000)]
0022136 : EDF 2345 SMESH: Improving documentation of Quadrangle mapping with the type "Reduced"
eap [Fri, 31 May 2013 11:56:48 +0000 (11:56 +0000)]
- //_face.Orientation( TopAbs_FORWARD );
+ _face.Orientation( TopAbs_FORWARD ); // 2D logic works only in this case
eap [Fri, 31 May 2013 11:56:32 +0000 (11:56 +0000)]
check orientation when re-loading points from a proxy mesh
eap [Fri, 31 May 2013 11:55:38 +0000 (11:55 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
+# 2D Viscous layers
eap [Thu, 30 May 2013 16:35:57 +0000 (16:35 +0000)]
take care of a correct orientation (attempt No2 )
eap [Thu, 30 May 2013 16:28:03 +0000 (16:28 +0000)]
take care of a correct orientation
eap [Thu, 30 May 2013 14:32:41 +0000 (14:32 +0000)]
"import python files corresponding to plugins" is not needed (since long time)
eap [Thu, 30 May 2013 14:22:28 +0000 (14:22 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
Update <python-wrap>
- <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetIgnoreEdges())</hypo>
+ <hypo>ViscousLayers2D=ViscousLayers2D(SetTotalThickness(),SetNumberLayers(),SetStretchFactor(),SetEdges(1),SetEdges(2))</hypo>
eap [Thu, 30 May 2013 14:21:55 +0000 (14:21 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
interface StdMeshers_ViscousLayers2D : SMESH::SMESH_Hypothesis
{
+ void SetEdges(in SMESH::long_array edgeIDs,
+ in boolean toIgnore) raises (SALOME::SALOME_Exception);
+ SMESH::long_array GetEdges();
+ boolean GetIsToIgnoreEdges();
eap [Thu, 30 May 2013 14:20:52 +0000 (14:20 +0000)]
untabify and
-#ifdef WITHGENERICOBJ
eap [Thu, 30 May 2013 14:20:00 +0000 (14:20 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
Provide access to QLabel's of parameters:
+ QLabel* getLabel(int i) const;
+ ListOfWidgets myParamLabels;
eap [Thu, 30 May 2013 14:18:23 +0000 (14:18 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
- def ViscousLayers2D(self, thickness, numberOfLayers, stretchFactor, ignoreEdges=[]):
+ def ViscousLayers2D(self, thickness, numberOfLayers, stretchFactor,
+ edges=[], isEdgesToIgnore=True ):
eap [Thu, 30 May 2013 14:17:56 +0000 (14:17 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
eap [Thu, 30 May 2013 14:15:57 +0000 (14:15 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
In addition to implementing IMP, avoid "limiting" _thickness to zero:
- _thickness = Min( _hyp->GetTotalThickness(), maxPossibleThick );
+ if ( maxPossibleThick > 0. )
+ _thickness = Min( _hyp->GetTotalThickness(), maxPossibleThick );
eap [Thu, 30 May 2013 14:14:31 +0000 (14:14 +0000)]
0022104 : EDF 2550 SMESH: 2D viscous layer, allow specifying edges with viscous layer
+ void SetBndShapes(const std::vector<int>& shapeIds, bool toIgnore);
+ std::vector<int> GetBndShapes() const { return _shapeIds; }
+ bool IsToIgnoreShapes() const { return _isToIgnoreShapes; }
private:
- std::vector<int> _ignoreBndShapeIds;
+ std::vector<int> _shapeIds;
+ bool _isToIgnoreShapes;
inv [Thu, 30 May 2013 08:02:04 +0000 (08:02 +0000)]
Compatibility with gcc 4.1 (centos 5)
eap [Wed, 29 May 2013 15:32:30 +0000 (15:32 +0000)]
22222: [CEA 820] GHS3D in salome 7.2.0 ten times slower than in salome 6.6.0
In MakeComputed(), call SMESH_Gen::Compute() with aShapeOnly = true
- return gen->Compute( *mesh, shape );
+ return gen->Compute( *mesh, shape, /*shapeOnly=*/true );
eap [Wed, 29 May 2013 15:31:16 +0000 (15:31 +0000)]
22222: [CEA 820] GHS3D in salome 7.2.0 ten times slower than in salome 6.6.0
- if ( myGen.Compute( myLocMesh, myLocShape, false, aDim, &shapeIds ) )
+ if ( myGen.Compute( myLocMesh, myLocShape, false, false, aDim, &shapeIds ) )
The 3-d parameter aShapeOnly added to SMESH_Gen::Compute()
eap [Wed, 29 May 2013 15:29:19 +0000 (15:29 +0000)]
22222: [CEA 820] GHS3D in salome 7.2.0 ten times slower than in salome 6.6.0
Choose a compute event (COMPUTE or COMPUTE_SUBMESH) depending on an
explicit parameter aShapeOnly.
bool Compute(::SMESH_Mesh & aMesh,
const TopoDS_Shape & aShape,
+ const bool aShapeOnly=false,
const bool anUpward=false,
const ::MeshDimension aDim=::MeshDim_3D,
TSetOfInt* aShapesId=0);
eap [Wed, 29 May 2013 13:41:51 +0000 (13:41 +0000)]
0022136 : EDF 2345 SMESH: Improving documentation of Quadrangle mapping with the type "Reduced"
1) Send a warning if Reduced transition can't be used.
2) Fix SIGSEGV for the case of nbRows = 1, nbTop = 4, nbBot = 16
eap [Wed, 29 May 2013 13:36:40 +0000 (13:36 +0000)]
Some improvements
eap [Wed, 29 May 2013 13:34:03 +0000 (13:34 +0000)]
0022136 : EDF 2345 SMESH: Improving documentation of Quadrangle mapping with the type "Reduced"
eap [Tue, 28 May 2013 16:51:03 +0000 (16:51 +0000)]
Make ElemEntityType pass nodes through as well
eap [Tue, 28 May 2013 16:49:24 +0000 (16:49 +0000)]
0022108 : EDF 2547 SMESH: Duplicate elements only
+ def DoubleElements(self, theElements, theGroupName=""):
eap [Tue, 28 May 2013 16:49:06 +0000 (16:49 +0000)]
0022108 : EDF 2547 SMESH: Duplicate elements only
Modify UniqueName() to look through all objects (groups, sub-meshes
etc) and not only meshes.
eap [Tue, 28 May 2013 16:47:51 +0000 (16:47 +0000)]
0022108 : EDF 2547 SMESH: Duplicate elements only
eap [Tue, 28 May 2013 16:47:10 +0000 (16:47 +0000)]
0022108 : EDF 2547 SMESH: Duplicate elements only
+ SMESH_Group DoubleElements( in SMESH_IDSource theElements,
+ in string theGroupName )
eap [Tue, 28 May 2013 16:46:20 +0000 (16:46 +0000)]
0022108 : EDF 2547 SMESH: Duplicate elements only
1)
+ SMESH::SMESH_Group_ptr DoubleElements(SMESH::SMESH_IDSource_ptr theElements,
+ const char* theGroupName)
2) set mesh to a filter
+ void prepareIdSource(SMESH::SMESH_IDSource_ptr theObject);