X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshersGUI%2FStdMeshersGUI_ObjectReferenceParamWdg.cxx;h=dc25d6e4fcbddfce344f99230a8cf504d29b425b;hp=1efeb01621c3959b987576933abbdd42feea899b;hb=20d9e162bd67182cbfa841bbfc9319919f4703e3;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx index 1efeb0162..dc25d6e4f 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -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 -// 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 @@ -35,7 +35,6 @@ #include #include #include -#include // SALOME KERNEL incldues #include @@ -56,11 +55,10 @@ //================================================================================ StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg -( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection, bool stretch ) +( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection : QWidget( parent ), myMultiSelection( multiSelection ) { myFilter = f; - myStretchActivated = stretch; init(); } @@ -72,12 +70,13 @@ StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg //================================================================================ StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg -( MeshObjectType objType, QWidget* parent, bool multiSelection ) +( SMESH::MeshObjectType objType, QWidget* parent, bool multiSelection ) : QWidget( parent ), myMultiSelection( multiSelection ) { myFilter = new SMESH_TypeFilter( objType ); init(); } + //================================================================================ /*! * \brief Destructor @@ -93,7 +92,6 @@ StdMeshersGUI_ObjectReferenceParamWdg::~StdMeshersGUI_ObjectReferenceParamWdg() } } - //================================================================================ /*! * \brief Create a leayout, initialize fields @@ -124,12 +122,10 @@ void StdMeshersGUI_ObjectReferenceParamWdg::init() myObjNameLineEdit = new QLineEdit(this); myObjNameLineEdit->setReadOnly(true); myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet); + myObjNameLineEdit->setMinimumWidth(150); aHBox->addWidget( mySelButton ); aHBox->addWidget( myObjNameLineEdit ); - if (myStretchActivated){ - aHBox->addStretch(); - } connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection())); } @@ -210,8 +206,8 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj) myObjNameLineEdit->setStyleSheet(""); myObjects.push_back( CORBA::Object::_duplicate( obj )); myParamValue = sobj->GetID().c_str(); - emit contentModified(); } + emit contentModified(); } //================================================================================