kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix Section arrows,xDir,label

Browse Source
This commit is contained in:
WandererFan
2016-08-30 20:20:42 -04:00
parent 32ba9c202d
commit 1bf2dc7411
12 changed files with 179 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Mod/TechDraw/App/DrawView.cpp
View File

@@ -79,6 +79,7 @@ DrawView::~DrawView()
App::DocumentObjectExecReturn *DrawView::execute(void)
{
Base::Console().Message("TRACE - DV::execute\n");
TechDraw::DrawPage *page = findParentPage();
if(page) {
if (ScaleType.isValue("Document")) {
@@ -101,9 +102,7 @@ App::DocumentObjectExecReturn *DrawView::execute(void)
void DrawView::onChanged(const App::Property* prop)
{
if (!isRestoring()) {
if (prop == &Scale) {
execute();
} else if (prop == &ScaleType) {
if (prop == &ScaleType) {
if (ScaleType.isValue("Document")) {
Scale.setStatus(App::Property::ReadOnly,true);
App::GetApplication().signalChangePropertyEditor(Scale);
@@ -114,21 +113,34 @@ void DrawView::onChanged(const App::Property* prop)
Scale.setStatus(App::Property::ReadOnly,true);
App::GetApplication().signalChangePropertyEditor(Scale);
}
execute();
} else if (prop == &X ||
prop == &Y) {
if (isMouseMove()) {
setAutoPos(false); //should only be for manual changes? not programmatic changes?
}
execute();
} else if (prop == &Rotation) {
execute();
}
}
App::DocumentObject::onChanged(prop);
}
short DrawView::mustExecute() const
{
short result = 0;
if (!isRestoring()) {
result = (X.isTouched() ||
Y.isTouched() ||
Rotation.isTouched() ||
Scale.isTouched() ||
ScaleType.isTouched() );
}
if (result) {
return result;
} else {
return App::DocumentObject::mustExecute();
}
}
////you must override this in derived class
QRectF DrawView::getRect() const
{

1
src/Mod/TechDraw/App/DrawView.h
View File

@@ -58,6 +58,7 @@ public:
/// recalculate the Feature
virtual App::DocumentObjectExecReturn *execute(void);
virtual void onDocumentRestored();
virtual short mustExecute() const;
//@}
bool isInClip();

74
src/Mod/TechDraw/App/DrawViewPart.cpp
View File

@@ -118,7 +118,7 @@ DrawViewPart::DrawViewPart(void) : geometryObject(0)
ADD_PROPERTY_TYPE(ShowSectionLine ,(true) ,lgroup,App::Prop_None,"Show/hide section line if applicable");
ADD_PROPERTY_TYPE(HorizSectionLine ,(true) ,lgroup,App::Prop_None,"Section line is horizontal");
ADD_PROPERTY_TYPE(ArrowUpSection ,(true) ,lgroup,App::Prop_None,"Section line arrows point up");
ADD_PROPERTY_TYPE(ArrowUpSection ,(false) ,lgroup,App::Prop_None,"Section line arrows point up");
ADD_PROPERTY_TYPE(SymbolSection,("A") ,lgroup,App::Prop_None,"Section identifier");
@@ -133,6 +133,7 @@ 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");
@@ -175,7 +176,7 @@ App::DocumentObjectExecReturn *DrawViewPart::execute(void)
}
// There is a guaranteed change so check any references linked to this and touch
// We need to update all views pointing at this (ProjectionGroup, ClipGroup, etc)
// We need to update all views pointing at this (ProjectionGroup, ClipGroup, Section, etc)
std::vector<App::DocumentObject*> parent = getInList();
for (std::vector<App::DocumentObject*>::iterator it = parent.begin(); it != parent.end(); ++it) {
if ((*it)->getTypeId().isDerivedFrom(DrawView::getClassTypeId())) {
@@ -188,18 +189,33 @@ App::DocumentObjectExecReturn *DrawViewPart::execute(void)
short DrawViewPart::mustExecute() const
{
short result = (Direction.isTouched() ||
XAxisDirection.isTouched() ||
Source.isTouched() ||
Scale.isTouched() ||
ScaleType.isTouched() ||
ShowHiddenLines.isTouched() ||
ShowSmoothLines.isTouched() ||
ShowSeamLines.isTouched() ||
LineWidth.isTouched() ||
Tolerance.isTouched() ||
HiddenWidth.isTouched());
return result;
short result = 0;
if (!isRestoring()) {
result = (Direction.isTouched() ||
XAxisDirection.isTouched() ||
Source.isTouched() ||
Scale.isTouched() ||
ScaleType.isTouched() ||
Tolerance.isTouched() ||
ShowHiddenLines.isTouched() ||
ShowSmoothLines.isTouched() ||
ShowSeamLines.isTouched() ||
LineWidth.isTouched() ||
HiddenWidth.isTouched() ||
ShowCenters.isTouched() ||
CenterScale.isTouched() ||
ShowSectionLine.isTouched() ||
HorizSectionLine.isTouched() ||
ArrowUpSection.isTouched() ||
SymbolSection.isTouched() ||
HorizCenterLine.isTouched() ||
VertCenterLine.isTouched());
}
if (result) {
return result;
}
return TechDraw::DrawView::mustExecute();
}
void DrawViewPart::onChanged(const App::Property* prop)
@@ -545,22 +561,36 @@ Base::Vector3d DrawViewPart::getValidXDir() const
{
Base::Vector3d X(1.0,0.0,0.0);
Base::Vector3d Y(0.0,1.0,0.0);
Base::Vector3d Z(0.0,0.0,1.0);
Base::Vector3d xDir = XAxisDirection.getValue();
if (xDir.Length() < Precision::Confusion()) {
Base::Console().Warning("XAxisDirection has zero length - using (1,0,0)\n");
xDir = X;
}
double xLength = xDir.Length();
xDir.Normalize();
Base::Vector3d viewDir = Direction.getValue();
if ((xDir - viewDir).Length() < Precision::Confusion()) {
if (xDir == X) {
xDir = Y;
}else{
xDir = X;
viewDir.Normalize();
Base::Vector3d randomDir(0.0,0.0,0.0);
if (xDir == viewDir) {
randomDir = Y;
if (randomDir == xDir) {
randomDir = X;
}
Base::Console().Warning("XAxisDirection cannot equal Direction - using (%.3f,%.3f%.3f)\n",
xDir.x,xDir.y,xDir.z);
xDir = randomDir;
Base::Console().Warning("XAxisDirection cannot equal +/- Direction - using (%.3f,%.3f%.3f)\n",
xDir.x,xDir.y,xDir.z);
} else if (xDir == (-1.0 * viewDir)) {
randomDir = Y;
if ((xDir == randomDir) ||
(xDir == (-1.0 * randomDir))) {
randomDir = X;
}
xDir = randomDir;
Base::Console().Warning("XAxisDirection cannot equal +/- Direction - using (%.3f,%.3f%.3f)\n",
xDir.x,xDir.y,xDir.z);
}
return xDir;
return xLength * xDir;
}
void DrawViewPart::saveParamSpace(const Base::Vector3d& direction,

2
src/Mod/TechDraw/App/DrawViewPart.h
View File

@@ -107,7 +107,7 @@ public:
Base::Vector3d getValidXDir() const;
Base::Vector3d projectPoint(const Base::Vector3d& pt) const;
short mustExecute() const;
virtual short mustExecute() const;
/** @name methods overide Feature */
//@{

76
src/Mod/TechDraw/App/DrawViewSection.cpp
View File

@@ -52,6 +52,7 @@
#endif
#include <chrono>
#include <App/Application.h>
#include <App/Material.h>
@@ -101,18 +102,29 @@ DrawViewSection::~DrawViewSection()
short DrawViewSection::mustExecute() const
{
// If Tolerance Property is touched
if(SectionNormal.isTouched() ||
SectionOrigin.isTouched() ||
ShowCutSurface.isTouched() ||
CutSurfaceColor.isTouched() )
return 1;
short result = 0;
if (!isRestoring()) {
result = (Scale.isTouched() ||
ScaleType.isTouched() ||
BaseView.isTouched() ||
SectionNormal.isTouched() ||
Direction.isTouched() ||
SectionOrigin.isTouched() ||
XAxisDirection.isTouched() ||
ShowCutSurface.isTouched() ||
CutSurfaceColor.isTouched() );
}
if (result) {
return result;
}
return TechDraw::DrawViewPart::mustExecute();
}
App::DocumentObjectExecReturn *DrawViewSection::execute(void)
{
//Base::Console().Message("TRACE - DVS::execute: %s\n",getNameInDocument());
//auto system_start = chrono::high_resolution_clock::now();
App::DocumentObject* link = Source.getValue();
App::DocumentObject* base = BaseView.getValue();
if (!link || !base) {
@@ -126,7 +138,7 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
return new App::DocumentObjectExecReturn("BaseView object is not a DrawViewPart object");
const Part::TopoShape &partTopo = static_cast<Part::Feature*>(link)->Shape.getShape();
const TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(base);
//const TechDraw::DrawViewPart* dvp = static_cast<TechDraw::DrawViewPart*>(base);
if (partTopo.getShape().IsNull())
return new App::DocumentObjectExecReturn("Linked shape object is empty");
@@ -142,7 +154,6 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
Base::Vector3d tmp1 = SectionOrigin.getValue();
Base::Vector3d plnPnt(tmp1.x, tmp1.y, tmp1.z);
//Base::Vector3d tmp2 = SectionNormal.getValue();
Base::Vector3d plnNorm(plnNormal.X(), plnNormal.Y(), plnNormal.Z());
// if(!bb.IsCutPlane(plnPnt, plnNorm)) { //this test doesn't work if plane is coincident with bb!
@@ -150,37 +161,12 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
Base::Console().Warning("DVS: Section Plane doesn't intersect part in %s\n",getNameInDocument());
Base::Console().Warning("DVS: Using center of bounding box.\n");
plnPnt = bb.GetCenter();
SectionOrigin.setValue(plnPnt);
//SectionOrigin.setValue(plnPnt);
}
// Gather the corner points of bbox
std::vector<Base::Vector3d> pnts;
pnts.push_back(Base::Vector3d(bb.MinX,bb.MinY,bb.MinZ));
pnts.push_back(Base::Vector3d(bb.MaxX,bb.MinY,bb.MinZ));
pnts.push_back(Base::Vector3d(bb.MinX,bb.MaxY,bb.MinZ));
pnts.push_back(Base::Vector3d(bb.MaxX,bb.MaxY,bb.MinZ));
pnts.push_back(Base::Vector3d(bb.MinX,bb.MinY,bb.MaxZ));
pnts.push_back(Base::Vector3d(bb.MaxX,bb.MinY,bb.MaxZ));
pnts.push_back(Base::Vector3d(bb.MinX,bb.MaxY,bb.MaxZ));
pnts.push_back(Base::Vector3d(bb.MaxX,bb.MaxY,bb.MaxZ));
double dMax = bb.CalcDiagonalLength();
double uMax = 0, vMax = 0, wMax = 0., dMax = 0;
for(std::vector<Base::Vector3d>::const_iterator it = pnts.begin(); it != pnts.end(); ++it) {
// Project each bounding box point onto projection plane and find largest u,v,w values
Base::Vector3d pnt = (*it);
pnt.ProjectToPlane(plnPnt, plnNorm);
uMax = std::max(uMax, std::abs(plnPnt.x - pnt.x)); //one will be zero
vMax = std::max(vMax, std::abs(plnPnt.y - pnt.y));
wMax = std::max(wMax, std::abs(plnPnt.z - pnt.z));
//dMax is the bounding box point furthest away from plane. used for determining extrusion length
double dist = (*it).DistanceToPlane(plnPnt, plnNorm);
dMax = std::max(dMax, dist);
}
//use largest of u,v,w to make cutting face that covers whole shape
double maxParm = std::max(uMax,vMax);
maxParm = std::max(maxParm,wMax);
double maxParm = dMax;
BRepBuilderAPI_MakePolygon mkPoly;
gp_Pnt pn1(origin + xAxis * maxParm + yAxis * maxParm);
gp_Pnt pn2(origin + xAxis * maxParm + yAxis * -maxParm);
@@ -212,10 +198,11 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
geometryObject->setTolerance(Tolerance.getValue());
geometryObject->setScale(Scale.getValue());
Base::Vector3d validXDir = getValidXDir();
try {
gp_Pnt inputCenter = TechDrawGeometry::findCentroid(rawShape,
Direction.getValue(),
getValidXDir());
validXDir);
TopoDS_Shape mirroredShape = TechDrawGeometry::mirrorShape(rawShape,
inputCenter,
Scale.getValue());
@@ -239,7 +226,7 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
TopoDS_Face pFace = projectFace(face,
inputCenter,
Direction.getValue(),
getValidXDir());
validXDir);
builder.Add(newFaces,pFace);
}
@@ -251,14 +238,10 @@ App::DocumentObjectExecReturn *DrawViewSection::execute(void)
std::string(e1->GetMessageString()));
}
std::string symbol = dvp->SymbolSection.getValue();
std::string symbolText = "Section " + symbol + "-" + symbol;
if (symbolText.compare(Label.getValue())) {
Label.setValue(symbolText.c_str());
}
//auto diff = chrono::system_clock::now() - system_start;
//auto dur = chrono::duration_cast<std::chrono::milliseconds>(diff);
//Base::Console().Message("TRACE - DVS::execute - took %.3f millisecs\n",dur.count());
touch();
return DrawView::execute();
}
@@ -366,6 +349,7 @@ TopoDS_Face DrawViewSection::projectFace(const TopoDS_Shape &face,
}
faceEdges.push_back(edge);
}
//TODO: verify that outline edges aren't required
//if edge is both hard & outline, it will be duplicated? are hard edges enough?
// TopExp_Explorer expl2(outEdges, TopAbs_EDGE);
// for (i = 1 ; expl2.More(); expl2.Next(),i++) {

2
src/Mod/TechDraw/App/DrawViewSection.h
View File

@@ -61,7 +61,7 @@ public:
App::PropertyBool ShowCutSurface;
App::PropertyColor CutSurfaceColor;
short mustExecute() const;
virtual short mustExecute() const;
bool isReallyInBox (const Base::Vector3d v, const Base::BoundBox3d bb) const;
/** @name methods overide Feature */
//@{