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
23121: EDF 11163 SMESH: Orphan node generated on a 3D mesh
[modules/smesh.git]
/
src
/
StdMeshersGUI
/
StdMeshersGUI_ObjectReferenceParamWdg.cxx
diff --git
a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 1466fc8b681e3b6d82d6c2b8d4b4ae928d7bb13d..70abfea101ef17fd7fc419087a450a72a62d1ac3 100644
(file)
--- a/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/
src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
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
@@
-6,7
+6,7
@@
// 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
@@
-35,7
+35,6
@@
#include <LightApp_SelectionMgr.h>
#include <SVTK_ViewWindow.h>
#include <SALOME_ListIO.hxx>
#include <LightApp_SelectionMgr.h>
#include <SVTK_ViewWindow.h>
#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
// SALOME KERNEL incldues
#include <SALOMEDSClient_SObject.hxx>
// SALOME KERNEL incldues
#include <SALOMEDSClient_SObject.hxx>
@@
-56,11
+55,12
@@
//================================================================================
StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
//================================================================================
StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
-( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection, bool stretch )
+( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection
+ /*, bool stretch */)
: QWidget( parent ), myMultiSelection( multiSelection )
{
myFilter = f;
: QWidget( parent ), myMultiSelection( multiSelection )
{
myFilter = f;
- myStretchActivated = stretch;
+
//
myStretchActivated = stretch;
init();
}
init();
}
@@
-124,12
+124,13
@@
void StdMeshersGUI_ObjectReferenceParamWdg::init()
myObjNameLineEdit = new QLineEdit(this);
myObjNameLineEdit->setReadOnly(true);
myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
myObjNameLineEdit = new QLineEdit(this);
myObjNameLineEdit->setReadOnly(true);
myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
+ myObjNameLineEdit->setMinimumWidth(150);
aHBox->addWidget( mySelButton );
aHBox->addWidget( myObjNameLineEdit );
aHBox->addWidget( mySelButton );
aHBox->addWidget( myObjNameLineEdit );
- if (myStretchActivated){
- aHBox->addStretch();
- }
+
//
if (myStretchActivated){
+
//
aHBox->addStretch();
+
//
}
connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection()));
}
connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection()));
}
@@
-210,8
+211,8
@@
void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj)
myObjNameLineEdit->setStyleSheet("");
myObjects.push_back( CORBA::Object::_duplicate( obj ));
myParamValue = sobj->GetID().c_str();
myObjNameLineEdit->setStyleSheet("");
myObjects.push_back( CORBA::Object::_duplicate( obj ));
myParamValue = sobj->GetID().c_str();
- emit contentModified();
}
}
+ emit contentModified();
}
//================================================================================
}
//================================================================================