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
Fix for problem: Preferences-Mesh-General tab: Display modes ?Nodes? and ?Shrink...
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MoveNodesDlg.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
index fba4f187f6718e2bb6dc3948a18232e7b27192d8..944a6d2a9e74540a3696813584dc4563d006c4e5 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
+++ b/
src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
@@
-93,9
+93,7
@@
SMESHGUI_MoveNodesDlg::SMESHGUI_MoveNodesDlg (SMESHGUI* theModule,
theName,
false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
theName,
false,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu),
- mySelector(SMESH::GetViewWindow(theModule)->GetSelector()),
mySelectionMgr(SMESH::GetSelectionMgr(theModule)),
mySelectionMgr(SMESH::GetSelectionMgr(theModule)),
- myViewWindow(SMESH::GetViewWindow(theModule)),
mySMESHGUI(theModule)
{
myPreviewActor = 0;
mySMESHGUI(theModule)
{
myPreviewActor = 0;
@@
-113,6
+111,8
@@
SMESHGUI_MoveNodesDlg::SMESHGUI_MoveNodesDlg (SMESHGUI* theModule,
aDlgLay->setStretchFactor(aMainFrame, 1);
aDlgLay->setStretchFactor(aMainFrame, 1);
+ mySelector = (SMESH::GetViewWindow( mySMESHGUI ))->GetSelector();
+
Init();
}
Init();
}
@@
-153,8
+153,8
@@
QFrame* SMESHGUI_MoveNodesDlg::createMainFrame (QWidget* theParent)
{
QFrame* aFrame = new QFrame(theParent);
{
QFrame* aFrame = new QFrame(theParent);
- QPixmap iconMoveNode (SMESH
GUI::resourceMgr(
)->loadPixmap("SMESH", tr("ICON_DLG_MOVE_NODE")));
- QPixmap iconSelect (SMESH
GUI::resourceMgr(
)->loadPixmap("SMESH", tr("ICON_SELECT")));
+ QPixmap iconMoveNode (SMESH
::GetResourceMgr( mySMESHGUI
)->loadPixmap("SMESH", tr("ICON_DLG_MOVE_NODE")));
+ QPixmap iconSelect (SMESH
::GetResourceMgr( mySMESHGUI
)->loadPixmap("SMESH", tr("ICON_SELECT")));
QButtonGroup* aPixGrp = new QButtonGroup(1, Qt::Vertical, tr("MESH_NODE"), aFrame);
aPixGrp->setExclusive(TRUE);
QButtonGroup* aPixGrp = new QButtonGroup(1, Qt::Vertical, tr("MESH_NODE"), aFrame);
aPixGrp->setExclusive(TRUE);
@@
-230,7
+230,8
@@
void SMESHGUI_MoveNodesDlg::Init()
// set selection mode
SMESH::SetPointRepresentation(true);
// set selection mode
SMESH::SetPointRepresentation(true);
- myViewWindow->SetSelectionMode(NodeSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(NodeSelection);
onSelectionDone();
}
onSelectionDone();
}
@@
-270,7
+271,7
@@
void SMESHGUI_MoveNodesDlg::reset()
//=======================================================================
bool SMESHGUI_MoveNodesDlg::onApply()
{
//=======================================================================
bool SMESHGUI_MoveNodesDlg::onApply()
{
- if (
SMESHGUI::GetSMESHGUI()
->isActiveStudyLocked())
+ if (
mySMESHGUI
->isActiveStudyLocked())
return false;
if (!isValid(true))
return false;
if (!isValid(true))
@@
-323,7
+324,8
@@
void SMESHGUI_MoveNodesDlg::onClose()
{
mySelectionMgr->clearSelected();
SMESH::SetPointRepresentation(false);
{
mySelectionMgr->clearSelected();
SMESH::SetPointRepresentation(false);
- mySelector->SetSelectionMode(ActorSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(ActorSelection);
disconnect(mySelectionMgr, 0, this, 0);
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
disconnect(mySelectionMgr, 0, this, 0);
disconnect(mySMESHGUI, 0, this, 0);
mySMESHGUI->ResetState();
@@
-355,8
+357,11
@@
void SMESHGUI_MoveNodesDlg::onTextChange (const QString& theNewText)
if(const SMDS_MeshElement *anElem = aMesh->FindElement(theNewText.toInt())) {
TColStd_MapOfInteger aListInd;
aListInd.Add(anElem->GetID());
if(const SMDS_MeshElement *anElem = aMesh->FindElement(theNewText.toInt())) {
TColStd_MapOfInteger aListInd;
aListInd.Add(anElem->GetID());
- mySelector->AddOrRemoveIndex(anIO,aListInd, true);
- myViewWindow->highlight(anIO,true,true);
+ mySelector->AddOrRemoveIndex(anIO,aListInd, false);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->highlight(anIO,true,true);
+
+ onSelectionDone();
}
}
}
}
}
}
@@
-417,11
+422,12
@@
void SMESHGUI_MoveNodesDlg::onDeactivate()
void SMESHGUI_MoveNodesDlg::enterEvent (QEvent*)
{
if (!isEnabled()) {
void SMESHGUI_MoveNodesDlg::enterEvent (QEvent*)
{
if (!isEnabled()) {
-
SMESHGUI::GetSMESHGUI()
->EmitSignalDeactivateDialog();
+
mySMESHGUI
->EmitSignalDeactivateDialog();
// set selection mode
SMESH::SetPointRepresentation(true);
// set selection mode
SMESH::SetPointRepresentation(true);
- myViewWindow->SetSelectionMode(NodeSelection);
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->SetSelectionMode(NodeSelection);
redisplayPreview();
redisplayPreview();
@@
-436,7
+442,8
@@
void SMESHGUI_MoveNodesDlg::enterEvent (QEvent*)
void SMESHGUI_MoveNodesDlg::closeEvent (QCloseEvent*)
{
onClose();
void SMESHGUI_MoveNodesDlg::closeEvent (QCloseEvent*)
{
onClose();
- myViewWindow->Repaint();
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ aViewWindow->Repaint();
}
//=======================================================================
}
//=======================================================================
@@
-469,10
+476,13
@@
void SMESHGUI_MoveNodesDlg::erasePreview()
if (myPreviewActor == 0)
return;
if (myPreviewActor == 0)
return;
- myViewWindow->RemoveActor(myPreviewActor);
+ SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
+ if (aViewWindow)
+ aViewWindow->RemoveActor(myPreviewActor);
myPreviewActor->Delete();
myPreviewActor = 0;
myPreviewActor->Delete();
myPreviewActor = 0;
- myViewWindow->Repaint();
+ if (aViewWindow)
+ aViewWindow->Repaint();
}
//=======================================================================
}
//=======================================================================
@@
-546,6
+556,9
@@
void SMESHGUI_MoveNodesDlg::redisplayPreview()
myPreviewActor->SetProperty(aProp);
aProp->Delete();
myPreviewActor->SetProperty(aProp);
aProp->Delete();
- myViewWindow->AddActor(myPreviewActor);
- myViewWindow->Repaint();
+ if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
+ {
+ aViewWindow->AddActor(myPreviewActor);
+ aViewWindow->Repaint();
+ }
}
}