Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_LCM_COMP' into HEAD
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ObjSelector.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ObjSelector.cxx
b/src/HYDROGUI/HYDROGUI_ObjSelector.cxx
index f3b0ae6992d5880c8b7742f0d54f0a457110343d..22e672da603a64ccce5663000f0202a2fb3dc874 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ObjSelector.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ObjSelector.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-26,6
+22,8
@@
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
#include "HYDROGUI_Module.h"
#include "HYDROGUI_Tool.h"
+#include <HYDROData_PolylineXY.h>
+
#include <GraphicsView_Object.h>
#include <LightApp_Application.h>
#include <GraphicsView_Object.h>
#include <LightApp_Application.h>
@@
-41,10
+39,12
@@
HYDROGUI_ObjSelector::HYDROGUI_ObjSelector( HYDROGUI_Module* theModule,
const ObjectKind theObjectKind,
HYDROGUI_ObjSelector::HYDROGUI_ObjSelector( HYDROGUI_Module* theModule,
const ObjectKind theObjectKind,
- QWidget* theParent )
+ QWidget* theParent,
+ const int theObjectFlags)
: QAbstractButton( theParent ),
myObjectKind( theObjectKind ),
: QAbstractButton( theParent ),
myObjectKind( theObjectKind ),
- myModule( theModule )
+ myModule( theModule ),
+ myObjectFlags( theObjectFlags )
{
QHBoxLayout* aLayout = new QHBoxLayout( this );
aLayout->setMargin( 0 );
{
QHBoxLayout* aLayout = new QHBoxLayout( this );
aLayout->setMargin( 0 );
@@
-103,7
+103,16
@@
void HYDROGUI_ObjSelector::OnSelectionChanged()
if( !anObject.IsNull() )
if( myObjectKind == KIND_UNKNOWN || myObjectKind == anObject->GetKind() )
{
if( !anObject.IsNull() )
if( myObjectKind == KIND_UNKNOWN || myObjectKind == anObject->GetKind() )
{
- anObjName = anObject->GetName();
+ if ( myObjectKind == KIND_POLYLINEXY && ( myObjectFlags & ClosedPolyline ) ) {
+ // check if the polyline is closed
+ Handle(HYDROData_PolylineXY) aPolylineObj =
+ Handle(HYDROData_PolylineXY)::DownCast( anObject );
+ if ( !aPolylineObj.IsNull() && aPolylineObj->IsClosed() ) {
+ anObjName = aPolylineObj->GetName();
+ }
+ } else {
+ anObjName = anObject->GetName();
+ }
// Check if the same object has not been selected in other selectors of the same parent widget.
if ( !anObjName.isEmpty() )
// Check if the same object has not been selected in other selectors of the same parent widget.
if ( !anObjName.isEmpty() )
@@
-127,6
+136,7
@@
void HYDROGUI_ObjSelector::OnSelectionChanged()
void HYDROGUI_ObjSelector::SetName( const QString& theName )
{
myObjName->setText( theName );
void HYDROGUI_ObjSelector::SetName( const QString& theName )
{
myObjName->setText( theName );
+ emit selectionChanged();
}
QString HYDROGUI_ObjSelector::GetName() const
}
QString HYDROGUI_ObjSelector::GetName() const