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
Simple fix for 40160 [CEA] No name in SHAPER
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_Displayer.h
diff --git
a/src/XGUI/XGUI_Displayer.h
b/src/XGUI/XGUI_Displayer.h
index df1237c43087d75b2510b67e3a3b8a8e758a0e49..a720d6b586af1e3b31401c705236691e4cba3121 100644
(file)
--- a/
src/XGUI/XGUI_Displayer.h
+++ b/
src/XGUI/XGUI_Displayer.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19 CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
24 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-23,7
+23,6
@@
#include "XGUI.h"
#include <GeomAPI_AISObject.h>
#include "XGUI.h"
#include <GeomAPI_AISObject.h>
-#include <GeomAPI_ICustomPrs.h>
#include <GeomAPI_Pln.h>
#include <ModelAPI_Result.h>
#include <GeomAPI_Pln.h>
#include <ModelAPI_Result.h>
@@
-277,7
+276,10
@@
public:
bool enableUpdateViewer(const bool isEnabled);
/// Returns true if the viewer update is not blocked
bool enableUpdateViewer(const bool isEnabled);
/// Returns true if the viewer update is not blocked
- bool isUpdateEnabled() const;
+ bool isUpdateEnabled() const
+ {
+ return myViewerBlockedRecursiveCount == 0;
+ }
/// Updates the viewer
void updateViewer() const;
/// Updates the viewer
void updateViewer() const;
@@
-375,6
+377,13
@@
public:
/// Returns scale of active view
double getViewScale() const;
/// Returns scale of active view
double getViewScale() const;
+ /// Set color of selection
+ /// \param theColor R,G,B values of color
+ void setSelectionColor(const std::vector<int>& theColor);
+
+ /// Returns current selection color
+ std::vector<int> selectionColor() const;
+
signals:
/// Signal on object display
/// \param theObject a data object
signals:
/// Signal on object display
/// \param theObject a data object
@@
-443,8
+452,6
@@
private:
private:
XGUI_SelectionActivate* selectionActivate() const;
private:
XGUI_SelectionActivate* selectionActivate() const;
- AISObjectPtr createPresentation(const ResultPtr& theResult) const;
-
private:
XGUI_Workshop* myWorkshop; ///< Reference to workshop
#ifdef TINSPECTOR
private:
XGUI_Workshop* myWorkshop; ///< Reference to workshop
#ifdef TINSPECTOR
@@
-452,10
+459,6
@@
private:
#endif
Handle(SelectMgr_AndFilter) myAndFilter; ///< A container for selection filters
#endif
Handle(SelectMgr_AndFilter) myAndFilter; ///< A container for selection filters
- /// A default custom presentation, which is used if the displayed feature is not
- /// a custom presentation
- GeomCustomPrsPtr myCustomPrs;
-
/// Definition of a type of map which defines correspondance between objects and presentations
#ifdef OPTIMIZE_PRS
XGUI_TwoSidePresentationMap myResult2AISObjectMap; ///< A map of displayed objects
/// Definition of a type of map which defines correspondance between objects and presentations
#ifdef OPTIMIZE_PRS
XGUI_TwoSidePresentationMap myResult2AISObjectMap; ///< A map of displayed objects
@@
-467,7
+470,7
@@
private:
/// Number of blocking of the viewer update. The viewer is updated only if it is zero
int myViewerBlockedRecursiveCount;
/// Number of blocking of the viewer update. The viewer is updated only if it is zero
int myViewerBlockedRecursiveCount;
- bool myIsFirstAISContextUse; ///< Flag: first asking of AIS context: trihedron activation
+ mutable void* myContextId;
mutable bool myNeedUpdate; ///< A flag that update was requested but not done
};
mutable bool myNeedUpdate; ///< A flag that update was requested but not done
};