From: jfa <jfa@opencascade.com>
Date: Thu, 16 Dec 2010 08:15:45 +0000 (+0000)
Subject: Mantis issue 0020939: To have in the GUI the function GetSharedShapes().
X-Git-Tag: V6_2_0a2~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d93b998d309a0f6d4455316be5c3fa90c8a51874;p=modules%2Fgeom.git

Mantis issue 0020939: To have in the GUI the function GetSharedShapes().
---

diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
index fae221528..2d483cae7 100644
--- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.cxx
@@ -129,7 +129,8 @@ void OperationGUI_GetSharedShapesDlg::Init()
   connect(myGeomGUI->getApp()->selectionMgr(),
            SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
-  initName(getNewObjectName());
+  //initName(getNewObjectName());
+  initName(getPrefixByType());
 
   ConstructorsClicked(0);
   GroupPoints->PushButton1->click();
@@ -181,7 +182,8 @@ bool OperationGUI_GetSharedShapesDlg::ClickOnApply()
   if (!onAccept())
     return false;
 
-  initName(getNewObjectName());
+  //initName(getNewObjectName());
+  initName(getPrefixByType());
 
   return true;
 }
@@ -261,7 +263,8 @@ void OperationGUI_GetSharedShapesDlg::enterEvent(QEvent*)
 //=======================================================================
 void OperationGUI_GetSharedShapesDlg::ComboTextChanged()
 {
-  initName(getNewObjectName());
+  //initName(getNewObjectName());
+  initName(getPrefixByType());
 }
 
 //=================================================================================
@@ -319,6 +322,9 @@ bool OperationGUI_GetSharedShapesDlg::execute (ObjectList& objects)
   if (!aList->length())
     return false;
 
+  if (aList->length() > 1)
+    myMainFrame->ResultName->setText(getPrefixByType());
+
   for (int i = 0, n = aList->length(); i < n; i++)
     objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i]));
 
@@ -339,24 +345,24 @@ GEOM::GEOM_Object_ptr OperationGUI_GetSharedShapesDlg::getFather (GEOM::GEOM_Obj
 }
 
 //================================================================
-// Function : getNewObjectName
+// Function : getPrefixByType
 // Purpose  :
 //================================================================
-QString OperationGUI_GetSharedShapesDlg::getNewObjectName() const
+QString OperationGUI_GetSharedShapesDlg::getPrefixByType () const
 {
+  QString aPref;
+
   int aLimit = GroupPoints->ComboBox1->currentIndex();
-  //QString aName = tr("GEOM_SHARED_SHAPE");
-  QString aName;
 
   switch (aLimit) {
-  case 0:  aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_SOLID")) ; break;
-  case 1:  aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_SHELL")) ; break;
-  case 2:  aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_FACE"))  ; break;
-  case 3:  aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_WIRE"))  ; break;
-  case 4:  aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_EDGE"))  ; break;
-  case 5:  aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_VERTEX")); break;
-  default: aName = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_SHAPE")) ;
+  case 0:  aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_SOLID")) ; break;
+  case 1:  aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_SHELL")) ; break;
+  case 2:  aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_FACE"))  ; break;
+  case 3:  aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_WIRE"))  ; break;
+  case 4:  aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_EDGE"))  ; break;
+  case 5:  aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_VERTEX")); break;
+  default: aPref = tr("GEOM_SHARED_SHAPE").arg(tr("GEOM_SHAPE")) ;
   }
 
-  return aName;
+  return aPref;
 }
diff --git a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
index 4ac5f07b4..0e0d60131 100644
--- a/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
+++ b/src/OperationGUI/OperationGUI_GetSharedShapesDlg.h
@@ -48,7 +48,7 @@ protected:
   virtual bool                       isValid (QString&);
   virtual bool                       execute (ObjectList&);
   virtual GEOM::GEOM_Object_ptr      getFather (GEOM::GEOM_Object_ptr);
-  virtual QString                    getNewObjectName() const;
+  QString                            getPrefixByType() const;
 
 private:
   void                               Init();