Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid installing redundant files
[modules/geom.git]
/
src
/
GEOMGUI
/
GeometryGUI.h
diff --git
a/src/GEOMGUI/GeometryGUI.h
b/src/GEOMGUI/GeometryGUI.h
index 5dde1ed7f1d82559c13ea3662d553d3c217268b6..fb5c6e9918b4051b01033e536f0b0e9d203a3de0 100644
(file)
--- a/
src/GEOMGUI/GeometryGUI.h
+++ b/
src/GEOMGUI/GeometryGUI.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-29,13
+29,12
@@
#include "GEOM_GEOMGUI.hxx"
#include "GEOM_GEOMGUI.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include <SalomeApp_Module.h>
#include <GEOM_Client.hxx>
#include <SALOME_InteractiveObject.hxx>
#include <SALOMEDSClient.hxx>
#include <SalomeApp_Module.h>
#include <GEOM_Client.hxx>
#include <SALOME_InteractiveObject.hxx>
#include <SALOMEDSClient.hxx>
+#include <Qtx.h>
#include "GEOMGUI.h"
#include "GEOMPluginGUI.h"
#include "GEOMGUI.h"
#include "GEOMPluginGUI.h"
@@
-64,6
+63,8
@@
class LightApp_Selection;
class SUIT_ViewManager;
class SalomeApp_Study;
class GEOMGUI_CreationInfoWdg;
class SUIT_ViewManager;
class SalomeApp_Study;
class GEOMGUI_CreationInfoWdg;
+class GEOMGUI_TextTreeWdg;
+class GEOMGUI_AnnotationMgr;
//=================================================================================
// class : GeometryGUI
//=================================================================================
// class : GeometryGUI
@@
-71,7
+72,7
@@
class GEOMGUI_CreationInfoWdg;
//=================================================================================
class GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module
{
//=================================================================================
class GEOMGUI_EXPORT GeometryGUI : public SalomeApp_Module
{
- Q_OBJECT
;
+ Q_OBJECT
public:
// Constructor
public:
// Constructor
@@
-84,19
+85,24
@@
public:
virtual void initialize( CAM_Application* );
virtual QString engineIOR() const;
virtual void initialize( CAM_Application* );
virtual QString engineIOR() const;
- static Handle(TColStd_HArray1OfByte) getTexture (
SalomeApp_Study*,
int, int&, int&);
+ static Handle(TColStd_HArray1OfByte) getTexture (int, int&, int&);
static bool InitGeomGen();
static bool InitGeomGen();
- static
GEOM::GEOM_Gen_var
GetGeomGen();
+ static
GEOM::GEOM_Gen_var
GetGeomGen();
static CORBA::Object_var ClientSObjectToObject (_PTR(SObject) theSObject);
static CORBA::Object_var ClientSObjectToObject (_PTR(SObject) theSObject);
- static SALOMEDS::Study_var ClientStudyToStudy (_PTR(Study) theStudy);
+ static bool IsInGeomComponent( _PTR(SObject) theSObject );
+ static SALOMEDS::Study_var getStudyServant();
static void Modified( bool = true );
GEOM_Client& GetShapeReader() { static SHAPE_READER(myShapeReader);return myShapeReader; }
static void Modified( bool = true );
GEOM_Client& GetShapeReader() { static SHAPE_READER(myShapeReader);return myShapeReader; }
+ GEOMGUI_AnnotationMgr* GetAnnotationMgr();
+
+ GEOMGUI_TextTreeWdg* GetTextTreeWdg() const;
+
// Get active dialog box
QDialog* GetActiveDialogBox(){ return myActiveDialogBox; }
// Set active dialog box
// Get active dialog box
QDialog* GetActiveDialogBox(){ return myActiveDialogBox; }
// Set active dialog box
@@
-145,8
+151,11
@@
public:
virtual bool isDraggable( const SUIT_DataObject* what ) const;
virtual bool isDropAccepted( const SUIT_DataObject* where ) const;
virtual void dropObjects( const DataObjectList& what,
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 );
+ void emitAnnotationsUpdated( QString entry );
public slots:
virtual bool deactivateModule( SUIT_Study* );
public slots:
virtual bool deactivateModule( SUIT_Study* );
@@
-176,6
+185,9
@@
signals :
void SignalDefaultStepValueChanged( double newVal );
void SignalDependencyTreeParamChanged( const QString&, const QString& );
void SignalDependencyTreeRenameObject( const QString& );
void SignalDefaultStepValueChanged( double newVal );
void SignalDependencyTreeParamChanged( const QString&, const QString& );
void SignalDependencyTreeRenameObject( const QString& );
+ void SignalTextTreeRenameObject( const QString& );
+ void SignalAnnotationsUpdated( const QString& );
+ void DimensionsUpdated( const QString& );
protected:
virtual LightApp_Selection* createSelection() const;
protected:
virtual LightApp_Selection* createSelection() const;
@@
-200,31
+212,30
@@
public:
private:
private:
- typedef QMap<long, Handle(TColStd_HArray1OfByte)> TextureMap;
-
- typedef QMap<long, TextureMap> StudyTextureMap;
typedef QMap<QString, GEOMGUI*> GUIMap;
typedef QPair<QString, QString> PluginAction;
typedef QMap<QString, GEOMGUI*> GUIMap;
typedef QPair<QString, QString> PluginAction;
- GUIMap myGUIMap; // GUI libraries map
- QDialog* myActiveDialogBox; // active dialog box
- gp_Ax3 myWorkingPlane;
- //QMap<int,QString> myRules; // popup rules
- static StudyTextureMap myTextureMap; // texture map
+ GUIMap myGUIMap; // GUI libraries map
+ QDialog* myActiveDialogBox; // active dialog box
+ gp_Ax3 myWorkingPlane;
+ //QMap<int,QString> myRules; // popup rules
- QMap<int, PluginAction> myPluginActions; // plugin actions
- QMap<QString, QString> myPluginLibs; // plugin name to plugin client library
+ QMap<int, PluginAction> myPluginActions;
// plugin actions
+ QMap<QString, QString> myPluginLibs;
// plugin name to plugin client library
QList<GEOMGUI_OCCSelector*> myOCCSelectors;
QList<LightApp_VTKSelector*> myVTKSelectors;
QList<GEOMGUI_OCCSelector*> myOCCSelectors;
QList<LightApp_VTKSelector*> myVTKSelectors;
- LightApp_Displayer* myDisplayer;
- int myLocalSelectionMode; //Select Only
+ LightApp_Displayer*
myDisplayer;
+ int
myLocalSelectionMode; //Select Only
- GEOMGUI_CreationInfoWdg* myCreationInfoWdg;
+ GEOMGUI_CreationInfoWdg* myCreationInfoWdg;
+
+ GEOMGUI_TextTreeWdg* myTextTreeWdg;
+ GEOMGUI_AnnotationMgr* myAnnotationMgr;
- SALOME_ListIO
myTopLevelIOList;
+ SALOME_ListIO
myTopLevelIOList;
friend class DisplayGUI;
};
friend class DisplayGUI;
};