BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-10 17:22:09 +10:00
Code Issues Packages Projects Releases Wiki Activity

fix the 3rd control point when copy-pasting

Browse Source
This commit is contained in:
Branislav Stojkovic
2019-03-22 21:04:54 +01:00
parent eb6cc76f02
commit 48266d3b27
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java
+16 -10
View File
@@ -86,7 +86,7 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
// parameters for adjusting the label control point
protected Double gamma = null;
protected Double p = null;
protected Double r = null;
protected AbstractLeadedComponent() {
super();
@@ -133,9 +133,9 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
double y = (getNewPoints()[1].y + getNewPoints()[0].y) / 2.0;
double theta = Math.atan2(getNewPoints()[1].y - getNewPoints()[0].y, getNewPoints()[1].x - getNewPoints()[0].x);
double beta = gamma - (Math.PI / 2 - theta);
getNewPoints()[2].setLocation(x + Math.cos(beta) * p, y + Math.sin(beta) * p);
getNewPoints()[2].setLocation(x + Math.cos(beta) * r, y + Math.sin(beta) * r);
gamma = null;
p = null;
r = null;
}
double distance = getNewPoints()[0].distance(getNewPoints()[1]);
@@ -540,13 +540,19 @@ public abstract class AbstractLeadedComponent<T> extends AbstractTransparentComp
@Override
public void setControlPoint(Point point, int index) {
// when moving one of the ending points, try to retain the angle and distance from the center point to label point
if (index < 2 && gamma == null) {
double x = (getNewPoints()[1].x + getNewPoints()[0].x) / 2.0;
double y = (getNewPoints()[1].y + getNewPoints()[0].y) / 2.0;
double theta = Math.atan2(getNewPoints()[1].y - getNewPoints()[0].y, getNewPoints()[1].x - getNewPoints()[0].x);
double beta = Math.atan2(getNewPoints()[2].y - y, getNewPoints()[2].x - x);
gamma = beta + (Math.PI / 2 - theta);
p = getNewPoints()[2].distance(x, y);
if (index < 2) {
if (gamma == null) {
double x = (getNewPoints()[1].x + getNewPoints()[0].x) / 2.0;
double y = (getNewPoints()[1].y + getNewPoints()[0].y) / 2.0;
double theta = Math.atan2(getNewPoints()[1].y - getNewPoints()[0].y, getNewPoints()[1].x - getNewPoints()[0].x);
double beta = Math.atan2(getNewPoints()[2].y - y, getNewPoints()[2].x - x);
gamma = beta + (Math.PI / 2 - theta);
r = getNewPoints()[2].distance(x, y);
} else { // in case when we are copy pasting we don't want to recalculate 3rd point position as they will all move in unison
// when we moved the first point, gamma and r were initialized, so now we are canceling
gamma = null;
r = null;
}
}
getNewPoints()[index].setLocation(point);