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 2f596dafa9102b7ab65d41508e555a05bf14c2bb..b1b4f8275f3aaaedac74611847e307f8c5e35389 100644 (file)
--- 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 38249faec79585ba5823fa07dd784d680e888196..e333ae9c36b788f8a35ff2dd2d89f923b00783ef 100644 (file)
--- 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 bb609f2dd9951d9bc5e247244ccc82c620bfd4cc..46171cbfd3871f5b67808f948c63074f1b5f4e43 100644 (file)
--- 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 cfa1b541291e17b378a8f9af4a0dffdfe54ff4f5..82dea9bf66fe82dbfe36cb6a0b658f92c93cfb8d 100644 (file)
--- 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 1a3f3d34d19be348ac9c24fffabc4e05484e9a1e..8024e38cb74186922187044c79038680bc27fc1b 100644 (file)
--- 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 f4bc70631980b383c6afa62ceeb79c0e33f01866..65e4afdfa12bdeb972048a363a1d4013a307ecb0 100644 (file)
--- 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();