Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/occ/compounds_processing'
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_ViewerProxy.h
diff --git
a/src/XGUI/XGUI_ViewerProxy.h
b/src/XGUI/XGUI_ViewerProxy.h
index d87e4fcfaa3a67274d7e3af3fa74cfdadd20862c..19e23ac3bff3a7d737d150fc29f7a158adb3338d 100644
(file)
--- a/
src/XGUI/XGUI_ViewerProxy.h
+++ b/
src/XGUI/XGUI_ViewerProxy.h
@@
-170,15
+170,13
@@
Q_OBJECT
//virtual void Zfitall();
#ifdef HAVE_SALOME
//virtual void Zfitall();
#ifdef HAVE_SALOME
- void setFitter(OCCViewer_Fitter* theFitter);
-
OCCViewer_Fitter* currentF
itter() const;
+ v
irtual v
oid setFitter(OCCViewer_Fitter* theFitter);
+
virtual OCCViewer_Fitter* f
itter() const;
#else
#else
- void setFitter(AppElements_Fitter* theFitter);
-
AppElements_Fitter* currentF
itter() const;
+ v
irtual v
oid setFitter(AppElements_Fitter* theFitter);
+
virtual AppElements_Fitter* f
itter() const;
#endif
#endif
- void unsetFitter();
-
signals:
/// Emits by mouse entering the view port
void enterViewPort();
signals:
/// Emits by mouse entering the view port
void enterViewPort();
@@
-218,7
+216,7
@@
private slots:
private:
void displayHighlight(FeaturePtr theFeature, const TopoDS_Shape& theIgnoreShape);
private:
void displayHighlight(FeaturePtr theFeature, const TopoDS_Shape& theIgnoreShape);
-
void
eraseHighlight();
+
bool
eraseHighlight();
XGUI_Workshop* myWorkshop;
XGUI_Workshop* myWorkshop;