-// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
+// 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.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM GEOMGUI : GUI for Geometry component
// File : GeometryGUI.h
// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
#ifndef GEOMETRYGUI_H
#define GEOMETRYGUI_H
#include "GEOM_GEOMGUI.hxx"
+#include <Basics_OCCTVersion.hxx>
+
#include <SalomeApp_Module.h>
#include <GEOM_Client.hxx>
// 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"
#include CORBA_CLIENT_HEADER(SALOMEDS)
-// minimum allowed value for deflection coefficient
-#define DEFLECTION_MIN 1e-06
-
-//Define separators
-#define NAME_SEPARATOR '_' // character used to separate parameter names
-#define DIGIT_SEPARATOR ':' // character used to separate numeric parameter values (color = r:g:b)
-
-#define VISIBILITY_PROP "Visibility" //Object visibility property
-#define OPACITY_PROP "Opacity" //Object opacity property
-#define TRANSPARENCY_PROP "Transparency" //Object transparency property
-#define DISPLAY_MODE_PROP "DisplayMode" //Object display mode property
-#define ISOS_PROP "Isos" //Number of the Isos property of the object
-#define COLOR_PROP "Color" //Color of the object
-#define VECTOR_MODE_PROP "VectorMode" //Vector mode property
-#define DEFLECTION_COEFF_PROP "DeflectionCoeff" //Deflection coeff property
-#define MARKER_TYPE_PROP "MarkerType" // Marker type property
-
-
class QDialog;
class QMenu;
+class QAction;
class GEOMGUI_OCCSelector;
class LightApp_VTKSelector;
class LightApp_Selection;
virtual void initialize( CAM_Application* );
virtual QString engineIOR() const;
- static Handle(Graphic3d_HArray1OfBytes) getTexture( SalomeApp_Study*, int, int&, int& );
+#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();
void ActiveWorkingPlane();
virtual bool renameObject( const QString&, const QString& );
+ virtual bool renameAllowed( const QString& ) const;
virtual void windows( QMap<int, int>& ) const;
virtual void viewManagers( QStringList& ) const;
virtual void storeVisualParameters (int savePoint);
virtual void restoreVisualParameters(int savePoint);
+ QAction* getAction(const int id);
+
public slots:
virtual bool deactivateModule( SUIT_Study* );
virtual bool activateModule( SUIT_Study* );
virtual void OnKeyPress ( SUIT_ViewWindow*, QKeyEvent* );
virtual void OnMousePress( SUIT_ViewWindow*, QMouseEvent* );
virtual void OnMouseMove ( SUIT_ViewWindow*, QMouseEvent* );
+ virtual void OnMouseRelease ( SUIT_ViewWindow*, QMouseEvent* );
protected slots:
virtual void onViewManagerAdded( SUIT_ViewManager* );
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;
