Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
restoring fam with old id
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MeshPatternDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
old mode 100755
(executable)
new mode 100644
(file)
index
d2f545b
..
aabcb60
--- a/
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-475,7
+475,7
@@
bool SMESHGUI_MeshPatternDlg::onApply()
aParameters << myNode1->text();
if(myType == Type_3d )
aParameters << myNode2->text();
aParameters << myNode1->text();
if(myType == Type_3d )
aParameters << myNode2->text();
- myMesh->SetParameters( aParameters.join(":").to
Latin1
().constData() );
+ myMesh->SetParameters( aParameters.join(":").to
Utf8
().constData() );
}
QList<int> ids;
getIds(ids);
}
QList<int> ids;
getIds(ids);
@@
-550,6
+550,7
@@
void SMESHGUI_MeshPatternDlg::onOk()
void SMESHGUI_MeshPatternDlg::reject()
{
mySelectionMgr->clearFilters();
void SMESHGUI_MeshPatternDlg::reject()
{
mySelectionMgr->clearFilters();
+ mySelInput = Mesh;
SMESH::SetPickable();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
SMESH::SetPickable();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
@@
-1149,7
+1150,7
@@
bool SMESHGUI_MeshPatternDlg::loadFromFile (const QString& theName)
try {
SMESH::SMESH_Pattern_var aPattern = SMESH::GetPattern();
try {
SMESH::SMESH_Pattern_var aPattern = SMESH::GetPattern();
- if (!aPattern->LoadFromFile(theName.to
Latin1
().data()) ||
+ if (!aPattern->LoadFromFile(theName.to
Utf8
().data()) ||
(myType == Type_2d && !aPattern->Is2D())) {
SMESH::SMESH_Pattern::ErrorCode aCode = aPattern->GetErrorCode();
QString aMess;
(myType == Type_2d && !aPattern->Is2D())) {
SMESH::SMESH_Pattern::ErrorCode aCode = aPattern->GetErrorCode();
QString aMess;
@@
-1343,7
+1344,8
@@
vtkUnstructuredGrid* SMESHGUI_MeshPatternDlg::getGrid()
aCellLocationsArray->SetNumberOfTuples(aNbCells);
aConnectivity->InitTraversal();
aCellLocationsArray->SetNumberOfTuples(aNbCells);
aConnectivity->InitTraversal();
- for (vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell(npts, pts); idType++)
+ vtkIdType const *pts(nullptr);
+ for (vtkIdType idType = 0, npts; aConnectivity->GetNextCell(npts, pts); idType++)
aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));
aGrid->SetPoints(aPoints);
aCellLocationsArray->SetValue(idType, aConnectivity->GetTraversalLocation(npts));
aGrid->SetPoints(aPoints);