Merge from V6_3_BR 06/06/2011

[modules/smesh.git] / src / StdMeshersGUI / StdMeshersGUI_ObjectReferenceParamWdg.cxx

diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index e69489aeb33c3c3fa9ac4786b610383e95e82d5b..da40f732a94b5d874b32991eb971d413d75ed633 100644 (file)
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -1,23 +1,23 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  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
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 // File   : StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -56,10 +56,11 @@
 //================================================================================
 
 StdMeshersGUI_ObjectReferenceParamWdg::StdMeshersGUI_ObjectReferenceParamWdg
-( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection)
+( SUIT_SelectionFilter* f, QWidget* parent, bool multiSelection, bool stretch )
   : QWidget( parent ), myMultiSelection( multiSelection )
 {
   myFilter = f;
+  myStretchActivated = stretch;
   init();
 }
 
@@ -110,6 +111,8 @@ void StdMeshersGUI_ObjectReferenceParamWdg::init()
   mySelectionMgr = SMESH::GetSelectionMgr( mySMESHGUI );
   mySelectionActivated = false;
   myParamValue = "";
+  myEmptyText = "";
+  myEmptyStyleSheet ="";
 
   SUIT_ResourceMgr* mgr = SMESH::GetResourceMgr( mySMESHGUI );
   QPixmap iconSlct ( mgr->loadPixmap("SMESH", tr("ICON_SELECT")));
@@ -120,10 +123,13 @@ void StdMeshersGUI_ObjectReferenceParamWdg::init()
 
   myObjNameLineEdit = new QLineEdit(this);
   myObjNameLineEdit->setReadOnly(true);
+  myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
 
   aHBox->addWidget( mySelButton );
   aHBox->addWidget( myObjNameLineEdit );
-  aHBox->addStretch();
+  if (myStretchActivated){
+    aHBox->addStretch();
+  }
 
   connect( mySelButton, SIGNAL(clicked()), SLOT(activateSelection()));
 }
@@ -147,6 +153,7 @@ void StdMeshersGUI_ObjectReferenceParamWdg::activateSelection()
     connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionDone()));
   }
   emit selectionActivated();
+  onSelectionDone();
 
   mySelButton->setChecked( mySelectionActivated );
 }
@@ -190,7 +197,8 @@ void StdMeshersGUI_ObjectReferenceParamWdg::AvoidSimultaneousSelection
 void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj)
 {
   myObjects.clear();
-  myObjNameLineEdit->setText( "" );
+  myObjNameLineEdit->setText( myEmptyText );
+  myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
   myParamValue = "";
 
   _PTR(SObject) sobj;
@@ -199,8 +207,10 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj)
   if ( sobj ) {
     std::string name = sobj->GetName();
     myObjNameLineEdit->setText( name.c_str() );
+    myObjNameLineEdit->setStyleSheet("");
     myObjects.push_back( CORBA::Object::_duplicate( obj ));
     myParamValue = sobj->GetID().c_str();
+    emit contentModified();
   }
 }
 
@@ -214,9 +224,11 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObject(CORBA::Object_ptr obj)
 void StdMeshersGUI_ObjectReferenceParamWdg::SetObjects(SMESH::string_array_var& objects)
 {
   myObjects.clear();
-  myObjNameLineEdit->setText( "" );
+  myObjNameLineEdit->setText( myEmptyText );
+  myObjNameLineEdit->setStyleSheet(myEmptyStyleSheet);
   myParamValue = "";
-
+  bool selChanged = false;
+  
   for ( unsigned i = 0; i < objects->length(); ++i )
   {
     _PTR(Study) aStudy = SMESH::GetActiveStudyDocument();
@@ -225,15 +237,21 @@ void StdMeshersGUI_ObjectReferenceParamWdg::SetObjects(SMESH::string_array_var&
     if ( !CORBA::is_nil( anObj )) {
       std::string name = aSObj->GetName();
       QString text = myObjNameLineEdit->text();
-      if ( !text.isEmpty() )
+      if ( text != myEmptyText )
         text += " ";
+      else
+        text = "";
       text += name.c_str();
       myObjNameLineEdit->setText( text );
+      myObjNameLineEdit->setStyleSheet("");
       myObjects.push_back( anObj );
       myParamValue += " ";
       myParamValue += objects[i];
+      selChanged = true;
     }
   }
+  if (selChanged)
+    emit contentModified();
 }
 
 //================================================================================
@@ -272,3 +290,11 @@ void StdMeshersGUI_ObjectReferenceParamWdg::onSelectionDone()
     }
   }
 }
+
+void StdMeshersGUI_ObjectReferenceParamWdg::SetDefaultText(QString defaultText, QString styleSheet)
+{
+  myEmptyText = defaultText;
+  myEmptyStyleSheet = styleSheet;
+  myObjNameLineEdit->setText( myEmptyText );
+  myObjNameLineEdit->setStyleSheet( myEmptyStyleSheet);
+}