Improve GEOM_Displayer; required for features 0021391, 0021830

This commit is contained in:
vsr 2013-01-17 15:47:30 +00:00
parent 4920032497
commit b0deb14544
2 changed files with 455 additions and 446 deletions

File diff suppressed because it is too large Load Diff

View File

@ -63,6 +63,7 @@ class LightApp_SelectionMgr;
class SalomeApp_Study; class SalomeApp_Study;
class SalomeApp_Application; class SalomeApp_Application;
class SUIT_SelectionFilter; class SUIT_SelectionFilter;
class Handle_GEOM_AISShape;
//class SALOME_Selection; //class SALOME_Selection;
class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer class GEOMGUI_EXPORT GEOM_Displayer : public LightApp_Displayer
@ -209,6 +210,11 @@ protected:
SUIT_SelectionFilter* getFilter( const int theMode ); SUIT_SelectionFilter* getFilter( const int theMode );
SUIT_SelectionFilter* getComplexFilter( const QList<int>* ); SUIT_SelectionFilter* getComplexFilter( const QList<int>* );
Quantity_Color qColorFromResources( const QString&, const QColor& );
QColor colorFromResources( const QString&, const QColor& );
bool setPointMarker( const Handle(GEOM_AISShape)&, const QString&, const Quantity_Color );
void updateShapeProperties( const Handle(GEOM_AISShape)& );
protected: protected:
Handle(SALOME_InteractiveObject) myIO; Handle(SALOME_InteractiveObject) myIO;
TopoDS_Shape myShape; TopoDS_Shape myShape;
@ -229,6 +235,7 @@ protected:
private: private:
SalomeApp_Application* myApp; SalomeApp_Application* myApp;
friend class GEOM_Swig;
}; };
#endif // GEOM_DISPLAYER_H #endif // GEOM_DISPLAYER_H