Mantis issue 0021772: EDF 2336 GEOM: Non valid face created from two circles

[modules/geom.git] / src / BlocksGUI / BlocksGUI_QuadFaceDlg.h

diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
index 652d34b18a5b3d81c462c13306fb7038bac895ca..0375551df739fa04ac842128197bb1a01ae6e13b 100644 (file)
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
@@ -1,33 +1,40 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+// Copyright (C) 2007-2012  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_QuadFaceDlg.h
-//  Author : Julia DOROVSKIKH
-//  Module : GEOM
 
-#ifndef DIALOGBOX_QUAD_FACE_H
-#define DIALOGBOX_QUAD_FACE_H
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : BlocksGUI_QuadFaceDlg.h
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S. (julia.dorovskikh@opencascade.com)
+//
+#ifndef BLOCKSGUI_QUADFACEDLG_H
+#define BLOCKSGUI_QUADFACEDLG_H
 
 #include "GEOMBase_Skeleton.h"
+#include "GEOM_GenericObjPtr.h"
+
+#include <QMap>
+
+class QGroupBox;
+class QPushButton;
+class QLineEdit;
 
 //=================================================================================
 // class    : BlocksGUI_QuadFaceDlg
@@ -38,49 +45,54 @@ class BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton
   Q_OBJECT
 
   enum { Vertex1, Vertex2, Vertex3, Vertex4,
-        Edge12, Edge22,
-        Edge14, Edge24, Edge34, Edge44 };
+         Edge12, Edge22,
+         Edge14, Edge24, Edge34, Edge44 };
 
 public:
-  BlocksGUI_QuadFaceDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE);
+  BlocksGUI_QuadFaceDlg (GeometryGUI*, QWidget*);
   ~BlocksGUI_QuadFaceDlg();
 
 protected:
   // redefined from GEOMBase_Helper
   virtual GEOM::GEOM_IOperations_ptr createOperation();
-  virtual                       bool isValid (QString& msg);
-  virtual                       bool execute (ObjectList& objects);
+  virtual bool                       isValid (QString&);
+  virtual bool                       execute (ObjectList&);
+  virtual void                       addSubshapesToStudy();
 
 private:
-  void Init();
-  void enterEvent (QEvent* e);
+  void                               Init();
+  void                               enterEvent (QEvent*);
 
-  void createSelWg (const QString&, QPixmap&, QWidget*, const int);
-  void activateSelection();
+  void                               createSelWg (const QString&, QPixmap&,
+                                                  QWidget*, const int);
+  void                               activateSelection();
 
 private:
-  int                     myConstructorId;
+  int                                myConstructorId;
+
+  GEOM::GeomObjPtr                   myShape1;
+  GEOM::GeomObjPtr                   myShape2;
+  GEOM::GeomObjPtr                   myShape3;
+  GEOM::GeomObjPtr                   myShape4;
 
-  GEOM::GEOM_Object_var   myShape1;
-  GEOM::GEOM_Object_var   myShape2;
-  GEOM::GEOM_Object_var   myShape3;
-  GEOM::GEOM_Object_var   myShape4;
+  // to initialize the first selection field with a selected object on the dialog creation
+  bool                               myInitial;
 
-  QFrame*                 myGrp1;
-  QFrame*                 myGrp2;
-  QFrame*                 myGrp3;
+  QGroupBox*                         myGrp1;
+  QGroupBox*                         myGrp2;
+  QGroupBox*                         myGrp3;
 
-  QMap<int, QPushButton*> mySelBtn;
-  QMap<int, QLineEdit*>   mySelName;
+  QMap<int, QPushButton*>            mySelBtn;
+  QMap<int, QLineEdit*>              mySelName;
 
 private slots:
-  void ClickOnOk();
-  bool ClickOnApply();
-  void ActivateThisDialog();
-  void ConstructorsClicked( int constructorId );
+  void                               ClickOnOk();
+  bool                               ClickOnApply();
+  void                               ActivateThisDialog();
+  void                               ConstructorsClicked (int);
 
-  void SelectionIntoArgument();
-  void SetEditCurrentArgument();
+  void                               SelectionIntoArgument();
+  void                               SetEditCurrentArgument();
 };
 
-#endif // DIALOGBOX_QUAD_FACE_H
+#endif // BLOCKSGUI_QUADFACEDLG_H