STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 5)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
# Find KERNEL
# ===========
underlying geometrical edge. <b>"Reverse Edges"</b> list box allows to
specify the edges for which the splitting should be made in the
direction opposing to their orientation. This list box is enabled only
-if the geometry object is selected for the meshing. In this case the
-user can select edges to be reversed either by directly picking them
+if the geometry object is selected for the meshing. In this case it is
+possible to select edges to be reversed either by directly picking them
in the 3D viewer or by selecting the edges or groups of edges in the
Object Browser.
pairs <b>t - F(t)</b>, where \b t ranges from 0 to 1, and the module computes the
formula, which will rule the change of length of segments and shows
in the plot the density function curve in red and the node
-distribution as blue crosses. The node distribution is computed the
+distribution as blue crosses. The node distribution is computed in the
same way as for
\ref analyticdensity_anchor "Distribution with Analytic Density". You
can select the <b>Conversion mode</b> from\b Exponent and <b>Cut
The direction of the splitting is defined by the orientation of the
underlying geometrical edge. <b>"Reverse Edges"</b> list box allows to
-specify the edges for which the splitting should be made in the
+specify the edges, for which the splitting should be made in the
direction opposing to their orientation. This list box is enabled only
-if the geometry object is selected for the meshing. In this case the
-user can select edges to be reversed either by directly picking them
+if the geometry object is selected for the meshing. In this case it is
+possible to select edges to be reversed either by directly picking them
in the 3D viewer or by selecting the edges or groups of edges in the
Object Browser.
Hexahedral, Tetrahedral, Triangular </b> and \b Quadrilateral (there
can be less items for the geometry of lower dimensions).
- Selection of a mesh type hides all meshing algorithms that can not
+ Selection of a mesh type hides all meshing algorithms that cannot
generate elements of this type.</li>
<li>Apply \subpage basic_meshing_algos_page "meshing algorithms" and
List of sets of hypotheses. Tag <em>[custom]</em> is
automatically added to the sets defined by the user.
- \note \a Automatic in the names of pre-defined sets of
- hypotheses means only that initially \ref
- automatic_length_anchor "Automatic Length" hypothesis was
- included in these sets, and not that these sets are suitable for
+ \note \a "Automatic" in the names of predefined sets of
+ hypotheses came from previous versions of SALOME where
+ \ref automatic_length_anchor "Automatic Length" hypothesis
+ was included in these sets, and not that these sets are suitable for
meshing any geometry.
</li>
</ol>
object, that allows getting a local mesh refinement.
A sub-shape to create a sub-mesh on should be retrieved from the shape
-of the parent mesh one of the following ways: <ul>
+of the parent mesh
in one of the following ways: <ul>
<li> In Geometry module, via <em>New Entity > Explode</em> menu.</li>
<li> In Geometry module, by creation of a group (<em>New Entity >
Group > Create Group</em> menu).</li>
Viewer.
Instead of picking an element in the Viewer, you can type its
ID in <b> Element ID</b> field.
-<b> Geometry name </b> field allows defining a name of the sub-shape
+<b> Geometry name </b> field allows defining a name of the sub-shape,
with which the sub-shape will appear in the Object Browser (if not yet
there).
</ul>
In the <b>manual edition</b> mode you can
<ul>
-<li>click the \b Remove button to remove the selected list items from
+<li>click the \b Remove button to remove the selected items from
the list.</li>
<li>click the <b>Sort List</b> button to sort the list of IDs of
mesh elements.</li>
\image html display_entity_choose_item.png Item to call 'Display Entity' dialog box
-and <b>Display Entity</b> dialog box will provide a way to display only some entities at first display instead of displaying all entities long time.
+and <b>Display Entity</b> dialog box will provide a way to display only some entities at the first display instead of displaying all entities, which can take a long time.
\image html display_entity_dlg.png 'Display Entity' dialog allows to select entities before displaying
-\note This menu item is available from popup menu in both Object browser and 3D viewer.
+\note This menu item is available from the context menu in both Object browser and 3D viewer.
*/
\ No newline at end of file
The created flat volumes (or faces) are stored in groups. These groups are named
according to the position of the group in the list of groups: group
"j_n_p" is a group of flat elements that are built between the group \#n
- and the group \#p in the group list. All the flat elements are gathered
- into the group named "joints3D" (correspondingly "joints2D"). The flat element of the multiple
+ and the group \#p in the group list. All flat elements are gathered
+ into the group named "joints3D" (correspondingly "joints2D"). The flat elements of multiple
junctions between the simple junction are stored in a group named
"jointsMultiples".</li>
<li> If <b>On all boundaries</b> option is activated, the volumes (or faces),
+++ /dev/null
-/*!
-
-\page renumbering_nodes_and_elements_page Renumbering nodes and elements
-
-\n In MESH you can renumber the nodes and elements of your mesh.
-
-<ul>
-<li>\ref renumbering_nodes_anchor "Nodes"</li>
-<li>\ref renumbering_elements_anchor "Elements"</li>
-</ul>
-
-<br>
-\anchor renumbering_nodes_anchor
-<h2>Renumbering nodes</h2>
-
-<em>To renumber the nodes of your mesh:</em>
-<ol>
-<li>In the \b Modification menu select \b Renumbering submenu and
-choose the \b Nodes item or click <em>"Renumbering nodes"</em> button
-in the toolbar.
-
-\image html image63.png
-<center><em>"Renumbering nodes" button</em></center>
-
-The following dialog box will appear:
-
-\image html renumbernodes.png
-</li>
-
-<li>Fill the \b Mesh field by selecting your mesh in the Object
-Browser or in the 3D viewer.</li>
-<li>Click the \b Apply or <b>Apply and Close</b> button to perform the operation.</li>
-</ol>
-
-<br>
-\anchor renumbering_elements_anchor
-<h2>Renumbering elements</h2>
-
-<em>To renumber the elements of your mesh:</em>
-<ol>
-<li>In the \b Modification menu select \b Renumbering submenu and
-choose the \b Elements item or click <em>"Renumbering elements"</em>
-button in the toolbar.
-
-\image html image64.png
-<center><em>"Renumbering elements" button</em></center>
-
-The following dialog box will appear:
-
-\image html renumberelements.png
-</li>
-
-<li>Fill the \b Mesh field by selecting your mesh in the Object
-Browser or in the 3D viewer.</li>
-<li>Click the \b Apply or <b>Apply and Close</b> button to perform the operation.</li>
-</ol>
-
-<br><b>See Also</b> a sample TUI Script of a
-\ref tui_renumbering_nodes_and_elements "Renumbering Nodes and Elements" operation.
-
-*/
\ No newline at end of file
\page reorient_faces_page Reorient faces
-\n This operation allows changing orientation of faces two ways.
-<ol>
-<li> To reorient a set of neighboring faces by defining the desired
- orientation by a vector. <br> Since the direction of face normals in
+\n This operation allows changing the orientation of a set faces in the following ways:
+<ul>
+<li>The new orientation of a set of neighboring faces can be defined
+ by a vector. <br> Since the direction of face normals in
the set can be even opposite, it is necessary to specify a control
- face whose normal will be compared with the vector. This face can be
- either <ul>
- <li> found by proximity to a given point or </li>
- <li> specified explicitly. </li>
-</ul> </li>
-<li> To reorient faces with relation to adjacent volumes. </li>
-</ol>
+ face, the normal to which will be compared with the vector. This face can be
+ either:
+ <ul>
+ <li>found by proximity to a given point, or</li>
+ <li>specified explicitly.</li>
+ </ul>
+</li>
+<li>Alternatively, the faces can be oriented relatively to the adjacent volumes.</li>
+</ul>
-Orientation of a face is changed by reverting the order of its nodes.
+The orientation of a face is changed by reverting the order of its nodes.
<em>To change orientation of faces:</em>
<ol>
\image html reorient_faces_face.png
<em>"Reorient faces" button</em>
</center>
+</li>
-The following dialog box will appear:
-
-<center>
-\image html reorient_2d_point.png "First mode: to reorient adjacent faces according to a vector. The control face is found by point."
-<br>
-\image html reorient_2d_face.png "Second mode: to reorient adjacent faces according to a vector. The control face is explicitly given."
-<br>
-\image html reorient_2d_volume.png "Third mode: to reorient faces with relation to adjacent volumes."
-</center>
+<li>In the "Reorient faces" dialog box
-<li>In this dialog
<ul>
-<li>Specify either of the tree operation modes.</li>
<li>Select the \b Object (mesh, sub-mesh or group)
containing faces to reorient, in the Object Browser or in the 3D
Viewer.</li>
-<li>To reorient according to vector: <ul>
+
+<li>To reorient according to vector:
+ <ul>
<li>Specify the coordinates of the \b Point by which the control face
- will be found or the control \b Face itself. You can easy specify the \b
+ will be found. You can easy specify the \b
Point by either picking a node in the 3D Viewer or selecting a vertex
in the Object Browser. It is possible to pick the \b Face by mouse in
the 3D Viewer or enter its ID.</li>
control face. If you pick a node in the 3D Viewer then the \b Direction
vector will go from the coordinate system origin to the selected node.
If you pick two nodes (holding Shift button) then the \b Direction vector
- will go from the first to the second node.</li> </ul> </li>
-<li>To reorient according to volumes: <ul>
+ will go from the first to the second node.</li>
+ </ul>
+
+<br>
+<center>
+\image html reorient_2d_point.png "The orientation of adjacent faces is chosen according to a vector. The control face is found by point."
+</center>
+
+</li>
+
+<li>In the second mode it is possible to directly input the \b Face ID in the corresponding field.
+
+<center>
+\image html reorient_2d_face.png "The orientation of adjacent faces is chosen according to a vector. The control face is explicitly given."
+</center>
+
+</li>
+
+<li>In the third mode, the faces can be reoriented according to volumes:
+ <ul>
<li>Select an object (mesh, sub-mesh or group) containing
reference \b Volumes, in the Object Browser or in the 3D
Viewer.</li>
<li>Specify whether face normals should point outside or inside
the reference volumes using <b>Face normal outside volume</b>
- check-box.</li></ul> </li>
-</ul>
+ check-box.</li>
+ </ul>
+
+<br>
+<center>
+\image html reorient_2d_volume.png "The orientation of faces is chosen with relation to adjacent volumes."
+</center>
+
</li>
+</ul>
<li>Click the \b Apply or <b>Apply and Close</b> button to confirm the operation.</li>
</ol>
# header files / no moc processing
SET(SMDS_HEADERS
- chrono.hxx
ObjectPool.hxx
SMDS_TypeOfPosition.hxx
SMDSAbs_ElementType.hxx
#include "SMDS_MeshVolume.hxx"
#include "utilities.h"
+#include "chrono.hxx"
#include <vtkCellArray.h>
#include <vtkCellData.h>
#include <vtkUnstructuredGrid.h>
#include <vtkCellLinks.h>
-#include "chrono.hxx"
#include <vector>
#include <set>
_segmentation = _nbSegments = 10;
SMDS_Mesh::_meshList.clear();
MESSAGE(SMDS_Mesh::_meshList.size());
- //_counters = new counters(100);
_compute_canceled = false;
_sm_current = NULL;
//vtkDebugLeaks::SetExitError(0);
#include "SMESH_Algo.hxx"
#include "SMESH_Mesh.hxx"
-#include "chrono.hxx"
-
#include <TopoDS_Shape.hxx>
#include <map>
// default number of segments
int _nbSegments;
- counters *_counters;
-
volatile bool _compute_canceled;
SMESH_subMesh* _sm_current;
};
#include <Basics_OCCTVersion.hxx>
#include "utilities.h"
+#include "chrono.hxx"
#include <BRepAdaptor_Surface.hxx>
#include <BRepBuilderAPI_MakeEdge.hxx>
_PTR(Study) study = appStudy->studyDS();
_PTR(SObject) obj = study->FindObjectID( io->getEntry() );
if ( obj ) {
- QString aName = QString( QString::fromUtf8(obj->GetName().c_str()) );
+ QString aName = QString( SMESH::fromUtf8(obj->GetName()) );
while ( aName.at( aName.length() - 1 ) == ' ' ) // Remove extraspaces in Name of Popup
aName.remove( (aName.length() - 1), 1 );
title = aName;
_PTR(SObject) obj = study->FindObjectID( entry.toLatin1().constData() );
QString name;
if ( obj )
- name = QString::fromUtf8(obj->GetName().c_str());
+ name = SMESH::fromUtf8(obj->GetName());
if ( name.isEmpty() )
return;
bool isUnique = false;
while (!isUnique) {
aName = theOperation + "_" + QString::number(++aNumber);
- isUnique = (aSet.count(aName.toUtf8().data()) == 0);
+ isUnique = (aSet.count(std::string(SMESH::toUtf8(aName))) == 0);
}
return aName;
do
{
aResName = aPrefix + QString::number( i++ );
- anObj = aStudy->FindObject( aResName.toUtf8().data() );
+ anObj = aStudy->FindObject( SMESH::toUtf8(aResName) );
}
while ( anObj );
myName->setText(aResName);
myNameChanged = true;
myName->blockSignals(true);
- myName->setText(QString::fromUtf8(theGroup->GetName()));
+ myName->setText(SMESH::fromUtf8(theGroup->GetName()));
myName->blockSignals(false);
myName->home(false);
SALOMEDS::Color aColor = theGroup->GetColor();
setGroupColor( aColor );
- myMeshGroupLine->setText(QString::fromUtf8(theGroup->GetName()));
+ myMeshGroupLine->setText(SMESH::fromUtf8(theGroup->GetName()));
int aType = 0;
switch(theGroup->GetType()) {
{
myNameChanged = true;
myName->blockSignals(true);
- myName->setText(QString::fromUtf8(theGroup->GetName()));
+ myName->setText(SMESH::fromUtf8(theGroup->GetName()));
myName->blockSignals(false);
}
if (myGeomObjects->length() == 1) {
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
- myName->text().toUtf8().data(),
+ SMESH::toUtf8(myName->text()),
myGeomObjects[0]);
}
else {
aNewGeomGroupName += myName->text();
SALOMEDS::SObject_var aNewGroupSO =
geomGen->AddInStudy(aSMESHGen->GetCurrentStudy(), aGroupVar,
- aNewGeomGroupName.toUtf8().data(), aMeshShape);
+ SMESH::toUtf8(aNewGeomGroupName), aMeshShape);
}
myGroupOnGeom = myMesh->CreateGroupFromGEOM(aType,
- myName->text().toUtf8().data(),
+ SMESH::toUtf8(myName->text()),
aGroupVar);
}
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnGeom );
return false;
myGroupOnFilter = myMesh->CreateGroupFromFilter(aType,
- myName->text().toUtf8().data(),
+ SMESH::toUtf8(myName->text()),
myFilter);
resultGroup = SMESH::SMESH_GroupBase::_narrow( myGroupOnFilter );
}
else
{
- resultGroup->SetName(myName->text().toUtf8().data());
+ resultGroup->SetName(SMESH::toUtf8(myName->text()));
if ( aMeshGroupSO )
{
if ( !anActor ) return false;
myActorsList.append( anActor );
}
- anActor->setName(myName->text().toUtf8().data());
+ anActor->setName(SMESH::toUtf8(myName->text()));
QColor c;
int delta;
switch ( myTypeId ) {
SMESH::SMESH_Group_var aGroup;
try {
if ( !theMesh->_is_nil() )
- aGroup = theMesh->CreateGroup( theType, theGroupName.toUtf8().data() );
+ aGroup = theMesh->CreateGroup( theType, SMESH::toUtf8(theGroupName) );
}
catch( const SALOME::SALOME_Exception& S_ex ) {
SalomeApp_Tools::QtCatchCorbaException( S_ex );
#include CORBA_SERVER_HEADER(SMESH_Group)
+//VSR: uncomment below macro to support unicode text properly in SALOME
+// current commented out due to regressions
+//#define PAL22528_UNICODE
+
namespace SMESH
{
SUIT_Desktop*
return n;
}
+ QString fromUtf8( const char* txt )
+ {
+#ifdef PAL22528_UNICODE
+ return QString::fromUtf8( txt );
+#else
+ return QString( txt );
+#endif
+ }
+
+ QString fromUtf8( const std::string& txt )
+ {
+ return fromUtf8( txt.c_str() );
+ }
+
+ const char* toUtf8( const QString& txt )
+ {
+#ifdef PAL22528_UNICODE
+ return txt.toUtf8().constData();
+#else
+ return txt.toLatin1().constData();
+#endif
+ }
+
} // end of namespace SMESH
toStdStr( char* s ): toStrT< std::string >(s) {}
};
+ QString fromUtf8( const char* txt );
+ QString fromUtf8( const std::string& txt );
+ const char* toUtf8( const QString& txt );
}
#endif // SMESHGUI_UTILS_H
</message>
<message>
<source>MEN_CHOOSE</source>
- <translation type="unfinished">Choose...</translation>
+ <translation>Choisir...</translation>
</message>
<message>
<source>MEN_EDIT</source>
<name>SMESHGUI_DisplayEntitiesDlg</name>
<message>
<source>WRN_AT_LEAST_ONE</source>
- <translation type="unfinished">At least one entity type should be chosen!</translation>
+ <translation>Au moins une entité devrait être choisie!</translation>
</message>
</context>
</TS>
<translation>エッジ</translation>
</message>
<message>
- <source>MEN_CHOOSE</source>
- <translation type="unfinished">Choose...</translation>
+ <source>MEN_CHOOSE</source>
+ <translation type="unfinished">Choose...</translation>
</message>
<message>
<source>MEN_EDIT</source>
</message>
<message>
<source>ID</source>
- <translation>ID</translation>
+ <translation type="unfinished">ID</translation>
</message>
<message>
<source>INSERT</source>
<source>ORIENTATION</source>
<translation>方向</translation>
</message>
+ <message>
+ <source>VOLUMES</source>
+ <translation type="unfinished">Volumes</translation>
+ </message>
+ <message>
+ <source>OUTSIDE_VOLUME_NORMAL</source>
+ <translation type="unfinished">Face normal outside volume</translation>
+ </message>
</context>
<context>
<name>SMESHGUI_ReorientFacesOp</name>
<source>NO_OBJECT_SELECTED</source>
<translation>選択したオブジェクトがありません。</translation>
</message>
+ <message>
+ <source>NO_VOLUME_OBJECT_SELECTED</source>
+ <translation type="unfinished">No volume object selected</translation>
+ </message>
<message>
<source>NO_FACES</source>
<translation>オブジェクトに顔が含まれていません。</translation>
</message>
+ <message>
+ <source>NO_VOLUMES</source>
+ <translation type="unfinished">Volume object includes no volumes</translation>
+ </message>
<message>
<source>ZERO_SIZE_VECTOR</source>
<translation>サイズがゼロのベクター</translation>
<source>TO_IGNORE_FACES</source>
<translation>レイヤ（入出口）を伴わない面</translation>
</message>
+ <message>
+ <source>BAD_FACES_WARNING</source>
+ <translation type="unfinished">
+Specified faces are not sub-shapes of the shape of
+mesh/sub-mesh.
+Consider creating another hypothesis instead of using
+this one for this mesh/sub-mesh.</translation>
+ </message>
+ <message>
+ <source>BAD_EDGES_WARNING</source>
+ <translation type="unfinished">
+Specified edges are not sub-shapes of the shape of
+mesh/sub-mesh.
+Consider creating another hypothesis instead of using
+this one for this mesh/sub-mesh.</translation>
+ </message>
</context>
<context>
<name>@default</name>
