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
Update translation files from Crowdin
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MakeNodeAtPointDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
index 89034c8a6782b23aa6d4937d66ce61c8dadbc0be..385bb8f1b95adc6bafe8ef53e340946858e53d8f 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-84,6
+84,11
@@
#define SPACING 6
#define MARGIN 11
#define SPACING 6
#define MARGIN 11
+namespace
+{
+ enum { MANUAL_MODE = 0, SEARCH_MODE }; // how a node to move is specified
+}
+
/*!
* \brief Dialog to publish a sub-shape of the mesh main shape
* by selecting mesh elements
/*!
* \brief Dialog to publish a sub-shape of the mesh main shape
* by selecting mesh elements
@@
-437,7
+442,7
@@
void SMESHGUI_MakeNodeAtPointOp::startOperation()
myDlg->myDestDZ->setReadOnly(true);
myDlg->myRButNodeToMove->setChecked(true);
myDlg->myDestDZ->setReadOnly(true);
myDlg->myRButNodeToMove->setChecked(true);
- myDlg->ConstructorsClicked(
GetConstructorId()
);
+ myDlg->ConstructorsClicked(
GetConstructorId()
);
myDlg->show();
myDlg->show();
@@
-469,12
+474,13
@@
void SMESHGUI_MakeNodeAtPointOp::stopOperation()
mySimulation = 0;
}
if ( myMeshActor ) {
mySimulation = 0;
}
if ( myMeshActor ) {
- myMeshActor->SetPointRepresentation(false);
- SMESH::RepaintCurrentView();
myMeshActor = 0;
}
myMeshActor = 0;
}
+ SMESH::SetPointRepresentation( false );
+ SMESH::RepaintCurrentView();
+
disconnect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
disconnect(mySMESHGUI, SIGNAL (SignalActivatedViewManager()), this, SLOT(onOpenView()));
- disconnect(mySMESHGUI, SIGNAL (SignalCloseView()), this, SLOT(onCloseView()));
+ disconnect(mySMESHGUI, SIGNAL (SignalCloseView()),
this, SLOT(onCloseView()));
selectionMgr()->removeFilter( myFilter );
SMESHGUI_SelectionOp::stopOperation();
}
selectionMgr()->removeFilter( myFilter );
SMESHGUI_SelectionOp::stopOperation();
}
@@
-685,6
+691,9
@@
void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
return;
myNoPreview = true;
return;
myNoPreview = true;
+ if ( !myMeshActor && GetConstructorId() == SEARCH_MODE )
+ onSelectionDone();
+
SMESH::MeshPreviewStruct_var aMeshPreviewStruct;
bool moveShown = false;
SMESH::MeshPreviewStruct_var aMeshPreviewStruct;
bool moveShown = false;
@@
-776,7
+785,8
@@
void SMESHGUI_MakeNodeAtPointOp::redisplayPreview()
}
}
}
}
}
}
- }catch (...) {
+ }
+ catch (...) {
}
}
}
}
}
}