Migration to OCCT 7.0

[modules/geom.git] / src / GEOMGUI / GeometryGUI.h

diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index f2f2ad8e5661fd7d67e5c372f34b4f0f406c1796..f92d92ab7b03b375beacf2adfafad914027a3706 100644 (file)
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -47,11 +47,7 @@
 // OCCT Includes
 #include <gp_Ax3.hxx>
 
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
 #include <TColStd_HArray1OfByte.hxx>
-#else
-#include <Graphic3d_HArray1OfBytes.hxx>
-#endif
 
 // IDL headers
 #include "SALOMEconfig.h"
@@ -68,6 +64,7 @@ class LightApp_Selection;
 class SUIT_ViewManager;
 class SalomeApp_Study;
 class GEOMGUI_CreationInfoWdg;
+class GEOMGUI_TextTreeWdg;
 
 //=================================================================================
 // class    : GeometryGUI
@@ -88,11 +85,7 @@ public:
   virtual void                initialize( CAM_Application* );
   virtual QString             engineIOR() const;
 
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
   static Handle(TColStd_HArray1OfByte) getTexture (SalomeApp_Study*, int, int&, int&);
-#else
-  static Handle(Graphic3d_HArray1OfBytes) getTexture (SalomeApp_Study*, int, int&, int&);
-#endif
 
   static bool                 InitGeomGen();
 
@@ -153,8 +146,10 @@ public:
   virtual bool                isDraggable( const SUIT_DataObject* what ) const;
   virtual bool                isDropAccepted( const SUIT_DataObject* where ) const;
   virtual void                dropObjects( const DataObjectList& what, 
-                                          SUIT_DataObject* where,
-                                          const int row, Qt::DropAction action );
+                                           SUIT_DataObject* where,
+                                           const int row, Qt::DropAction action );
+
+  void                        emitDimensionsUpdated( QString entry );
 
 public slots:
   virtual bool                deactivateModule( SUIT_Study* );
@@ -184,6 +179,7 @@ signals :
   void                        SignalDefaultStepValueChanged( double newVal );
   void                        SignalDependencyTreeParamChanged( const QString&, const QString& );
   void                        SignalDependencyTreeRenameObject( const QString& );
+  void                        DimensionsUpdated( const QString& );
 
 protected:
   virtual LightApp_Selection* createSelection() const;
@@ -208,11 +204,7 @@ public:
 
 private:  
 
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
   typedef QMap<long, Handle(TColStd_HArray1OfByte)> TextureMap;
-#else
-  typedef QMap<long, Handle(Graphic3d_HArray1OfBytes)> TextureMap;
-#endif
 
   typedef QMap<long, TextureMap> StudyTextureMap;
   typedef QMap<QString, GEOMGUI*> GUIMap;
@@ -236,6 +228,8 @@ private:
 
   GEOMGUI_CreationInfoWdg*    myCreationInfoWdg;
   
+  GEOMGUI_TextTreeWdg*       myTextTreeWdg;
+  
   SALOME_ListIO               myTopLevelIOList;               
 
   friend class DisplayGUI;