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
regression with bos #24400 [CEA] Option in SALOME for not storing in med files the...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MakeNodeAtPointDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
index cd5a89ff5c3de644c2369612222b06d3cde59c82..6b1b7c140536d60458a4a51493944ce053323d47 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-355,7
+355,7
@@
SMESHGUI_MakeNodeAtPointOp::SMESHGUI_MakeNodeAtPointOp()
mySMESHGUI = 0;
myDlg = new SMESHGUI_MakeNodeAtPointDlg;
myFilter = 0;
mySMESHGUI = 0;
myDlg = new SMESHGUI_MakeNodeAtPointDlg;
myFilter = 0;
- myHelpFileName = "mesh_through_point
_page
.html";
+ myHelpFileName = "mesh_through_point.html";
myNoPreview = false;
myUpdateDestination = false;
myNoPreview = false;
myUpdateDestination = false;
@@
-528,14
+528,14
@@
bool SMESHGUI_MakeNodeAtPointOp::onApply()
if (aMeshEditor->_is_nil())
return true;
if (aMeshEditor->_is_nil())
return true;
- aMesh->SetParameters( aParameters.join(":").to
Latin1
().constData() );
+ aMesh->SetParameters( aParameters.join(":").to
Utf8
().constData() );
bool ok;
int anId = myDlg->myId->text().toInt( &ok );
if( !ok || anId < 1 )
bool ok;
int anId = myDlg->myId->text().toInt( &ok );
if( !ok || anId < 1 )
- anId = aMeshEditor->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
- myDlg->myDestinationY->GetValue(),
-
myDlg->myDestinationZ->GetValue(
));
+ anId =
FromSmIdType<int>(
aMeshEditor->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
+
myDlg->myDestinationY->GetValue(),
+
myDlg->myDestinationZ->GetValue()
));
int aResult = aMeshEditor->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
int aResult = aMeshEditor->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
@@
-770,9
+770,9
@@
void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
myDlg->myDestDZ->setReadOnly(true);
}
if ( isPreview && isMoveNode && anId == 0 )
myDlg->myDestDZ->setReadOnly(true);
}
if ( isPreview && isMoveNode && anId == 0 )
- anId = aPreviewer->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
- myDlg->myDestinationY->GetValue(),
-
myDlg->myDestinationZ->GetValue(
));
+ anId =
FromSmIdType<int>(
aPreviewer->FindNodeClosestTo(myDlg->myDestinationX->GetValue(),
+
myDlg->myDestinationY->GetValue(),
+
myDlg->myDestinationZ->GetValue()
));
// find id and/or just compute preview
aPreviewer->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
// find id and/or just compute preview
aPreviewer->MoveNode(anId,
myDlg->myDestinationX->GetValue(),
@@
-811,9
+811,9
@@
void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
if (!mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
// display data
if (!mySimulation)
mySimulation = new SMESHGUI_MeshEditPreview(SMESH::GetViewWindow( mySMESHGUI ));
// display data
- if (
aMeshPreviewStruct.operator->
() )
+ if (
& aMeshPreviewStruct.in
() )
{
{
- mySimulation->SetData(
aMeshPreviewStruct._retn()
);
+ mySimulation->SetData(
aMeshPreviewStruct.in()
);
}
else
{
}
else
{
@@
-869,8
+869,8
@@
void SMESHGUI_MakeNodeAtPointOp::onTextChange( const QString& theText )
if( const SMDS_MeshNode* aNode = aMesh->FindNode( theText.toInt() ) )
{
if( const SMDS_MeshNode* aNode = aMesh->FindNode( theText.toInt() ) )
{
-
TColStd_MapOfInteger
aListInd;
- aListInd.Add(
aNode->GetID(
) );
+
SVTK_TVtkIDsMap
aListInd;
+ aListInd.Add(
FromSmIdType<int>(aNode->GetID()
) );
selector()->AddOrRemoveIndex( anIO, aListInd, false );
if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ) )
aViewWindow->highlight( anIO, true, true );
selector()->AddOrRemoveIndex( anIO, aListInd, false );
if( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( SMESHGUI::GetSMESHGUI() ) )
aViewWindow->highlight( anIO, true, true );