diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 748526e8..cc3fc649 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/connectivity/CutLine.java b/diylc/diylc-library/src/org/diylc/components/connectivity/CutLine.java
index bd36e2a5..6f863ede 100644
--- a/diylc/diylc-library/src/org/diylc/components/connectivity/CutLine.java
+++ b/diylc/diylc-library/src/org/diylc/components/connectivity/CutLine.java
@@ -1,23 +1,19 @@
/*
-
- DIY Layout Creator (DIYLC).
- Copyright (c) 2009-2018 held jointly by the individual authors.
-
- This file is part of DIYLC.
-
- DIYLC is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- DIYLC 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 General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with DIYLC. If not, see .
-
+ *
+ * DIY Layout Creator (DIYLC). Copyright (c) 2009-2018 held jointly by the individual authors.
+ *
+ * This file is part of DIYLC.
+ *
+ * DIYLC is free software: you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * DIYLC 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 General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with DIYLC. If not, see
+ * .
*/
package org.diylc.components.connectivity;
@@ -26,11 +22,11 @@ import java.awt.Color;
import java.awt.Composite;
import java.awt.Graphics2D;
import java.awt.Point;
+import java.awt.geom.Rectangle2D;
import org.diylc.common.ObjectCache;
-import org.diylc.common.SimpleComponentTransformer;
import org.diylc.common.OrientationHV;
-import org.diylc.components.AbstractComponent;
+import org.diylc.common.SimpleComponentTransformer;
import org.diylc.components.AbstractTransparentComponent;
import org.diylc.core.ComponentState;
import org.diylc.core.IDIYComponent;
@@ -43,127 +39,123 @@ import org.diylc.core.annotations.EditableProperty;
import org.diylc.core.measures.Size;
import org.diylc.core.measures.SizeUnit;
-@ComponentDescriptor(name = "Cut Line", category = "Connectivity", author = "Branislav Stojkovic", description = "Cut line", instanceNamePrefix = "CL", stretchable = false, zOrder = IDIYComponent.COMPONENT, bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false, transformer = SimpleComponentTransformer.class)
+@ComponentDescriptor(name = "Cut Line", category = "Connectivity", author = "Branislav Stojkovic",
+ description = "Cut line", instanceNamePrefix = "CL", stretchable = false, zOrder = IDIYComponent.COMPONENT,
+ bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false, transformer = SimpleComponentTransformer.class)
public class CutLine extends AbstractTransparentComponent {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public static Size WIDTH = new Size(0.125d, SizeUnit.in);
- public static Size LENGTH = new Size(3.125d, SizeUnit.in);
- public static Color COLOR = Color.black;
+ public static Size WIDTH = new Size(0.125d, SizeUnit.in);
+ public static Size LENGTH = new Size(3.125d, SizeUnit.in);
+ public static Color COLOR = Color.black;
- private Size width = WIDTH;
- private Size length = LENGTH;
- private Color color = COLOR;
- private Point point = new Point(0, 0);
- private OrientationHV orientation = OrientationHV.VERTICAL;
+ private Size width = WIDTH;
+ private Size length = LENGTH;
+ private Color color = COLOR;
+ private Point point = new Point(0, 0);
+ private OrientationHV orientation = OrientationHV.VERTICAL;
- @Override
- public void draw(Graphics2D g2d, ComponentState componentState,
- boolean outlineMode, Project project,
- IDrawingObserver drawingObserver) {
- if (checkPointsClipped(g2d.getClip())) {
- return;
- }
- int w = getClosestOdd((int) getWidth().convertToPixels());
- int l = getClosestOdd((int) getLength().convertToPixels());
- g2d.setColor(componentState == ComponentState.SELECTED
- || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
- : color);
- g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(w));
-
- Composite oldComposite = g2d.getComposite();
- if (alpha < MAX_ALPHA) {
- g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
- }
-
- if (getOrientation() == OrientationHV.HORIZONTAL)
- g2d.drawLine(point.x, point.y, point.x + l, point.y);
- else
- g2d.drawLine(point.x, point.y, point.x, point.y + l);
-
- g2d.setComposite(oldComposite);
- }
+ @Override
+ public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+ IDrawingObserver drawingObserver) {
+ int w = getClosestOdd((int) getWidth().convertToPixels());
+ int l = getClosestOdd((int) getLength().convertToPixels());
+ g2d.setColor(componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+ : color);
+ g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(w));
- @Override
- public void drawIcon(Graphics2D g2d, int width, int height) {
- g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2));
- g2d.setColor(COLOR);
- g2d.drawLine(width / 2, height - 2, width / 2, 1);
- }
+ Composite oldComposite = g2d.getComposite();
+ if (alpha < MAX_ALPHA) {
+ g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
+ }
- @EditableProperty
- public Size getWidth() {
- return width;
- }
+ if (getOrientation() == OrientationHV.HORIZONTAL)
+ g2d.drawLine(point.x, point.y, point.x + l, point.y);
+ else
+ g2d.drawLine(point.x, point.y, point.x, point.y + l);
- public void setWidth(Size width) {
- this.width = width;
- }
+ g2d.setComposite(oldComposite);
+ }
- @EditableProperty
- public Size getLength() {
- return length;
- }
+ @Override
+ public void drawIcon(Graphics2D g2d, int width, int height) {
+ g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2));
+ g2d.setColor(COLOR);
+ g2d.drawLine(width / 2, height - 2, width / 2, 1);
+ }
- public void setLength(Size length) {
- this.length = length;
- }
+ @EditableProperty
+ public Size getWidth() {
+ return width;
+ }
- @EditableProperty
- public OrientationHV getOrientation() {
- return orientation;
- }
+ public void setWidth(Size width) {
+ this.width = width;
+ }
- public void setOrientation(OrientationHV orientation) {
- this.orientation = orientation;
- }
+ @EditableProperty
+ public Size getLength() {
+ return length;
+ }
- @Override
- public String getName() {
- return super.getName();
- }
+ public void setLength(Size length) {
+ this.length = length;
+ }
- @Override
- public int getControlPointCount() {
- return 1;
- }
+ @EditableProperty
+ public OrientationHV getOrientation() {
+ return orientation;
+ }
- @Override
- public boolean isControlPointSticky(int index) {
- return false;
- }
+ public void setOrientation(OrientationHV orientation) {
+ this.orientation = orientation;
+ }
- @Override
- public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
- return VisibilityPolicy.NEVER;
- }
+ @Override
+ public String getName() {
+ return super.getName();
+ }
- @Override
- public Point getControlPoint(int index) {
- return point;
- }
+ @Override
+ public int getControlPointCount() {
+ return 1;
+ }
- @Override
- public void setControlPoint(Point point, int index) {
- this.point.setLocation(point);
- }
+ @Override
+ public boolean isControlPointSticky(int index) {
+ return false;
+ }
- @EditableProperty(name = "Color")
- public Color getColor() {
- return color;
- }
+ @Override
+ public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+ return VisibilityPolicy.NEVER;
+ }
- public void setColor(Color color) {
- this.color = color;
- }
+ @Override
+ public Point getControlPoint(int index) {
+ return point;
+ }
- @Override
- public Void getValue() {
- return null;
- }
+ @Override
+ public void setControlPoint(Point point, int index) {
+ this.point.setLocation(point);
+ }
- @Override
- public void setValue(Void value) {
- }
+ @EditableProperty(name = "Color")
+ public Color getColor() {
+ return color;
+ }
+
+ public void setColor(Color color) {
+ this.color = color;
+ }
+
+ @Override
+ public Void getValue() {
+ return null;
+ }
+
+ @Override
+ public void setValue(Void value) {}
}
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 9c259633..cc3fc649 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index e6a597da..b2f6e813 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index f1a3d188..898f3bbc 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -1864,6 +1864,22 @@
https://github.com/bancika/diy-layout-creator/releases
+
+
+
+ 3
+ 41
+ 2
+
+ 2018-12-11 00:00:00.000 CET
+
+
+
+ BUG_FIX
+ "Cut Line" component sometimes disappears
+
+
+ https://github.com/bancika/diy-layout-creator/releases