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
Fix compilation on Linux
[modules/shaper.git]
/
src
/
SketcherPrs
/
SketcherPrs_HVDirection.cpp
diff --git
a/src/SketcherPrs/SketcherPrs_HVDirection.cpp
b/src/SketcherPrs/SketcherPrs_HVDirection.cpp
index 13b3def6ed7db543ecdbc8f6a1c9c6037ef07799..b532887d1052901106a2c5a6e376cd1e0f4eb868 100644
(file)
--- a/
src/SketcherPrs/SketcherPrs_HVDirection.cpp
+++ b/
src/SketcherPrs/SketcherPrs_HVDirection.cpp
@@
-8,32
+8,12
@@
#include "SketcherPrs_Tools.h"
#include "SketcherPrs_PositionMgr.h"
#include "SketcherPrs_Tools.h"
#include "SketcherPrs_PositionMgr.h"
-#include <GeomAPI_Pnt.h>
-
#include <SketchPlugin_Constraint.h>
#include <SketchPlugin_Constraint.h>
-#include <AIS_Drawer.hxx>
-#include <gp_Pnt2d.hxx>
-
-#include <Prs3d_PointAspect.hxx>
-#include <Prs3d_Root.hxx>
-#include <Prs3d_LineAspect.hxx>
-
-#include <Graphic3d_MarkerImage.hxx>
-#include <Graphic3d_AspectMarker3d.hxx>
#include <Graphic3d_AspectLine3d.hxx>
#include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_ArrayOfSegments.hxx>
-
-#include <Select3D_SensitivePoint.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-
-#include <SelectMgr_SequenceOfOwner.hxx>
-#include <SelectMgr_Selection.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-
+#include <Prs3d_Root.hxx>
-extern std::shared_ptr<GeomAPI_Pnt2d> getFeaturePoint(DataPtr theData,
- const std::string& theAttribute);
+#include <Events_Error.h>
IMPLEMENT_STANDARD_HANDLE(SketcherPrs_HVDirection, SketcherPrs_SymbolPrs);
IMPLEMENT_STANDARD_HANDLE(SketcherPrs_HVDirection, SketcherPrs_SymbolPrs);
@@
-41,39
+21,41
@@
IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_HVDirection, SketcherPrs_SymbolPrs);
static Handle(Image_AlienPixMap) MyPixMap;
static Handle(Image_AlienPixMap) MyPixMap;
-SketcherPrs_HVDirection::SketcherPrs_HVDirection(
SketchPlugin_Constraint
* theConstraint,
+SketcherPrs_HVDirection::SketcherPrs_HVDirection(
ModelAPI_Feature
* theConstraint,
const std::shared_ptr<GeomAPI_Ax3>& thePlane,
bool isHorisontal)
: SketcherPrs_SymbolPrs(theConstraint, thePlane), myIsHorisontal(isHorisontal)
{
const std::shared_ptr<GeomAPI_Ax3>& thePlane,
bool isHorisontal)
: SketcherPrs_SymbolPrs(theConstraint, thePlane), myIsHorisontal(isHorisontal)
{
- myPntArray = new Graphic3d_ArrayOfPoints(1);
- myPntArray->AddVertex(0., 0., 0.);
-}
+}
-void SketcherPrs_HVDirection::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
- const Handle(Prs3d_Presentation)& thePresentation,
- const Standard_Integer theMode)
+bool SketcherPrs_HVDirection::IsReadyToDisplay(ModelAPI_Feature* theConstraint,
+ const std::shared_ptr<GeomAPI_Ax3>&/* thePlane*/)
{
{
- prepareAspect();
+ bool aReadyToDisplay = false;
+ ObjectPtr aObj = SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A());
+
+ aReadyToDisplay = SketcherPrs_Tools::getShape(aObj).get() != NULL;
+ return aReadyToDisplay;
+}
- ObjectPtr aObj1 = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
- std::shared_ptr<GeomAPI_Shape> aLine1 = SketcherPrs_Tools::getShape(aObj1);
- if (
aLine1.get() == NULL
)
- return;
+bool SketcherPrs_HVDirection::updateIfReadyToDisplay(double theStep) const
+{
+ if (
!IsReadyToDisplay(myConstraint, myPlane)
)
+ return
false
;
+ // Set point of the symbol
+ ObjectPtr aObj = SketcherPrs_Tools::getResult(myConstraint, SketchPlugin_Constraint::ENTITY_A());
SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
- gp_Pnt aP1 = aMgr->getPosition(aObj1, this);
-
- Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation);
- aGroup->SetPrimitivesAspect(myAspect);
+ gp_Pnt aP1 = aMgr->getPosition(aObj, this, theStep);
myPntArray->SetVertice(1, aP1);
myPntArray->SetVertice(1, aP1);
-
aGroup->AddPrimitiveArray(myPntArray)
;
+
return true
;
}
void SketcherPrs_HVDirection::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const
{
Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs);
}
void SketcherPrs_HVDirection::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const
{
Handle(Graphic3d_Group) aGroup = Prs3d_Root::NewGroup(thePrs);
+ // Draw constrained object
Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
aGroup->SetPrimitivesAspect(aLineAspect);
Handle(Graphic3d_AspectLine3d) aLineAspect = new Graphic3d_AspectLine3d(theColor, Aspect_TOL_SOLID, 2);
aGroup->SetPrimitivesAspect(aLineAspect);