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

Tube symbols can be rotated

Browse Source
This commit is contained in:
bancika
2016-12-21 15:58:57 +01:00
parent ef07d109cf
commit 2eeb05e7af
6 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-library/src/org/diylc/components/tube/AbstractTubeSymbol.java
+62 -3
View File
@@ -3,13 +3,16 @@ package org.diylc.components.tube;
import java.awt.Color;
import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Shape;
import java.awt.geom.AffineTransform;
import org.diylc.appframework.miscutils.ConfigurationManager;
import org.diylc.common.Display;
import org.diylc.common.HorizontalAlignment;
import org.diylc.common.IPlugInPort;
import org.diylc.common.ObjectCache;
import org.diylc.common.Orientation;
import org.diylc.common.VerticalAlignment;
import org.diylc.components.AbstractComponent;
import org.diylc.core.ComponentState;
@@ -34,6 +37,8 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
protected Display display = Display.NAME;
transient protected Shape[] body;
protected boolean showHeaters;
protected Orientation orientation = Orientation.DEFAULT;
protected Point[] controlPoints;
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
@@ -82,7 +87,9 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
: LABEL_COLOR;
}
g2d.setColor(finalLabelColor);
Point p = getTextLocation();
Rectangle rect = body[2] != null ? body[2].getBounds() : body[1].getBounds();
String label = "";
label = display == Display.VALUE ? getValue() : getName();
if (display == Display.NONE) {
@@ -91,7 +98,24 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
if (display == Display.BOTH) {
label = getName() + " " + (getValue() == null ? "" : getValue().toString());
}
drawCenteredText(g2d, label, p.x, p.y, HorizontalAlignment.LEFT, VerticalAlignment.TOP);
drawCenteredText(g2d, label, rect.x + rect.width, rect.y + rect.height, HorizontalAlignment.RIGHT, VerticalAlignment.BOTTOM);
}
@Override
public Point getControlPoint(int index) {
return controlPoints[index];
}
@Override
public int getControlPointCount() {
return controlPoints.length;
}
@Override
public void setControlPoint(Point point, int index) {
controlPoints[index].setLocation(point);
refreshDrawing();
}
@EditableProperty
@@ -130,8 +154,41 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
public void setShowHeaters(boolean showHeaters) {
this.showHeaters = showHeaters;
// Invalidate body
refreshDrawing();
}
@EditableProperty
public Orientation getOrientation() {
return orientation;
}
public void setOrientation(Orientation orientation) {
this.orientation = orientation;
refreshDrawing();
}
protected void refreshDrawing() {
updateControlPoints();
// make sure we have a new drawing
body = null;
getBody();
if (this.orientation == Orientation.DEFAULT)
return;
Point first = this.controlPoints[0];
double angle = Double.parseDouble(this.orientation.name().replace("_", ""));
AffineTransform rotate = AffineTransform.getRotateInstance(Math.toRadians(angle), first.x, first.y);
for (int i = 1; i < this.controlPoints.length; i++) {
rotate.transform(this.controlPoints[i], this.controlPoints[i]);
}
if (this.body != null) {
for (int i = 0; i < this.body.length; i++) {
this.body[i] = rotate.createTransformedShape(this.body[i]);
}
}
}
/**
@@ -142,4 +199,6 @@ public abstract class AbstractTubeSymbol extends AbstractComponent<String> {
protected abstract Shape[] getBody();
protected abstract Point getTextLocation();
protected abstract void updateControlPoints();
}
diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
+5 -22
View File
@@ -21,14 +21,13 @@ import org.diylc.core.annotations.KeywordPolicy;
public class DiodeSymbol extends AbstractTubeSymbol {
private static final long serialVersionUID = 1L;
protected Point[] controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
new Point(0, 0)};
protected boolean directlyHeated = false;
public DiodeSymbol() {
super();
this.controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
new Point(0, 0)};
updateControlPoints();
}
@@ -111,15 +110,6 @@ public class DiodeSymbol extends AbstractTubeSymbol {
}
@Override
public Point getControlPoint(int index) {
return controlPoints[index];
}
@Override
public int getControlPointCount() {
return controlPoints.length;
}
protected void updateControlPoints() {
int pinSpacing = (int) PIN_SPACING.convertToPixels();
// Update control points.
@@ -139,13 +129,6 @@ public class DiodeSymbol extends AbstractTubeSymbol {
controlPoints[4].y = y + pinSpacing * 3;
}
@Override
public void setControlPoint(Point point, int index) {
controlPoints[index].setLocation(point);
// Invalidate body
body = null;
}
@Override
public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
if (directlyHeated) {
@@ -181,8 +164,8 @@ public class DiodeSymbol extends AbstractTubeSymbol {
public void setDirectlyHeated(boolean directlyHeated) {
this.directlyHeated = directlyHeated;
// Invalidate body
body = null;
refreshDrawing();
}
public class HeaterValidator implements IPropertyValidator {
diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
+4 -21
View File
@@ -21,13 +21,12 @@ public class PentodeSymbol extends AbstractTubeSymbol {
private static final long serialVersionUID = 1L;
protected Point[] controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
new Point(0, 0), new Point(0, 0), new Point(0, 0)};
protected boolean exposeSuppressorGrid = true;
public PentodeSymbol() {
super();
this.controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
new Point(0, 0), new Point(0, 0), new Point(0, 0)};
updateControlPoints();
}
@@ -156,16 +155,6 @@ public class PentodeSymbol extends AbstractTubeSymbol {
g2d.drawLine(width / 8, height * 5 / 8, width * 7 / 8, height * 5 / 8);
}
@Override
public Point getControlPoint(int index) {
return controlPoints[index];
}
@Override
public int getControlPointCount() {
return controlPoints.length;
}
protected void updateControlPoints() {
int pinSpacing = (int) PIN_SPACING.convertToPixels();
// Update control points.
@@ -191,13 +180,6 @@ public class PentodeSymbol extends AbstractTubeSymbol {
controlPoints[6].y = y + pinSpacing * 2;
}
@Override
public void setControlPoint(Point point, int index) {
controlPoints[index].setLocation(point);
// Invalidate body
body = null;
}
@Override
public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
if (showHeaters) {
@@ -230,6 +212,7 @@ public class PentodeSymbol extends AbstractTubeSymbol {
public void setExposeSuppressorGrid(boolean exposeSuppressorGrid) {
this.exposeSuppressorGrid = exposeSuppressorGrid;
this.body = null;
refreshDrawing();
}
}
diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
+4 -22
View File
@@ -21,13 +21,12 @@ public class TriodeSymbol extends AbstractTubeSymbol {
private static final long serialVersionUID = 1L;
protected Point[] controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
new Point(0, 0)};
protected boolean directlyHeated = false;
public TriodeSymbol() {
super();
this.controlPoints = new Point[] {new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0),
new Point(0, 0)};
updateControlPoints();
}
@@ -127,16 +126,6 @@ public class TriodeSymbol extends AbstractTubeSymbol {
g2d.drawLine(width / 8, height / 2, width * 7 / 8, height / 2);
}
@Override
public Point getControlPoint(int index) {
return controlPoints[index];
}
@Override
public int getControlPointCount() {
return controlPoints.length;
}
protected void updateControlPoints() {
int pinSpacing = (int) PIN_SPACING.convertToPixels();
// Update control points.
@@ -156,13 +145,6 @@ public class TriodeSymbol extends AbstractTubeSymbol {
controlPoints[4].y = y + pinSpacing * 3;
}
@Override
public void setControlPoint(Point point, int index) {
controlPoints[index].setLocation(point);
// Invalidate body
body = null;
}
@Override
public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
if (directlyHeated) {
@@ -198,7 +180,7 @@ public class TriodeSymbol extends AbstractTubeSymbol {
public void setDirectlyHeated(boolean directlyHeated) {
this.directlyHeated = directlyHeated;
// Invalidate body
body = null;
refreshDrawing();
}
}
diylc/diylc-swing/library/main.jar
BIN
View File
Binary file not shown.
diylc/diylc-swing/update.xml
+4
View File
@@ -1418,6 +1418,10 @@
<changeType>NEW_FEATURE</changeType>
<description>Battery schematic symbol added</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Tube symbols can be rotated</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Added percent text box next to the slider for editors like Alpha or Scale</description>