X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMeasureGUI%2FMeasureGUI_DistanceDlg.h;h=93caf829990e5b6c45fa45d6cbae7a73a90b40fb;hb=32e56a241f21859130edcfcc7a9d9c452c8d00d4;hp=50718dd40ca0b751af550cca6edcfeece8324287;hpb=c577ca78d7a6e286526662cf54df6de1f4f2f449;p=modules%2Fgeom.git

diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
index 50718dd40..93caf8299 100644
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h
@@ -1,74 +1,71 @@
-//  GEOM GEOMGUI : GUI for Geometry component
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  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 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 
-// 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//  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 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
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  File   : MeasureGUI_DistanceDlg.h
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
 
-#ifndef DIALOGBOX_DISTANCE_H
-#define DIALOGBOX_DISTANCE_H
+// GEOM GEOMGUI : GUI for Geometry component
+// File   : MeasureGUI_DistanceDlg.h
+// Author : Nicolas REJNERI, Open CASCADE S.A.S.
+//
+#ifndef MEASUREGUI_DISTANCEDLG_H
+#define MEASUREGUI_DISTANCEDLG_H
 
 #include "MeasureGUI_Skeleton.h"
-#include "MeasureGUI_2Sel1LineEdit_QTD.h"
 
-#include "MeasureGUI.h"
+class MeasureGUI_2Sel4LineEdit;
+class gp_Pnt;
 
 //=================================================================================
 // class    : MeasureGUI_DistanceDlg
 // purpose  :
 //=================================================================================
+
 class MeasureGUI_DistanceDlg : public MeasureGUI_Skeleton
 { 
-    Q_OBJECT
-
+  Q_OBJECT
+    
 public:
-    MeasureGUI_DistanceDlg(QWidget* parent = 0, const char* name = 0, SALOME_Selection* Sel = 0, bool modal = FALSE, WFlags fl = 0);
-    ~MeasureGUI_DistanceDlg();
+  MeasureGUI_DistanceDlg( GeometryGUI*, QWidget* );
+  ~MeasureGUI_DistanceDlg();
 
-private:
-    void Init();
-    void enterEvent(QEvent* e);
-    void closeEvent(QCloseEvent* e);
-    void MakeDistanceSimulationAndDisplay(const TopoDS_Shape& S1, const TopoDS_Shape& S2);
-    void EraseDistance();
-
-    TopoDS_Shape myShape1;              
-    TopoDS_Shape myShape2;              
-    GEOM::GEOM_Shape_var myGeomShape1;          
-    GEOM::GEOM_Shape_var myGeomShape2;          
-    bool myOkShape1;
-    bool myOkShape2;   /* to check when arguments are defined */
-
-    MeasureGUI_2Sel1LineEdit_QTD* GroupC1;
-
-private slots:
-    void ClickOnCancel();
-    void SetEditCurrentArgument();
-    void SelectionIntoArgument();
-    void LineEditReturnPressed();
-    void ActivateThisDialog();
+protected:
+  // redefined from GEOMBase_Helper and MeasureGUI_Skeleton
+  virtual void                        processObject();
+  virtual SALOME_Prs*                 buildPrs();
+  virtual void                        SelectionIntoArgument();
+  virtual void                        LineEditReturnPressed();
+  virtual void                        SetEditCurrentArgument();
+  virtual bool                        isValid( QString& );
 
+private:
+  void                                Init();
+  bool                                getParameters( double&,
+                                                     gp_Pnt&,
+                                                     gp_Pnt& );
+private:
+  QLineEdit*                          myEditCurrentArgument;
+  QLineEdit*                          mySelEdit2;
+  QPushButton*                        mySelBtn2;
+  
+  MeasureGUI_2Sel4LineEdit*           myGrp;
+  GEOM::GEOM_Object_var               myObj2;
 };
 
-#endif // DIALOGBOX_DISTANCE_H
+#endif // MEASUREGUI_DISTANCEDLG_H