Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dimensions modification bug #358

Merged
merged 4 commits into from
Sep 4, 2020
Merged

Fix dimensions modification bug #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b9c46d
Fix dimensions modification bug
Jedi18 Aug 26, 2020
1693670
Added dim aligned bounding box
Jedi18 Aug 26, 2020
3a99f7e
Implemented bounding box for remaining dimensions
Jedi18 Aug 26, 2020
0359b95
Merge branch 'master' into master
feragon Sep 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions lckernel/cad/primitive/dimaligned.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ CADEntity_CSPtr DimAligned::rotate(const geo::Coordinate& rotation_center, doubl
this->_definitionPoint3.rotate(rotation_center, rotation_angle),
this->layer(), metaInfo(), block()
);
newDimAligned->setID(this->id());
return newDimAligned;
}

Expand All @@ -106,6 +107,7 @@ CADEntity_CSPtr DimAligned::scale(const geo::Coordinate& scale_center, const geo
this->_definitionPoint3.scale(scale_center, scale_factor),
this->layer(), metaInfo(), block()
);
newDimAligned->setID(this->id());
return newDimAligned;
}

Expand All @@ -123,12 +125,27 @@ CADEntity_CSPtr DimAligned::mirror(const geo::Coordinate& axis1,
this->_definitionPoint3.mirror(axis1, axis2),
this->layer(), metaInfo(), block()
);
newDimAligned->setID(this->id());
return newDimAligned;
}

const geo::Area DimAligned::boundingBox() const {
// TODO create proper bounding box for DimAligned
return geo::Area(this->middleOfText(), 0., 0.);
lc::geo::Vector vec23(_definitionPoint2, _definitionPoint3);
auto vec23eq = vec23.equation();
const std::vector<double> vec23coeffs = vec23eq.Coefficients();
double d1 = vec23coeffs[3] * this->definitionPoint().x() + vec23coeffs[4] * this->definitionPoint().y() + vec23coeffs[5];
double dist = std::abs(d1) / std::sqrt(vec23coeffs[3] * vec23coeffs[3] + vec23coeffs[4] * vec23coeffs[4]);

lc::geo::Coordinate geo23 = _definitionPoint3 - _definitionPoint2;
geo23 = geo23.norm().rotate(d1 >= 0 ? (M_PI/2) : (-M_PI/2));
geo23 = geo23 * dist;
lc::geo::Coordinate rectPoint2 = _definitionPoint2 + geo23;
lc::geo::Coordinate rectPoint3 = _definitionPoint3 + geo23;

lc::geo::Coordinate minPoints = lc::geo::Coordinate(std::min(_definitionPoint2.x(), std::min(_definitionPoint3.x(), std::min(rectPoint2.x(), rectPoint3.x()))), std::min(_definitionPoint2.y(), std::min(_definitionPoint3.y(), std::min(rectPoint2.y(), rectPoint3.y()))));
lc::geo::Coordinate maxPoints = lc::geo::Coordinate(std::max(_definitionPoint2.x(), std::max(_definitionPoint3.x(), std::max(rectPoint2.x(), rectPoint3.x()))), std::max(_definitionPoint2.y(), std::max(_definitionPoint3.y(), std::max(rectPoint2.y(), rectPoint3.y()))));

return geo::Area(minPoints, maxPoints);
}

CADEntity_CSPtr DimAligned::modify(meta::Layer_CSPtr layer, const meta::MetaInfo_CSPtr metaInfo, meta::Block_CSPtr block) const {
Expand All @@ -147,6 +164,7 @@ CADEntity_CSPtr DimAligned::modify(meta::Layer_CSPtr layer, const meta::MetaInfo
block
);

newDimAligned->setID(this->id());
return newDimAligned;
}

Expand Down
11 changes: 8 additions & 3 deletions lckernel/cad/primitive/dimangular.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ CADEntity_CSPtr DimAngular::rotate(const geo::Coordinate& rotation_center, const
layer(),
metaInfo()
);
newDimAngular->setID(this->id());
return newDimAngular;
}

Expand All @@ -131,6 +132,7 @@ CADEntity_CSPtr DimAngular::scale(const geo::Coordinate& scale_center, const geo
layer(),
metaInfo()
);
newDimAngular->setID(this->id());
return newDimAngular;
}

Expand All @@ -150,12 +152,15 @@ CADEntity_CSPtr DimAngular::mirror(const geo::Coordinate& axis1, const geo::Coor
layer(),
metaInfo()
);
newDimAngular->setID(this->id());
return newDimAngular;
}

const geo::Area DimAngular::boundingBox() const {
// TODO create proper bounding box for DimAngular
return geo::Area(this->middleOfText(), 0., 0.);
double radius = (this->middleOfText() - this->definitionPoint()).magnitude();
lc::geo::Coordinate topLeft = this->definitionPoint() + (lc::geo::Coordinate(-radius, radius));
lc::geo::Coordinate bottomRight = this->definitionPoint() + (lc::geo::Coordinate(radius, -radius));
return geo::Area(topLeft, bottomRight);
}

CADEntity_CSPtr DimAngular::modify(meta::Layer_CSPtr layer, meta::MetaInfo_CSPtr metaInfo, meta::Block_CSPtr block) const {
Expand All @@ -175,7 +180,7 @@ CADEntity_CSPtr DimAngular::modify(meta::Layer_CSPtr layer, meta::MetaInfo_CSPtr
metaInfo,
block
);

newDimAngular->setID(this->id());
return newDimAngular;
}

