getViewAxis -> DVP virtual method
This commit is contained in:
parent
489a25e462
commit
ca8adc3aab
|
@ -26,9 +26,12 @@
|
|||
# include <sstream>
|
||||
#endif
|
||||
|
||||
#include <gp_Ax2.hxx>
|
||||
#include <Base/Console.h>
|
||||
#include <Base/Writer.h>
|
||||
|
||||
#include "GeometryObject.h"
|
||||
#include "DrawUtil.h"
|
||||
#include "DrawProjGroup.h"
|
||||
#include "DrawProjGroupItem.h"
|
||||
|
||||
|
@ -56,28 +59,52 @@ DrawProjGroupItem::DrawProjGroupItem(void)
|
|||
{
|
||||
Type.setEnums(TypeEnums);
|
||||
ADD_PROPERTY(Type, ((long)0));
|
||||
ADD_PROPERTY_TYPE(OrientBasis ,(1.0,0.0,0.0) ,"Base",App::Prop_None,"Controls rotary orientation of item in view. ");
|
||||
|
||||
//projection group controls these
|
||||
Direction.setStatus(App::Property::ReadOnly,true);
|
||||
//OrientBasis.setStatus(App::Property::ReadOnly,true);
|
||||
Scale.setStatus(App::Property::ReadOnly,true);
|
||||
ScaleType.setStatus(App::Property::ReadOnly,true);
|
||||
}
|
||||
|
||||
short DrawProjGroupItem::mustExecute() const
|
||||
{
|
||||
if (Type.isTouched())
|
||||
return 1;
|
||||
short result = 0;
|
||||
if (!isRestoring()) {
|
||||
result = (Direction.isTouched() ||
|
||||
OrientBasis.isTouched() ||
|
||||
Source.isTouched() ||
|
||||
Scale.isTouched() ||
|
||||
ScaleType.isTouched());
|
||||
}
|
||||
|
||||
if (result) {
|
||||
return result;
|
||||
}
|
||||
return TechDraw::DrawViewPart::mustExecute();
|
||||
}
|
||||
|
||||
void DrawProjGroupItem::onChanged(const App::Property *prop)
|
||||
{
|
||||
//TODO: Should we allow changes to the Type here? Seems that should be handled through DrawProjGroup
|
||||
if (prop == &Type && Type.isTouched()) {
|
||||
if (!isRestoring()) {
|
||||
execute();
|
||||
}
|
||||
}
|
||||
// //TODO: too many executes!
|
||||
// //TODO: Should we allow changes to the Type here? Seems that should be handled through DrawProjGroup
|
||||
// if (!isRestoring()) {
|
||||
//// //Base::Console().Message("TRACE - DPGI::onChanged(%s) - %s/%s\n",prop->getName(),getNameInDocument(),Label.getValue());
|
||||
// if (prop == &Type && Type.isTouched()) {
|
||||
//// //Base::Console().Message("TRACE - DPGI::onChanged(%s) - Type: %s\n",prop->getName(),Type.getValueAsString());
|
||||
//// execute();
|
||||
// } else if (prop == &Direction) {
|
||||
// if (getGroup() != nullptr) {
|
||||
// OrientBasis.setValue(getGroup()->getXAxisDir(Type.getValueAsString()));
|
||||
// Base::Console().Message("TRACE - DPGI::onChanged(%s) - Direction: %s Orient: %s\n",
|
||||
// prop->getName(),DrawUtil::formatVector(Direction.getValue()).c_str(),
|
||||
// DrawUtil::formatVector(OrientBasis.getValue()).c_str());
|
||||
// }
|
||||
// }
|
||||
//// execute();
|
||||
//// } //else if (prop == &OrientBasis) { //don't want to do twice though!
|
||||
// }
|
||||
|
||||
TechDraw::DrawViewPart::onChanged(prop);
|
||||
|
||||
|
@ -96,7 +123,7 @@ void DrawProjGroupItem::onDocumentRestored()
|
|||
}
|
||||
}
|
||||
|
||||
DrawProjGroup* DrawProjGroupItem::getGroup()
|
||||
DrawProjGroup* DrawProjGroupItem::getGroup() const
|
||||
{
|
||||
DrawProjGroup* result = nullptr;
|
||||
std::vector<App::DocumentObject*> parent = getInList();
|
||||
|
@ -108,6 +135,71 @@ DrawProjGroup* DrawProjGroupItem::getGroup()
|
|||
}
|
||||
return result;
|
||||
}
|
||||
gp_Ax2 DrawProjGroupItem::getViewAxis(const Base::Vector3d& pt,
|
||||
const Base::Vector3d& axis,
|
||||
const bool flip) const
|
||||
{
|
||||
// Base::Console().Message("TRACE - DPGI::getViewAxis - %s/%s - Type: %s\n",getNameInDocument(),Label.getValue(),Type.getValueAsString());
|
||||
gp_Ax2 viewAxis;
|
||||
Base::Vector3d x = OrientBasis.getValue();
|
||||
Base::Vector3d nx = x;
|
||||
x.Normalize();
|
||||
Base::Vector3d na = axis;
|
||||
na.Normalize();
|
||||
// Base::Console().Message("TRACE - DPGI::getViewAxis - axis: %s orient: %s\n",
|
||||
// DrawUtil::formatVector(axis).c_str(),DrawUtil::formatVector(x).c_str());
|
||||
|
||||
if (DrawUtil::checkParallel(nx,na)) { //parallel/antiparallel
|
||||
// Base::Console().Message("TRACE - DPGI::getViewAxis - parallel flip: %d\n",flip);
|
||||
viewAxis = TechDrawGeometry::getViewAxis(pt,axis,flip); //use default orientation
|
||||
} else {
|
||||
// Base::Console().Message("TRACE - DPGI::getViewAxis - skew flip: %d\n",flip);
|
||||
viewAxis = TechDrawGeometry::getViewAxis(pt,axis,x,flip);
|
||||
}
|
||||
|
||||
// if (Type.isValue("Front")) {
|
||||
// viewAxis = TechDrawGeometry::getViewAxis(pt,axis,flip); //show front in upright stance
|
||||
// } else {
|
||||
// const char *viewProjType = Type.getValueAsString();
|
||||
// DrawProjGroup* grp = getGroup();
|
||||
// if (grp == nullptr) {
|
||||
// Base::Console().Message("TRACE - DPGI::getViewAxis - NO GROUP!!!\n");
|
||||
// return TechDrawGeometry::getViewAxis(pt,axis,flip); //too early
|
||||
// } else {
|
||||
// getGroup()->dumpViewDir("viewDir map"); //<<<<
|
||||
// getGroup()->dumpXAxisDir("xAxisDir map");
|
||||
// Base::Vector3d x = getGroup()->getXAxisDir(viewProjType);
|
||||
// Base::Vector3d x = OrientBasis.getValue();
|
||||
// viewAxis = TechDrawGeometry::getViewAxis(pt,axis,x,flip);
|
||||
// }
|
||||
// }
|
||||
//Base::Console().Message("TRACE - DPGI::getViewAxis exits\n");
|
||||
return viewAxis;
|
||||
}
|
||||
|
||||
//! rotate OrientBasis by angle radians around view Direction
|
||||
Base::Vector3d DrawProjGroupItem::rotated(const double angle)
|
||||
{
|
||||
Base::Console().Message("TRACE - DPGI::rotated - %s/%s angle: %.3f\n",Label.getValue(),Type.getValueAsString(),angle);
|
||||
Base::Vector3d line = Direction.getValue();
|
||||
Base::Vector3d oldBasis = OrientBasis.getValue();
|
||||
Base::Vector3d newBasis;
|
||||
Base::Vector3d org(0.0,0.0,0.0);
|
||||
Base::Matrix4D xForm;
|
||||
xForm.rotLine(line,angle);
|
||||
newBasis = xForm * (oldBasis);
|
||||
Base::Console().Message("TRACE - DPGI::rotated - line: %s old: %s new: %s\n",
|
||||
DrawUtil::formatVector(line).c_str(),
|
||||
DrawUtil::formatVector(oldBasis).c_str(),
|
||||
DrawUtil::formatVector(newBasis).c_str());
|
||||
if (getGroup() != nullptr) {
|
||||
if (getGroup()->getException(Type.getValueAsString())) {
|
||||
newBasis = newBasis * -1.0;
|
||||
Base::Console().Message("TRACE - DPGI::rotated - EXCEPTION\n");
|
||||
}
|
||||
}
|
||||
return newBasis;
|
||||
}
|
||||
|
||||
PyObject *DrawProjGroupItem::getPyObject(void)
|
||||
{
|
||||
|
|
|
@ -54,6 +54,7 @@ public:
|
|||
~DrawProjGroupItem();
|
||||
|
||||
App::PropertyEnumeration Type;
|
||||
App::PropertyVector OrientBasis;
|
||||
|
||||
short mustExecute() const;
|
||||
/** @name methods overide Feature */
|
||||
|
@ -63,7 +64,10 @@ public:
|
|||
// virtual App::DocumentObjectExecReturn *execute(void); // TODO: Delete me too if we take out the implementation
|
||||
//@}
|
||||
|
||||
DrawProjGroup* getGroup(void);
|
||||
DrawProjGroup* getGroup(void) const;
|
||||
virtual gp_Ax2 getViewAxis(const Base::Vector3d& pt,
|
||||
const Base::Vector3d& direction,
|
||||
const bool flip=true) const override;
|
||||
|
||||
/// returns the type name of the ViewProvider
|
||||
virtual const char* getViewProviderName(void) const {
|
||||
|
|
|
@ -115,7 +115,8 @@ std::vector<TopoDS_Edge> DrawProjectSplit::getEdgesForWalker(TopoDS_Shape shape,
|
|||
TopoDS_Shape scaledShape;
|
||||
scaledShape = TechDrawGeometry::scaleShape(copyShape,
|
||||
scale);
|
||||
TechDrawGeometry::GeometryObject* go = buildGeometryObject(scaledShape,inputCenter,direction);
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(Base::Vector3d(0.0,0.0,0.0),direction);
|
||||
TechDrawGeometry::GeometryObject* go = buildGeometryObject(scaledShape,viewAxis);
|
||||
result = getEdges(go);
|
||||
|
||||
delete go;
|
||||
|
@ -123,16 +124,13 @@ std::vector<TopoDS_Edge> DrawProjectSplit::getEdgesForWalker(TopoDS_Shape shape,
|
|||
}
|
||||
|
||||
|
||||
TechDrawGeometry::GeometryObject* DrawProjectSplit::buildGeometryObject(
|
||||
TopoDS_Shape shape,
|
||||
gp_Pnt& inputCenter,
|
||||
Base::Vector3d direction)
|
||||
TechDrawGeometry::GeometryObject* DrawProjectSplit::buildGeometryObject(TopoDS_Shape shape,
|
||||
gp_Ax2 viewAxis)
|
||||
{
|
||||
TechDrawGeometry::GeometryObject* geometryObject = new TechDrawGeometry::GeometryObject("DrawProjectSplit");
|
||||
|
||||
geometryObject->projectShape(shape,
|
||||
inputCenter,
|
||||
direction);
|
||||
viewAxis);
|
||||
geometryObject->extractGeometry(TechDrawGeometry::ecHARD, //always show the hard&outline visible lines
|
||||
true);
|
||||
geometryObject->extractGeometry(TechDrawGeometry::ecOUTLINE,
|
||||
|
@ -440,8 +438,13 @@ std::vector<TopoDS_Edge> DrawProjectSplit::removeDuplicateEdges(std::vector<Topo
|
|||
auto last = std::unique(sorted.begin(), sorted.end(), edgeSortItem::edgeEqual); //duplicates to back
|
||||
sorted.erase(last, sorted.end()); //remove dupls
|
||||
|
||||
for (auto& e: sorted) {
|
||||
result.push_back(inEdges.at(e.idx));
|
||||
//TODO: "sorted" turns to garbage if pagescale set to "0.1"!!!!???? ***
|
||||
for (auto e: sorted) {
|
||||
if (e.idx < inEdges.size()) {
|
||||
result.push_back(inEdges.at(e.idx)); //<<< ***here
|
||||
} else {
|
||||
Base::Console().Message("ERROR - DPS::removeDuplicateEdges - access: %d inEdges: %d\n",e.idx,inEdges.size());
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
|
@ -79,7 +79,7 @@ public:
|
|||
|
||||
public:
|
||||
static std::vector<TopoDS_Edge> getEdgesForWalker(TopoDS_Shape shape, double scale, Base::Vector3d direction);
|
||||
static TechDrawGeometry::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Pnt& center, Base::Vector3d direction);
|
||||
static TechDrawGeometry::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis);
|
||||
|
||||
static bool isOnEdge(TopoDS_Edge e, TopoDS_Vertex v, double& param, bool allowEnds = false);
|
||||
static std::vector<TopoDS_Edge> splitEdges(std::vector<TopoDS_Edge> orig, std::vector<splitPoint> splits);
|
||||
|
|
|
@ -169,7 +169,7 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void)
|
|||
double radius = Radius.getValue() * radiusFudge;
|
||||
Base::Vector3d dirDetail = dvp->Direction.getValue();
|
||||
double scale = Scale.getValue();
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(Base::Vector3d(0.0,0.0,0.0), dirDetail, false);
|
||||
gp_Ax2 viewAxis = getViewAxis(Base::Vector3d(0.0,0.0,0.0), dirDetail, false);
|
||||
|
||||
Base::BoundBox3d bbxSource = partTopo.getBoundBox();
|
||||
|
||||
|
@ -239,7 +239,8 @@ App::DocumentObjectExecReturn *DrawViewDetail::execute(void)
|
|||
TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(detail,
|
||||
inputCenter,
|
||||
scale);
|
||||
geometryObject = buildGeometryObject(mirroredShape,inputCenter);
|
||||
gp_Ax2 viewAxis = getViewAxis(Base::Vector3d(inputCenter.X(),inputCenter.Y(),inputCenter.Z()),Direction.getValue());
|
||||
geometryObject = buildGeometryObject(mirroredShape,viewAxis);
|
||||
|
||||
#if MOD_TECHDRAW_HANDLE_FACES
|
||||
if (handleFaces()) {
|
||||
|
|
|
@ -146,7 +146,8 @@ App::DocumentObjectExecReturn *DrawViewMulti::execute(void)
|
|||
TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(comp,
|
||||
inputCenter,
|
||||
Scale.getValue());
|
||||
geometryObject = buildGeometryObject(mirroredShape,inputCenter);
|
||||
gp_Ax2 viewAxis = getViewAxis(Base::Vector3d(inputCenter.X(),inputCenter.Y(),inputCenter.Z()),Direction.getValue());
|
||||
geometryObject = buildGeometryObject(mirroredShape,viewAxis);
|
||||
|
||||
#if MOD_TECHDRAW_HANDLE_FACES
|
||||
extractFaces();
|
||||
|
|
|
@ -143,7 +143,6 @@ DrawViewPart::~DrawViewPart()
|
|||
|
||||
App::DocumentObjectExecReturn *DrawViewPart::execute(void)
|
||||
{
|
||||
//Base::Console().Message("TRACE - DVP::execute() - %s\n",getNameInDocument());
|
||||
App::DocumentObject *link = Source.getValue();
|
||||
if (!link) {
|
||||
return new App::DocumentObjectExecReturn("FVP - No Source object linked");
|
||||
|
@ -157,6 +156,7 @@ App::DocumentObjectExecReturn *DrawViewPart::execute(void)
|
|||
if (shape.IsNull()) {
|
||||
return new App::DocumentObjectExecReturn("FVP - Linked shape object is empty");
|
||||
}
|
||||
Base::Console().Message("TRACE - DVP::execute() - %s - %s - dir: %s\n",getNameInDocument(), Label.getValue(),DrawUtil::formatVector(Direction.getValue()).c_str());
|
||||
|
||||
|
||||
(void) DrawView::execute(); //make sure Scale is up to date
|
||||
|
@ -171,7 +171,8 @@ App::DocumentObjectExecReturn *DrawViewPart::execute(void)
|
|||
inputCenter,
|
||||
Scale.getValue());
|
||||
|
||||
geometryObject = buildGeometryObject(mirroredShape,inputCenter);
|
||||
gp_Ax2 viewAxis = getViewAxis(shapeCentroid,Direction.getValue());
|
||||
geometryObject = buildGeometryObject(mirroredShape,viewAxis);
|
||||
|
||||
#if MOD_TECHDRAW_HANDLE_FACES
|
||||
if (handleFaces()) {
|
||||
|
@ -186,6 +187,9 @@ App::DocumentObjectExecReturn *DrawViewPart::execute(void)
|
|||
}
|
||||
#endif //#if MOD_TECHDRAW_HANDLE_FACES
|
||||
|
||||
Base::Console().Message("TRACE _ DVP::exec - %s/%s u: %s v: %s w: %s\n",getNameInDocument(),Label.getValue(),
|
||||
DrawUtil::formatVector(getUDir()).c_str(), DrawUtil::formatVector(getVDir()).c_str(),DrawUtil::formatVector(getWDir()).c_str());
|
||||
|
||||
return App::DocumentObject::StdReturn;
|
||||
}
|
||||
|
||||
|
@ -214,7 +218,7 @@ void DrawViewPart::onChanged(const App::Property* prop)
|
|||
}
|
||||
|
||||
//note: slightly different than routine with same name in DrawProjectSplit
|
||||
TechDrawGeometry::GeometryObject* DrawViewPart::buildGeometryObject(TopoDS_Shape shape, gp_Pnt& inputCenter)
|
||||
TechDrawGeometry::GeometryObject* DrawViewPart::buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis)
|
||||
{
|
||||
TechDrawGeometry::GeometryObject* go = new TechDrawGeometry::GeometryObject(getNameInDocument());
|
||||
go->setIsoCount(IsoCount.getValue());
|
||||
|
@ -223,8 +227,7 @@ TechDrawGeometry::GeometryObject* DrawViewPart::buildGeometryObject(TopoDS_Shape
|
|||
saveParamSpace(baseProjDir);
|
||||
|
||||
go->projectShape(shape,
|
||||
inputCenter,
|
||||
Direction.getValue());
|
||||
viewAxis);
|
||||
go->extractGeometry(TechDrawGeometry::ecHARD, //always show the hard&outline visible lines
|
||||
true);
|
||||
go->extractGeometry(TechDrawGeometry::ecOUTLINE,
|
||||
|
@ -358,7 +361,7 @@ void DrawViewPart::extractFaces()
|
|||
return;
|
||||
}
|
||||
|
||||
newEdges = DrawProjectSplit::removeDuplicateEdges(newEdges);
|
||||
newEdges = DrawProjectSplit::removeDuplicateEdges(newEdges); //<<< here
|
||||
|
||||
//find all the wires in the pile of faceEdges
|
||||
EdgeWalker ew;
|
||||
|
@ -487,7 +490,7 @@ Base::Vector3d DrawViewPart::projectPoint(const Base::Vector3d& pt) const
|
|||
{
|
||||
Base::Vector3d centeredPoint = pt - shapeCentroid;
|
||||
Base::Vector3d direction = Direction.getValue();
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(centeredPoint,direction);
|
||||
gp_Ax2 viewAxis = getViewAxis(centeredPoint,direction);
|
||||
HLRAlgo_Projector projector( viewAxis );
|
||||
gp_Pnt2d prjPnt;
|
||||
projector.Project(gp_Pnt(centeredPoint.x,centeredPoint.y,centeredPoint.z), prjPnt);
|
||||
|
@ -511,10 +514,23 @@ bool DrawViewPart::hasGeometry(void) const
|
|||
return result;
|
||||
}
|
||||
|
||||
void DrawViewPart::saveParamSpace(const Base::Vector3d& direction)
|
||||
//boring here. gets more interesting in descendents.
|
||||
gp_Ax2 DrawViewPart::getViewAxis(const Base::Vector3d& pt,
|
||||
const Base::Vector3d& axis,
|
||||
const bool flip,
|
||||
const Base::Vector3d& xAxis) const
|
||||
{
|
||||
(void)xAxis;
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(pt,axis,flip);
|
||||
return viewAxis;
|
||||
}
|
||||
|
||||
//this might have to be virtual for dpgi?
|
||||
void DrawViewPart::saveParamSpace(const Base::Vector3d& direction, const Base::Vector3d& xAxis)
|
||||
{
|
||||
(void)xAxis;
|
||||
Base::Vector3d origin(0.0,0.0,0.0);
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(origin,direction);
|
||||
gp_Ax2 viewAxis = getViewAxis(origin,direction);
|
||||
|
||||
gp_Dir xdir = viewAxis.XDirection();
|
||||
uDir = Base::Vector3d(xdir.X(),xdir.Y(),xdir.Z());
|
||||
|
|
|
@ -114,6 +114,10 @@ public:
|
|||
const Base::Vector3d& getWDir(void) const {return wDir;} //paperspace Z
|
||||
const Base::Vector3d& getCentroid(void) const {return shapeCentroid;}
|
||||
Base::Vector3d projectPoint(const Base::Vector3d& pt) const;
|
||||
virtual gp_Ax2 getViewAxis(const Base::Vector3d& pt,
|
||||
const Base::Vector3d& direction,
|
||||
const bool flip=true,
|
||||
const Base::Vector3d& xAxis=Base::Vector3d(0.0,0.0,0.0)) const;
|
||||
|
||||
virtual short mustExecute() const;
|
||||
|
||||
|
@ -138,11 +142,11 @@ protected:
|
|||
Base::BoundBox3d bbox;
|
||||
|
||||
void onChanged(const App::Property* prop);
|
||||
TechDrawGeometry::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Pnt& center);
|
||||
virtual TechDrawGeometry::GeometryObject* buildGeometryObject(TopoDS_Shape shape, gp_Ax2 viewAxis);
|
||||
void extractFaces();
|
||||
|
||||
//Projection parameter space
|
||||
void saveParamSpace(const Base::Vector3d& direction);
|
||||
virtual void saveParamSpace(const Base::Vector3d& direction, const Base::Vector3d& xAxis=Base::Vector3d(0.0,0.0,0.0));
|
||||
Base::Vector3d uDir; //paperspace X
|
||||
Base::Vector3d vDir; //paperspace Y
|
||||
Base::Vector3d wDir; //paperspace Z
|
||||
|
|
|
@ -228,7 +228,8 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
|
|||
TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(rawShape,
|
||||
inputCenter,
|
||||
Scale.getValue());
|
||||
geometryObject = buildGeometryObject(mirroredShape,inputCenter); //this is original shape after cut by section prism
|
||||
gp_Ax2 viewAxis = getViewAxis(Base::Vector3d(inputCenter.X(),inputCenter.Y(),inputCenter.Z()),Direction.getValue());
|
||||
geometryObject = buildGeometryObject(mirroredShape,viewAxis); //this is original shape after cut by section prism
|
||||
|
||||
#if MOD_TECHDRAW_HANDLE_FACES
|
||||
extractFaces();
|
||||
|
@ -275,7 +276,7 @@ gp_Pln DrawViewSection::getSectionPlane() const
|
|||
{
|
||||
Base::Vector3d plnPnt = SectionOrigin.getValue();
|
||||
Base::Vector3d plnNorm = SectionNormal.getValue();
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(plnPnt,plnNorm,false);
|
||||
gp_Ax2 viewAxis = getViewAxis(plnPnt,plnNorm,false);
|
||||
gp_Ax3 viewAxis3(viewAxis);
|
||||
|
||||
return gp_Pln(viewAxis3);
|
||||
|
@ -351,7 +352,7 @@ TopoDS_Face DrawViewSection::projectFace(const TopoDS_Shape &face,
|
|||
}
|
||||
|
||||
Base::Vector3d origin(faceCenter.X(),faceCenter.Y(),faceCenter.Z());
|
||||
gp_Ax2 viewAxis = TechDrawGeometry::getViewAxis(origin,direction);
|
||||
gp_Ax2 viewAxis = getViewAxis(origin,direction);
|
||||
|
||||
HLRBRep_Algo *brep_hlr = new HLRBRep_Algo();
|
||||
brep_hlr->Add(face);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -1,126 +1,130 @@
|
|||
/***************************************************************************
|
||||
* Copyright (c) 2013 Luke Parry <l.parry@warwick.ac.uk> *
|
||||
* *
|
||||
* This file is part of the FreeCAD CAx development system. *
|
||||
* *
|
||||
* This library is free software; you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU Library General Public *
|
||||
* License as published by the Free Software Foundation; either *
|
||||
* version 2 of the License, or (at your option) any later version. *
|
||||
* *
|
||||
* This library is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU Library General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU Library General Public *
|
||||
* License along with this library; see the file COPYING.LIB. If not, *
|
||||
* write to the Free Software Foundation, Inc., 59 Temple Place, *
|
||||
* Suite 330, Boston, MA 02111-1307, USA *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef _TECHDRAW_GEOMETRYOBJECT_H
|
||||
#define _TECHDRAW_GEOMETRYOBJECT_H
|
||||
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Compound.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
|
||||
#include <Base/Vector3D.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "Geometry.h"
|
||||
|
||||
namespace TechDraw
|
||||
{
|
||||
class DrawViewPart;
|
||||
class DrawView;
|
||||
}
|
||||
|
||||
namespace TechDrawGeometry
|
||||
{
|
||||
|
||||
//! scales & mirrors a shape about a center
|
||||
TopoDS_Shape TechDrawExport mirrorShape(const TopoDS_Shape &input,
|
||||
const gp_Pnt& inputCenter,
|
||||
double scale);
|
||||
TopoDS_Shape TechDrawExport scaleShape(const TopoDS_Shape &input,
|
||||
double scale);
|
||||
|
||||
//! Returns the centroid of shape, as viewed according to direction
|
||||
gp_Pnt TechDrawExport findCentroid(const TopoDS_Shape &shape,
|
||||
const Base::Vector3d &direction);
|
||||
|
||||
gp_Ax2 TechDrawExport getViewAxis(const Base::Vector3d origin,
|
||||
const Base::Vector3d& direction,
|
||||
const bool flip=true);
|
||||
|
||||
class TechDrawExport GeometryObject
|
||||
{
|
||||
public:
|
||||
/// Constructor
|
||||
GeometryObject(const std::string& parent);
|
||||
virtual ~GeometryObject();
|
||||
|
||||
void clear();
|
||||
|
||||
void setScale(double value);
|
||||
|
||||
//! Returns 2D bounding box
|
||||
Base::BoundBox3d calcBoundingBox() const;
|
||||
|
||||
const std::vector<Vertex *> & getVertexGeometry() const { return vertexGeom; };
|
||||
const std::vector<BaseGeom *> & getEdgeGeometry() const { return edgeGeom; };
|
||||
const std::vector<BaseGeom *> getVisibleFaceEdges(bool smooth, bool seam) const;
|
||||
const std::vector<Face *> & getFaceGeometry() const { return faceGeom; };
|
||||
|
||||
void projectShape(const TopoDS_Shape &input,
|
||||
const gp_Pnt& inputCenter,
|
||||
const Base::Vector3d &direction);
|
||||
void extractGeometry(edgeClass category, bool visible);
|
||||
void addFaceGeom(Face * f);
|
||||
void clearFaceGeom();
|
||||
void setIsoCount(int i) { m_isoCount = i; }
|
||||
void setParentName(std::string n); //for debug messages
|
||||
|
||||
protected:
|
||||
//HLR output
|
||||
TopoDS_Shape visHard;
|
||||
TopoDS_Shape visOutline;
|
||||
TopoDS_Shape visSmooth;
|
||||
TopoDS_Shape visSeam;
|
||||
TopoDS_Shape visIso;
|
||||
TopoDS_Shape hidHard;
|
||||
TopoDS_Shape hidOutline;
|
||||
TopoDS_Shape hidSmooth;
|
||||
TopoDS_Shape hidSeam;
|
||||
TopoDS_Shape hidIso;
|
||||
|
||||
void addGeomFromCompound(TopoDS_Shape edgeCompound, edgeClass category, bool visible);
|
||||
|
||||
|
||||
//similar function in Geometry?
|
||||
/*!
|
||||
* Returns true iff angle theta is in [first, last], where the arc goes
|
||||
* clockwise (cw=true) or counterclockwise (cw=false) from first to last.
|
||||
*/
|
||||
bool isWithinArc(double theta, double first, double last, bool cw) const;
|
||||
|
||||
// Geometry
|
||||
std::vector<BaseGeom *> edgeGeom;
|
||||
std::vector<Vertex *> vertexGeom;
|
||||
std::vector<Face *> faceGeom;
|
||||
|
||||
bool findVertex(Base::Vector2d v);
|
||||
|
||||
double Scale;
|
||||
|
||||
std::string m_parentName;
|
||||
int m_isoCount;
|
||||
};
|
||||
|
||||
} //namespace TechDrawGeometry
|
||||
|
||||
#endif
|
||||
/***************************************************************************
|
||||
* Copyright (c) 2013 Luke Parry <l.parry@warwick.ac.uk> *
|
||||
* *
|
||||
* This file is part of the FreeCAD CAx development system. *
|
||||
* *
|
||||
* This library is free software; you can redistribute it and/or *
|
||||
* modify it under the terms of the GNU Library General Public *
|
||||
* License as published by the Free Software Foundation; either *
|
||||
* version 2 of the License, or (at your option) any later version. *
|
||||
* *
|
||||
* This library is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU Library General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU Library General Public *
|
||||
* License along with this library; see the file COPYING.LIB. If not, *
|
||||
* write to the Free Software Foundation, Inc., 59 Temple Place, *
|
||||
* Suite 330, Boston, MA 02111-1307, USA *
|
||||
* *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef _TECHDRAW_GEOMETRYOBJECT_H
|
||||
#define _TECHDRAW_GEOMETRYOBJECT_H
|
||||
|
||||
#include <TopoDS_Shape.hxx>
|
||||
#include <TopoDS_Compound.hxx>
|
||||
#include <gp_Pnt.hxx>
|
||||
|
||||
#include <Base/Vector3D.h>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "Geometry.h"
|
||||
|
||||
namespace TechDraw
|
||||
{
|
||||
class DrawViewPart;
|
||||
class DrawView;
|
||||
}
|
||||
|
||||
namespace TechDrawGeometry
|
||||
{
|
||||
|
||||
//! scales & mirrors a shape about a center
|
||||
TopoDS_Shape TechDrawExport mirrorShape(const TopoDS_Shape &input,
|
||||
const gp_Pnt& inputCenter,
|
||||
double scale);
|
||||
TopoDS_Shape TechDrawExport scaleShape(const TopoDS_Shape &input,
|
||||
double scale);
|
||||
|
||||
//! Returns the centroid of shape, as viewed according to direction
|
||||
gp_Pnt TechDrawExport findCentroid(const TopoDS_Shape &shape,
|
||||
const Base::Vector3d &direction);
|
||||
|
||||
gp_Ax2 TechDrawExport getViewAxis(const Base::Vector3d origin,
|
||||
const Base::Vector3d& direction,
|
||||
const bool flip=true);
|
||||
gp_Ax2 TechDrawExport getViewAxis(const Base::Vector3d origin,
|
||||
const Base::Vector3d& direction,
|
||||
const Base::Vector3d& xAxis,
|
||||
const bool flip=true);
|
||||
|
||||
class TechDrawExport GeometryObject
|
||||
{
|
||||
public:
|
||||
/// Constructor
|
||||
GeometryObject(const std::string& parent);
|
||||
virtual ~GeometryObject();
|
||||
|
||||
void clear();
|
||||
|
||||
void setScale(double value);
|
||||
|
||||
//! Returns 2D bounding box
|
||||
Base::BoundBox3d calcBoundingBox() const;
|
||||
|
||||
const std::vector<Vertex *> & getVertexGeometry() const { return vertexGeom; };
|
||||
const std::vector<BaseGeom *> & getEdgeGeometry() const { return edgeGeom; };
|
||||
const std::vector<BaseGeom *> getVisibleFaceEdges(bool smooth, bool seam) const;
|
||||
const std::vector<Face *> & getFaceGeometry() const { return faceGeom; };
|
||||
|
||||
void projectShape(const TopoDS_Shape &input,
|
||||
const gp_Ax2 viewAxis);
|
||||
|
||||
void extractGeometry(edgeClass category, bool visible);
|
||||
void addFaceGeom(Face * f);
|
||||
void clearFaceGeom();
|
||||
void setIsoCount(int i) { m_isoCount = i; }
|
||||
void setParentName(std::string n); //for debug messages
|
||||
|
||||
protected:
|
||||
//HLR output
|
||||
TopoDS_Shape visHard;
|
||||
TopoDS_Shape visOutline;
|
||||
TopoDS_Shape visSmooth;
|
||||
TopoDS_Shape visSeam;
|
||||
TopoDS_Shape visIso;
|
||||
TopoDS_Shape hidHard;
|
||||
TopoDS_Shape hidOutline;
|
||||
TopoDS_Shape hidSmooth;
|
||||
TopoDS_Shape hidSeam;
|
||||
TopoDS_Shape hidIso;
|
||||
|
||||
void addGeomFromCompound(TopoDS_Shape edgeCompound, edgeClass category, bool visible);
|
||||
|
||||
|
||||
//similar function in Geometry?
|
||||
/*!
|
||||
* Returns true iff angle theta is in [first, last], where the arc goes
|
||||
* clockwise (cw=true) or counterclockwise (cw=false) from first to last.
|
||||
*/
|
||||
bool isWithinArc(double theta, double first, double last, bool cw) const;
|
||||
|
||||
// Geometry
|
||||
std::vector<BaseGeom *> edgeGeom;
|
||||
std::vector<Vertex *> vertexGeom;
|
||||
std::vector<Face *> faceGeom;
|
||||
|
||||
bool findVertex(Base::Vector2d v);
|
||||
|
||||
double Scale;
|
||||
|
||||
std::string m_parentName;
|
||||
int m_isoCount;
|
||||
};
|
||||
|
||||
} //namespace TechDrawGeometry
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue
Block a user