From: vsr <vsr@opencascade.com>
Date: Thu, 18 Feb 2010 11:11:53 +0000 (+0000)
Subject: 0020632: EDF 1173 GEOM : Extrusion with multiple selection
X-Git-Tag: V5_1_4a1~56
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ad71fc66064f5abf55ee1e83fccaed85d52db159;p=modules%2Fgeom.git

0020632: EDF 1173 GEOM : Extrusion with multiple selection
Additional changes (to set object name in the dialog boxes properly)
---

diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
index 2f596dafa..b1b4f8275 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
@@ -498,3 +498,12 @@ void GenerationGUI_PipeDlg::addSubshapesToStudy()
 
   addSubshapesToFather(objMap);
 }
+
+//=================================================================================
+// function : extractPrefix
+// purpose  : redefined from GEOMBase_Helper class
+//=================================================================================
+bool GenerationGUI_PipeDlg::extractPrefix() const
+{
+  return myBaseObjects.length() > 1;
+}
diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h
index 38249faec..e333ae9c3 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h
@@ -48,6 +48,7 @@ protected:
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );    
   virtual void                       addSubshapesToStudy();
+  virtual bool                       extractPrefix() const;
 
 private:
   void                               Init();
diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index bb609f2dd..46171cbfd 100644
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -733,3 +733,12 @@ void GenerationGUI_PrismDlg::addSubshapesToStudy()
   }
   addSubshapesToFather(objMap);
 }
+
+//=================================================================================
+// function : extractPrefix
+// purpose  : redefined from GEOMBase_Helper class
+//=================================================================================
+bool GenerationGUI_PrismDlg::extractPrefix() const
+{
+  return myBaseObjects.length() > 1;
+}
diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h
index cfa1b5412..82dea9bf6 100644
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h
@@ -50,6 +50,7 @@ protected:
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );    
   virtual void                       addSubshapesToStudy();
+  virtual bool                       extractPrefix() const;
 
 private:
   void                               Init();
diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
index 1a3f3d34d..8024e38cb 100644
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
@@ -458,3 +458,12 @@ void GenerationGUI_RevolDlg::addSubshapesToStudy()
 
   addSubshapesToFather(objMap);
 }
+
+//=================================================================================
+// function : extractPrefix
+// purpose  : redefined from GEOMBase_Helper class
+//=================================================================================
+bool GenerationGUI_RevolDlg::extractPrefix() const
+{
+  return myBaseObjects.length() > 1;
+}
diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h
index f4bc70631..65e4afdfa 100644
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.h
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h
@@ -48,6 +48,7 @@ protected:
   virtual bool                       isValid( QString& );
   virtual bool                       execute( ObjectList& );    
   virtual void                       addSubshapesToStudy();
+  virtual bool                       extractPrefix() const;
 
 private:
   void                               Init();