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
Merge branch 'hydro/imps_2015' into V7_dev
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Measurements.cxx
diff --git
a/src/SMESHGUI/SMESHGUI_Measurements.cxx
b/src/SMESHGUI/SMESHGUI_Measurements.cxx
index e00937aff8a58015ab84f83d1597541fb177a03c..4b30659ebe8f87193bf6d16a5a2933b4528793ca 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Measurements.cxx
+++ b/
src/SMESHGUI/SMESHGUI_Measurements.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-36,7
+36,7
@@
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SVTK_ViewWindow.h>
#include <SUIT_OverrideCursor.h>
#include <SUIT_ResourceMgr.h>
#include <SVTK_ViewWindow.h>
-#include <SALOME_ListI
teratorOfListI
O.hxx>
+#include <SALOME_ListIO.hxx>
#include <QButtonGroup>
#include <QGridLayout>
#include <QButtonGroup>
#include <QGridLayout>
@@
-198,6
+198,7
@@
SMESHGUI_MinDistance::SMESHGUI_MinDistance( QWidget* parent )
clear();
//setTarget( FirstTgt );
clear();
//setTarget( FirstTgt );
+ selectionChanged();
}
/*!
}
/*!
@@
-500,13
+501,21
@@
void SMESHGUI_MinDistance::secondEdited()
setTarget( SecondTgt );
if ( sender() == mySecondTgt )
clear();
setTarget( SecondTgt );
if ( sender() == mySecondTgt )
clear();
+ QString text = mySecondTgt->text();
+ if ( !mySecondActor )
+ {
+ selectionChanged();
+ mySecondTgt->setText( text );
+ }
SVTK_Selector* selector = SMESH::GetViewWindow()->GetSelector();
if ( mySecondActor && selector ) {
Handle(SALOME_InteractiveObject) IO = mySecondActor->getIO();
if ( mySecond->checkedId() == NodeTgt || mySecond->checkedId() == ElementTgt ) {
SVTK_Selector* selector = SMESH::GetViewWindow()->GetSelector();
if ( mySecondActor && selector ) {
Handle(SALOME_InteractiveObject) IO = mySecondActor->getIO();
if ( mySecond->checkedId() == NodeTgt || mySecond->checkedId() == ElementTgt ) {
- TColStd_MapOfInteger ID;
- ID.Add( mySecondTgt->text().toLong() );
- selector->AddOrRemoveIndex( IO, ID, false );
+ if ( !text.isEmpty() ) {
+ TColStd_MapOfInteger ID;
+ ID.Add( text.toLong() );
+ selector->AddOrRemoveIndex( IO, ID, false );
+ }
}
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
aViewWindow->highlight( IO, true, true );
}
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow() )
aViewWindow->highlight( IO, true, true );
@@
-519,8
+528,8
@@
void SMESHGUI_MinDistance::secondEdited()
void SMESHGUI_MinDistance::compute()
{
SUIT_OverrideCursor wc;
void SMESHGUI_MinDistance::compute()
{
SUIT_OverrideCursor wc;
- SMESH::
SMESH_
IDSource_wrap s1;
- SMESH::
SMESH_
IDSource_wrap s2;
+ SMESH::IDSource_wrap s1;
+ SMESH::IDSource_wrap s2;
bool isOrigin = mySecond->checkedId() == OriginTgt;
// process first target
bool isOrigin = mySecond->checkedId() == OriginTgt;
// process first target
@@
-760,7
+769,8
@@
void SMESHGUI_BoundingBox::updateSelection()
sourceEdited();
sourceEdited();
- //selectionChanged();
+ if ( mySource->text().isEmpty() )
+ selectionChanged();
}
/*!
}
/*!
@@
-1206,6
+1216,9
@@
void SMESHGUI_BasicProperties::updateSelection()
selMgr->installFilter( myFilter );
connect( selMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( selectionChanged() ) );
selMgr->installFilter( myFilter );
connect( selMgr, SIGNAL( currentSelectionChanged() ), this, SLOT( selectionChanged() ) );
+
+ if ( mySource->text().isEmpty() )
+ selectionChanged();
}
/*!
}
/*!