Expand Down
8 changes: 5 additions & 3 deletions lckernel/cad/primitive/dimdiametric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ CADEntity_CSPtr DimDiametric::rotate(const geo::Coordinate& rotation_center, con
this->_definitionPoint2.rotate(rotation_center, rotation_angle),
this->_leader,
this->layer(), metaInfo(), block());
newDimDiametric->setID(this->id());
return newDimDiametric;
}

Expand All @@ -102,6 +103,7 @@ CADEntity_CSPtr DimDiametric::scale(const geo::Coordinate& scale_center, const g
this->_definitionPoint2.scale(scale_center, scale_factor),
this->_leader,
this->layer(), metaInfo(), block());
newDimDiametric->setID(this->id());
return newDimDiametric;
}

Expand All @@ -116,12 +118,12 @@ CADEntity_CSPtr DimDiametric::mirror(const geo::Coordinate& axis1, const geo::Co
this->_definitionPoint2.mirror(axis1, axis2),
this->_leader,
this->layer(), metaInfo(), block());
newDimDiametric->setID(this->id());
return newDimDiametric;
}

const geo::Area DimDiametric::boundingBox() const {
// TODO create proper bounding box for DimLinear
return geo::Area(this->middleOfText(), 0., 0.);
return geo::Area(this->definitionPoint(), this->definitionPoint2());
}

CADEntity_CSPtr DimDiametric::modify(meta::Layer_CSPtr layer, const meta::MetaInfo_CSPtr metaInfo, meta::Block_CSPtr block) const {
Expand All @@ -139,7 +141,7 @@ CADEntity_CSPtr DimDiametric::modify(meta::Layer_CSPtr layer, const meta::MetaIn
metaInfo,
block
);

newDimDiametric->setID(this->id());
return newDimDiametric;
}

Expand Down
9 changes: 6 additions & 3 deletions lckernel/cad/primitive/dimlinear.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ CADEntity_CSPtr DimLinear::rotate(const geo::Coordinate& rotation_center, double
this->_oblique,
this->layer(), metaInfo(), block()
);
newDimLinear->setID(this->id());
return newDimLinear;
}

Expand All @@ -120,12 +121,14 @@ CADEntity_CSPtr DimLinear::scale(const geo::Coordinate& scale_center, const geo:
this->_oblique,
this->layer(), metaInfo(), block()
);
newDimLinear->setID(this->id());
return newDimLinear;
}

const geo::Area DimLinear::boundingBox() const {
// TODO create proper bounding box for DimLinear
return geo::Area(this->middleOfText(), 0., 0.);
lc::geo::Coordinate minPoints = lc::geo::Coordinate(std::min(definitionPoint().x(), std::min(definitionPoint2().x(), definitionPoint3().x())), std::min(definitionPoint().y(), std::min(definitionPoint2().y(), definitionPoint3().y())));
lc::geo::Coordinate maxPoints = lc::geo::Coordinate(std::max(definitionPoint().x(), std::max(definitionPoint2().x(), definitionPoint3().x())), std::max(definitionPoint().y(), std::max(definitionPoint2().y(), definitionPoint3().y())));
return geo::Area(minPoints, maxPoints);
}

CADEntity_CSPtr DimLinear::modify(meta::Layer_CSPtr layer, meta::MetaInfo_CSPtr metaInfo, meta::Block_CSPtr block) const {
Expand All @@ -145,7 +148,7 @@ CADEntity_CSPtr DimLinear::modify(meta::Layer_CSPtr layer, meta::MetaInfo_CSPtr
metaInfo,
block
);

newDimLinear->setID(this->id());
return newDimLinear;
}

Expand Down
8 changes: 5 additions & 3 deletions lckernel/cad/primitive/dimradial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ CADEntity_CSPtr DimRadial::rotate(const geo::Coordinate& rotation_center, double
this->_leader,
this->layer(), metaInfo(), block()
);
newDimRadial->setID(this->id());
return newDimRadial;
}

Expand All @@ -106,6 +107,7 @@ CADEntity_CSPtr DimRadial::scale(const geo::Coordinate& scale_center, const geo:
this->_leader,
this->layer(), metaInfo(), block()
);
newDimRadial->setID(this->id());
return newDimRadial;
}

Expand All @@ -121,12 +123,12 @@ CADEntity_CSPtr DimRadial::mirror(const geo::Coordinate& axis1, const geo::Coord
this->_leader,
this->layer(), metaInfo(), block()
);
newDimRadial->setID(this->id());
return newDimRadial;
}

const geo::Area DimRadial::boundingBox() const {
// TODO create proper bounding box for DimLinear
return geo::Area(this->middleOfText(), 0., 0.);
return geo::Area(this->middleOfText(), this->definitionPoint2());
}

CADEntity_CSPtr DimRadial::modify(meta::Layer_CSPtr layer, meta::MetaInfo_CSPtr metaInfo, meta::Block_CSPtr block) const {
Expand All @@ -143,7 +145,7 @@ CADEntity_CSPtr DimRadial::modify(meta::Layer_CSPtr layer, meta::MetaInfo_CSPtr
layer,
metaInfo, block
);

newDimRadial->setID(this->id());
return newDimRadial;
}

Expand Down