X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FBlocksGUI%2FBlocksGUI_BlockDlg.h;h=352cf818910fef58eb42bd6d45bbed031c593c91;hb=772bb150e4e097cc43f244c99b7846ee9aad411f;hp=91f98567b5fe0acba6ef5e1fc3705140346bc0ba;hpb=d3dd282390888d7dc091ba2c2ffe7923bd7458e6;p=modules%2Fgeom.git

diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h
index 91f98567b..352cf8189 100644
--- a/src/BlocksGUI/BlocksGUI_BlockDlg.h
+++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h
@@ -1,37 +1,37 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  CEA
+// 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.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//
-//
-//  File   : BlocksGUI_BlockDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
-//  $Header$
 
-#ifndef DIALOGBOX_BLOCK_H
-#define DIALOGBOX_BLOCK_H
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_BlockDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
+//
+#ifndef BLOCKSGUI_BLOCKDLG_H
+#define BLOCKSGUI_BLOCKDLG_H
 
 #include "GEOMBase_Skeleton.h"
-#include "DlgRef_2Sel_QTD.h"
-#include "DlgRef_6Sel_QTD.h"
+#include "GEOM_GenericObjPtr.h"
 
+class DlgRef_2Sel;
+class DlgRef_6Sel;
 
 //=================================================================================
 // class    : BlocksGUI_BlockDlg
@@ -42,39 +42,40 @@ class BlocksGUI_BlockDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
 public:
-  BlocksGUI_BlockDlg (QWidget* parent,
-		      SALOME_Selection* Sel,
-		      bool modal = FALSE);
+  BlocksGUI_BlockDlg (GeometryGUI*, QWidget*);
   ~BlocksGUI_BlockDlg();
 
 protected:
   // redefined from GEOMBase_Helper
   virtual GEOM::GEOM_IOperations_ptr createOperation();
   virtual bool                       isValid (QString&);
-  virtual bool                       execute (ObjectList& objects);
+  virtual bool                       execute (ObjectList&);
+  virtual void                       addSubshapesToStudy();
 
 private:
-  void Init();
-  void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent (QEvent*);
 
 private:
-  int                   myConstructorId;
+  int                                myConstructorId;
+
+  GEOM::GeomObjPtr                   myFace1, myFace2;
+  GEOM::GeomObjPtr                   myFace3, myFace4, myFace5, myFace6;
 
-  GEOM::GEOM_Object_var myFace1, myFace2;
-  GEOM::GEOM_Object_var myFace3, myFace4, myFace5, myFace6;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
 
-  DlgRef_2Sel_QTD*      Group2F;
-  DlgRef_6Sel_QTD*      Group6F;
+  DlgRef_2Sel*                       Group2F;
+  DlgRef_6Sel*                       Group6F;
 
 private slots:
-  void ClickOnOk();
-  bool ClickOnApply();
-  void ActivateThisDialog();
-//  void DeactivateActiveDialog();
-  void ConstructorsClicked (int constructorId);
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked (int);
 
-  void SelectionIntoArgument();
-  void SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_BLOCK_H
+#endif // BLOCKSGUI_BLOCKDLG_H