TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-09 12:56:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

in generic circuits the origin is flagged with a circle

Browse Source
This commit is contained in:
hneemann 2021-01-07 18:51:41 +01:00
parent a8da7858e1
commit cf323d03ad
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/de/neemann/digital/gui/components/CircuitComponent.java
View File

@ -570,9 +570,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
removeHighLighted(); removeHighLighted();
} }
Circuit circuit = shallowCopy; Circuit circuit = getCircuitOrShallowCopy();
if (circuit == null)
circuit = getCircuit();
Vector pos = getPosVector(event); Vector pos = getPosVector(event);
VisualElement ve = circuit.getElementAt(pos); VisualElement ve = circuit.getElementAt(pos);
@ -874,10 +872,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
gr2.transform(transform); gr2.transform(transform);
long time = System.currentTimeMillis(); long time = System.currentTimeMillis();
if (shallowCopy != null) getCircuitOrShallowCopy().drawTo(gr, highLighted, highLightStyle, modelSync);
shallowCopy.drawTo(gr, highLighted, highLightStyle, modelSync);
else
getCircuit().drawTo(gr, highLighted, highLightStyle, modelSync);
time = System.currentTimeMillis() - time; time = System.currentTimeMillis() - time;
if (time > 500) antiAlias = false; if (time > 500) antiAlias = false;
@ -929,6 +924,15 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
gr2.fill(new Rectangle2D.Double(xx, yy, delta, delta)); gr2.fill(new Rectangle2D.Double(xx, yy, delta, delta));
} }
} }
if (getCircuit().getAttributes().get(Keys.IS_GENERIC)) {
double dx = (p2.getX() - p1.getX()) / cx / 2;
double dy = (p2.getY() - p1.getY()) / cy / 2;
Point2D.Double origin = new Point2D.Double();
transform.transform(new Point(0, 0), origin);
gr2.drawOval((int) (origin.getX() - dy), (int) (origin.getY() - dy), (int) (dx * 2), (int) (dy * 2));
}
} }
/** /**
@ -981,6 +985,13 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
return undoManager.getActual(); return undoManager.getActual();
} }
private Circuit getCircuitOrShallowCopy() {
if (shallowCopy != null)
return shallowCopy;
else
return undoManager.getActual();
}
/** /**
* Sets a circuit to this component * Sets a circuit to this component
* *
@ -1004,7 +1015,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
*/ */
public void fitCircuit() { public void fitCircuit() {
GraphicMinMax gr = new GraphicMinMax(); GraphicMinMax gr = new GraphicMinMax();
getCircuit().drawTo(gr); getCircuitOrShallowCopy().drawTo(gr);
AffineTransform newTrans = new AffineTransform(); AffineTransform newTrans = new AffineTransform();
if (gr.getMin() != null && getWidth() != 0 && getHeight() != 0) { if (gr.getMin() != null && getWidth() != 0 && getHeight() != 0) {
@ -1303,9 +1314,8 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
public void currentToDefault() { public void currentToDefault() {
if (!isLocked()) { if (!isLocked()) {
Modifications.Builder<Circuit> builder = new Modifications.Builder<>(Lang.get("menu_actualToDefault")); Modifications.Builder<Circuit> builder = new Modifications.Builder<>(Lang.get("menu_actualToDefault"));
Circuit circuit = shallowCopy;
if (circuit == null) Circuit circuit = getCircuitOrShallowCopy();
circuit = getCircuit();
for (VisualElement ve : circuit.getElements()) for (VisualElement ve : circuit.getElements())
if (ve.equalsDescription(In.DESCRIPTION)) { if (ve.equalsDescription(In.DESCRIPTION)) {
ObservableValue ov = ((InputShape) ve.getShape()).getObservableValue(); ObservableValue ov = ((InputShape) ve.getShape()).getObservableValue();
@ -2501,11 +2511,7 @@ public class CircuitComponent extends JComponent implements ChangedListener, Lib
} }
private VisualElement getInteractiveElementAt(MouseEvent e) { private VisualElement getInteractiveElementAt(MouseEvent e) {
Circuit circuit; Circuit circuit = getCircuitOrShallowCopy();
if (shallowCopy != null)
circuit = shallowCopy;
else
circuit = getCircuit();
List<VisualElement> elementList = circuit.getElementListAt(getPosVector(e), false); List<VisualElement> elementList = circuit.getElementListAt(getPosVector(e), false);
for (VisualElement ve : elementList) { for (VisualElement ve : elementList) {
if (ve.isInteractive()) if (ve.isInteractive())