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

Merge pull request #925 from bancika/ai-analyzer

Browse Source 
Ai analyzer
This commit is contained in:
Bane Stojkovic
2025-05-13 10:03:56 +02:00
committed by GitHub
parent c914749413 d9384d8304
commit 17c8840dfc
62 changed files with 913 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/.run/DIYLCStarter.run.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<configuration default="false" name="DIYLCStarter" type="Application" factoryName="Application" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="org.diylc.DIYLCStarter" />
<module name="diylc-swing" />
<option name="VM_PARAMETERS" value="-Xms1024m -Xmx4096m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED" />
<option name="VM_PARAMETERS" value="-Xms1024m -Xmx4096m -Ddorg.diylc.debugAreaPerformance=true -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="org.diylc.*" />
diylc/diylc-core/src/main/java/org/diylc/components/AbstractComponent.java
+1 -1
View File
@@ -189,7 +189,7 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
// Deep copy point arrays.
// TODO: something nicer
if (value != null && value.getClass().isArray()
&& value.getClass().getComponentType().isAssignableFrom(Point2D.class)) {
&& Point2D.class.isAssignableFrom(value.getClass().getComponentType())) {
Object newArray = Array.newInstance(value.getClass().getComponentType(), Array.getLength(value));
for (int i = 0; i < Array.getLength(value); i++) {
Point2D p = (Point2D) Array.get(value, i);
diylc/diylc-core/src/main/java/org/diylc/netlist/AbstractNetlistAnalyzer.java
+1 -1
View File
@@ -92,7 +92,7 @@ public abstract class AbstractNetlistAnalyzer {
for (int i = 0; i < c.getControlPointCount(); i++) {
if (i != n.getPointIndex() && c.getInternalLinkName(i, n.getPointIndex()) != null) {
TreeLeaf l = new TreeLeaf(c, i, n.getPointIndex());
Node newNodeA = new Node(c, i, n.getZIndex());
Node newNodeA = new Node(c, i);
if (!visited.contains(newNodeA)) {
// visited.add(n);
Tree newCurrentPath = null;
diylc/diylc-core/src/main/java/org/diylc/netlist/Group.java
+1 -5
View File
@@ -53,11 +53,7 @@ public class Group implements Comparable<Group> {
}
public Group connect(IDIYComponent<?> component, int index) {
return connect(component, index, 0);
}
public Group connect(IDIYComponent<?> component, int index, int zOrder) {
getNodes().add(new Node(component, index, zOrder));
getNodes().add(new Node(component, index));
return this;
}
diylc/diylc-core/src/main/java/org/diylc/netlist/NetlistAnalyzer.java
+1 -1
View File
@@ -92,7 +92,7 @@ public abstract class NetlistAnalyzer {
continue;
if (c.getInternalLinkName(targetPoint, sourcePoint) != null) {
Node newNodeA = new Node(c, targetPoint, n.getZIndex());
Node newNodeA = new Node(c, targetPoint);
if (pathVisited.contains(newNodeA))
continue;
diylc/diylc-core/src/main/java/org/diylc/netlist/NetlistBuilder.java
+3 -3
View File
@@ -46,7 +46,7 @@ public class NetlistBuilder {
public static final float eps = 4; // consider any nodes closer than this as connected
public static int MAX_SWITCH_COMBINATIONS = 64;
public static int MAX_SWITCH_COMBINATIONS = 256;
private static final String MAX_SWITCH_COMBINATIONS_ERROR = LangUtil
.translate("Maximum number of switching combinations exceeded. Allowed: %s, actual: %s");
@@ -75,7 +75,7 @@ public class NetlistBuilder {
String nodeName = c.getControlPointNodeName(i);
if (c.isControlPointSticky(i) && nodeName != null
&& (!includeSwitches || !ISwitch.class.isAssignableFrom(type.getInstanceClass()))) {
nodes.add(new Node(c, i, j));
nodes.add(new Node(c, i));
}
}
}
@@ -86,7 +86,7 @@ public class NetlistBuilder {
String label = ((ICommonNode) c).getCommonNodeLabel();
if (!commonNodes.contains(label)) {
commonNodes.add(label);
nodes.add(new Node(c, 0, j));
nodes.add(new Node(c, 0));
}
}
diylc/diylc-core/src/main/java/org/diylc/netlist/Node.java
+9 -29
View File
@@ -22,6 +22,7 @@
package org.diylc.netlist;
import java.awt.geom.Point2D;
import java.util.Objects;
import org.diylc.core.ICommonNode;
import org.diylc.core.IDIYComponent;
@@ -35,13 +36,11 @@ public class Node implements Comparable<Node> {
private IDIYComponent<?> component;
private int pointIndex;
private int zIndex;
public Node(IDIYComponent<?> component, int pointIndex, int zIndex) {
public Node(IDIYComponent<?> component, int pointIndex) {
super();
this.component = component;
this.pointIndex = pointIndex;
this.zIndex = zIndex;
}
public IDIYComponent<?> getComponent() {
@@ -52,10 +51,6 @@ public class Node implements Comparable<Node> {
return pointIndex;
}
public int getZIndex() {
return zIndex;
}
public String getDisplayName() {
String[] section = component.getSectionNames(pointIndex);
return (section == null || section.length > 1 ? "" : section[0] + ".") + component.getControlPointNodeName(pointIndex);
@@ -66,31 +61,16 @@ public class Node implements Comparable<Node> {
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((component == null) ? 0 : component.hashCode());
result = prime * result + pointIndex;
return result;
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof Node)) return false;
Node other = (Node) obj;
return Objects.equals(component, other.component) && pointIndex == other.pointIndex;
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
Node other = (Node) obj;
if (component == null) {
if (other.component != null)
return false;
} else if (!component.equals(other.component))
return false;
if (pointIndex != other.pointIndex)
return false;
return true;
public int hashCode() {
return Objects.hash(component, pointIndex);
}
@Override
diylc/diylc-core/src/main/java/org/diylc/netlist/SpiceSumarizer.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class SpiceSumarizer {
if (c instanceof ISpiceMapper)
pointIndex = ((ISpiceMapper)c).mapToSpiceNode(pointIndex);
int nodeIndex = find(new Node(c, pointIndex, 0), groups);
int nodeIndex = find(new Node(c, pointIndex), groups);
if (nodeIndex < 0)
nodeIndex = unconnectedIndex++;
diylc/diylc-core/src/main/java/org/diylc/plugins/chatbot/model/IChatbotAPI.java
+14
View File
@@ -43,6 +43,20 @@ public interface IChatbotAPI {
@ParamName("machineId") String machineId, @ParamName("project") String project,
@ParamName("netlist") File netlist, @ParamName("prompt") String prompt);
/**
* Analyzes the provided circuit
*
* @param username
* @param token
* @param machineId
* @param project
* @param netlist
* @return
*/
String analyzeCircuit(@ParamName("username") String username, @ParamName("token") String token,
@ParamName("machineId") String machineId, @ParamName("project") String project,
@ParamName("netlist") File netlist);
SubscriptionEntity getSubscriptionInfo(@ParamName("username") String username, @ParamName("token") String token,
@ParamName("machineId") String machineId);
diylc/diylc-core/src/main/java/org/diylc/plugins/chatbot/service/AiProjectBuilder.java
+31 -10
View File
@@ -5,6 +5,7 @@ import java.awt.geom.Point2D;
import java.util.*;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.log4j.Logger;
@@ -13,6 +14,10 @@ import org.diylc.common.PropertyWrapper;
import org.diylc.core.IDIYComponent;
import org.diylc.core.ISwitch;
import org.diylc.core.Project;
import org.diylc.netlist.Netlist;
import org.diylc.netlist.NetlistBuilder;
import org.diylc.netlist.NetlistException;
import org.diylc.netlist.Node;
import org.diylc.plugins.chatbot.model.*;
import org.diylc.presenter.ComponentProcessor;
import org.diylc.presenter.ContinuityArea;
@@ -26,15 +31,31 @@ public class AiProjectBuilder {
List<AiComponent> components = project.getComponents().stream().map(AiProjectBuilder::mapComponent).toList();
List<Set<NetlistBuilder.TerminalRef>> sets =
NetlistBuilder.buildNets(project.getComponents(), continuityAreas);
// List<Set<Node>> sets =
List<Netlist> netlists = null;
try {
netlists = NetlistBuilder.extractNetlists(false, project, continuityAreas);
} catch (NetlistException e) {
throw new RuntimeException(e);
}
Map<String, Set<String>> nets;
if (netlists == null || netlists.isEmpty()) {
nets = new HashMap<>();
} else {
AtomicInteger counter = new AtomicInteger();
nets = netlists.get(0).getGroups().stream().map(s -> s.getNodes().stream()
.map(AiProjectBuilder::mapTerminal)
.collect(Collectors.toSet()))
.collect(Collectors.toMap(x -> "N" + String.format("%03d", counter.incrementAndGet()),
Function.identity()));
}
AtomicInteger counter = new AtomicInteger();
Map<String, Set<String>> nets =
sets.stream().map(s -> s.stream()
.map(AiProjectBuilder::mapTerminal)
.collect(Collectors.toSet()))
.collect(Collectors.toMap(x -> "N" + counter.incrementAndGet(), x -> x));
// Map<String, Set<String>> nets =
// sets.stream().map(s -> s.stream()
// .map(AiProjectBuilder::mapTerminal)
// .collect(Collectors.toSet()))
// .collect(Collectors.toMap(x -> "N" + String.format("%03d", counter.incrementAndGet()),
// Function.identity()));
List<AiSwitch> switches =
project.getComponents().stream()
@@ -159,7 +180,7 @@ public class AiProjectBuilder {
fromPos, toPos, pos, terminals.isEmpty() ? null : terminals);
}
static String mapTerminal(NetlistBuilder.TerminalRef terminalRef) {
return terminalRef.component.getName() + "." + terminalRef.terminalIndex;
static String mapTerminal(Node terminalRef) {
return terminalRef.getComponent().getName() + "." + terminalRef.getPointIndex();
}
}
diylc/diylc-core/src/main/java/org/diylc/plugins/chatbot/service/ChatbotService.java
+55 -18
View File
@@ -123,9 +123,57 @@ public class ChatbotService {
String currentFile = plugInPort.getCurrentFileName();
String fileName = extractFileName(currentFile);
File aiProjectFile = null;
File aiProjectFile = getAiProjectFile();
try {
return getService().promptChatbot(
plugInPort.getCloudService().getCurrentUsername(),
plugInPort.getCloudService().getCurrentToken(),
plugInPort.getCloudService().getMachineId(),
fileName,
aiProjectFile,
prompt);
} finally {
// Clean up the temp file immediately after use
if (aiProjectFile != null && aiProjectFile.exists()) {
aiProjectFile.delete();
}
}
}
public String analyzeCircuit() throws NotLoggedInException {
if (!plugInPort.getCloudService().isLoggedIn())
throw new NotLoggedInException();
LOG.info("Analyzing circuit...");
String currentFile = plugInPort.getCurrentFileName();
String fileName = extractFileName(currentFile);
File aiProjectFile = getAiProjectFile();
try {
String jsonResult = getService().analyzeCircuit(plugInPort.getCloudService().getCurrentUsername(),
plugInPort.getCloudService().getCurrentToken(),
plugInPort.getCloudService().getMachineId(), fileName, aiProjectFile);
return JsonToHtmlConverter.convertToHtml(jsonResult);
} catch (IOException e) {
throw new RuntimeException(e);
} finally {
// Clean up the temp file immediately after use
if (aiProjectFile != null && aiProjectFile.exists()) {
aiProjectFile.delete();
}
}
}
private File getAiProjectFile() {
File aiProjectFile = null;
AiProject aiProject = extractAiProject();
if (aiProject == null) {
return null;
}
try {
AiProject aiProject = extractAiProject();
String aiProjectStr = null;
try {
aiProjectStr = MAPPER.writeValueAsString(aiProject);
@@ -181,24 +229,13 @@ public class ChatbotService {
} catch (Exception e) {
LOG.error("Error extracting or saving netlist", e);
}
try {
return getService().promptChatbot(
plugInPort.getCloudService().getCurrentUsername(),
plugInPort.getCloudService().getCurrentToken(),
plugInPort.getCloudService().getMachineId(),
fileName,
aiProjectFile,
prompt);
} finally {
// Clean up the temp file immediately after use
if (aiProjectFile != null && aiProjectFile.exists()) {
aiProjectFile.delete();
}
}
return aiProjectFile;
}
private AiProject extractAiProject() throws NetlistException {
private AiProject extractAiProject() {
if (plugInPort.getCurrentProject().getComponents().isEmpty()) {
return null;
}
List<ContinuityArea> continuityAreas = plugInPort.getDrawingManager().getContinuityAreas();
return AiProjectBuilder.build(plugInPort.getCurrentProject(), continuityAreas);
}
diylc/diylc-core/src/main/java/org/diylc/plugins/chatbot/service/JsonToHtmlConverter.java
+92
View File
@@ -0,0 +1,92 @@
package org.diylc.plugins.chatbot.service;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.IOException;
public class JsonToHtmlConverter {
private static final ObjectMapper MAPPER = new ObjectMapper();
/**
* Convert the given JSON string into HTML.
*
* @param json the input JSON
* @return an HTML document as a String
* @throws IOException if JSON parsing fails
*/
public static String convertToHtml(String json) throws IOException {
JsonNode root = MAPPER.readTree(json);
StringBuilder html = new StringBuilder();
html.append("<!DOCTYPE html>\n<html>\n<head>\n")
.append(" <meta charset=\"UTF-8\">\n")
.append(" <title>Validation Report</title>\n")
.append(" <style>\n")
.append(" body { font-family: Arial, sans-serif; }\n")
.append(" h2 { color: #444; }\n")
.append(" ul { list-style: disc; margin-left: 20px; }\n")
.append(" li { margin-bottom: 5px; }\n")
.append(" </style>\n")
.append("</head>\n<body>\n");
// Process each section
processSection(root, "critical", html, "#c00");
processSection(root, "warnings", html, "#e65c00");
processSection(root, "optimizations", html, "#0066c0");
html.append("</body>\n</html>");
return html.toString();
}
private static void processSection(JsonNode root, String field, StringBuilder html, String color) {
JsonNode array = root.path(field);
if (array.isArray() && array.size() > 0) {
html.append(String.format("<h2 style=\"color:%s;\">%s</h2>\n", color, capitalize(field)));
html.append("<ul>\n");
for (JsonNode item : array) {
String message = escapeHtml(item.path("message").asText(""));
if (item.hasNonNull("componentId") && !item.path("componentId").asText().isEmpty()) {
String id = escapeHtml(item.path("componentId").asText());
html.append(" <li><strong>")
.append(id)
.append("</strong>: ")
.append(message)
.append("</li>\n");
} else {
html.append(" <li>")
.append(message)
.append("</li>\n");
}
}
html.append("</ul>\n");
}
}
private static String capitalize(String text) {
if (text == null || text.isEmpty()) return text;
return Character.toUpperCase(text.charAt(0)) + text.substring(1);
}
/**
* Very basic HTML escapement; for more robust use Apache Commons StringEscapeUtils.escapeHtml4().
*/
private static String escapeHtml(String s) {
return s.replace("&", "&amp;")
.replace("<", "&lt;")
.replace(">", "&gt;")
.replace("\"", "&quot;");
}
// Example usage:
public static void main(String[] args) throws IOException {
String json = "{\n" +
" \"critical\": [{\"message\":\"Value too low\"}],\n" +
" \"warnings\": [{\"componentId\":\"C3\",\"message\":\"Consider higher tolerance\"}],\n" +
" \"optimizations\": [{\"componentId\":\"L2\",\"message\":\"Could use 0805 package\"}]\n" +
"}";
String html = convertToHtml(json);
System.out.println(html);
}
}
diylc/diylc-core/src/main/java/org/diylc/plugins/chatbot/service/NetlistBuilder.java
+125 -137
View File
@@ -1,137 +1,125 @@
package org.diylc.plugins.chatbot.service;
import org.diylc.core.IContinuity;
import org.diylc.core.IDIYComponent;
import org.diylc.core.ISwitch;
import org.diylc.presenter.ContinuityArea;
import java.awt.geom.Area;
import java.awt.geom.Point2D;
import java.util.*;
public class NetlistBuilder {
public static class TerminalRef {
public final IDIYComponent<?> component;
public final int terminalIndex;
public TerminalRef(IDIYComponent<?> component, int terminalIndex) {
this.component = component;
this.terminalIndex = terminalIndex;
}
public Point2D getPosition() {
return component.getControlPoint(terminalIndex);
}
@Override
public String toString() {
return component.getName() + "." + terminalIndex;
}
@Override
public boolean equals(Object obj) {
if (this == obj) return true;
if (!(obj instanceof TerminalRef)) return false;
TerminalRef other = (TerminalRef) obj;
return Objects.equals(component, other.component) && terminalIndex == other.terminalIndex;
}
@Override
public int hashCode() {
return Objects.hash(component, terminalIndex);
}
}
public static List<Set<TerminalRef>> buildNets(List<IDIYComponent<?>> components, List<ContinuityArea> continuityAreas) {
Map<TerminalRef, Integer> terminalIndex = new HashMap<>();
List<TerminalRef> allTerminals = new ArrayList<>();
int idx = 0;
for (IDIYComponent<?> c : components) {
for (int i = 0; i < c.getControlPointCount(); i++) {
if (c.isControlPointSticky(i)) {
TerminalRef ref = new TerminalRef(c, i);
terminalIndex.put(ref, idx++);
allTerminals.add(ref);
}
}
}
UnionFind uf = new UnionFind(allTerminals.size());
// Step 1: connect conductive components
for (IDIYComponent<?> c : components) {
if (c instanceof IContinuity continuity && !(c instanceof ISwitch)) {
int count = c.getControlPointCount();
for (int i = 0; i < count; i++) {
for (int j = i + 1; j < count; j++) {
if (continuity.arePointsConnected(i, j)) {
TerminalRef a = new TerminalRef(c, i);
TerminalRef b = new TerminalRef(c, j);
uf.union(terminalIndex.get(a), terminalIndex.get(b));
}
}
}
}
}
// Step 2: connect terminals inside continuity areas
for (ContinuityArea continuity : continuityAreas) {
Area area = continuity.getSimplifiedArea();
List<TerminalRef> inside = new ArrayList<>();
for (TerminalRef t : allTerminals) {
Point2D p = t.getPosition();
if (area.contains(p)) {
inside.add(t);
}
}
for (int i = 0; i < inside.size(); i++) {
for (int j = i + 1; j < inside.size(); j++) {
uf.union(terminalIndex.get(inside.get(i)), terminalIndex.get(inside.get(j)));
}
}
}
Map<Integer, Set<TerminalRef>> netMap = new HashMap<>();
for (TerminalRef t : allTerminals) {
int root = uf.find(terminalIndex.get(t));
netMap.computeIfAbsent(root, k -> new HashSet<>()).add(t);
}
// Filter out nets with only one terminal and remove exact duplicates
List<Set<TerminalRef>> nets = new ArrayList<>();
Set<Set<TerminalRef>> seen = new HashSet<>();
for (Set<TerminalRef> net : netMap.values()) {
if (net.size() > 1 && seen.add(net)) {
nets.add(net);
}
}
return nets;
}
// Union-Find with path compression
static class UnionFind {
int[] parent;
UnionFind(int n) {
parent = new int[n];
for (int i = 0; i < n; i++) parent[i] = i;
}
int find(int x) {
if (parent[x] != x)
parent[x] = find(parent[x]);
return parent[x];
}
void union(int x, int y) {
parent[find(x)] = find(y);
}
}
}
//package org.diylc.plugins.chatbot.service;
//
//import org.diylc.core.IContinuity;
//import org.diylc.core.IDIYComponent;
//import org.diylc.core.ISwitch;
//import org.diylc.netlist.Node;
//import org.diylc.presenter.ContinuityArea;
//
//import java.awt.geom.Area;
//import java.awt.geom.Point2D;
//import java.util.*;
//
//public class NetlistBuilder {
// private static final double eps = 1e-6;
//
// public static List<Set<Node>> buildNets(List<IDIYComponent<?>> components, List<ContinuityArea> continuityAreas) {
// Map<Node, Integer> terminalIndex = new HashMap<>();
// List<Node> allTerminals = new ArrayList<>();
// int idx = 0;
//
// for (IDIYComponent<?> c : components) {
// for (int i = 0; i < c.getControlPointCount(); i++) {
// if (c.isControlPointSticky(i)) {
// Node ref = new Node(c, i);
// terminalIndex.put(ref, idx++);
// allTerminals.add(ref);
// }
// }
// }
//
// UnionFind uf = new UnionFind(allTerminals.size());
//
// // Step 1: connect conductive components
// for (IDIYComponent<?> c : components) {
// if (c instanceof IContinuity continuity && !(c instanceof ISwitch)) {
// int count = c.getControlPointCount();
// for (int i = 0; i < count; i++) {
// for (int j = i + 1; j < count; j++) {
// if (continuity.arePointsConnected(i, j)) {
// Node a = new Node(c, i);
// Node b = new Node(c, j);
// uf.union(terminalIndex.get(a), terminalIndex.get(b));
// }
// }
// }
// }
// }
//
// // Step 2: connect terminals inside continuity areas
// for (ContinuityArea continuity : continuityAreas) {
// Area area = continuity.getSimplifiedArea();
// List<Node> inside = new ArrayList<>();
//
// for (Node t : allTerminals) {
// Point2D p = t.getPoint2D();
// if (area.contains(p) || area.intersects(p.getX() - eps/2, p.getY() - eps/2, eps, eps)) {
// inside.add(t);
// }
// }
//
// for (int i = 0; i < inside.size(); i++) {
// for (int j = i + 1; j < inside.size(); j++) {
// uf.union(terminalIndex.get(inside.get(i)), terminalIndex.get(inside.get(j)));
// }
// }
// }
//
// Map<Integer, Set<Node>> netMap = new HashMap<>();
// for (Node t : allTerminals) {
// int root = uf.find(terminalIndex.get(t));
// netMap.computeIfAbsent(root, k -> new HashSet<>()).add(t);
// }
//
// // Filter out nets with only one terminal and remove exact duplicates
// List<Set<Node>> nets = new ArrayList<>();
// Set<Set<Node>> seen = new HashSet<>();
//
// for (Set<Node> net : netMap.values()) {
// if (net.size() > 1 && seen.add(net)) {
// nets.add(net);
// }
// }
// return nets;
//
// }
//
// // Union-Find with path compression and union by size
// static class UnionFind {
// private final int[] parent;
// private final int[] size;
//
// UnionFind(int n) {
// parent = new int[n];
// size = new int[n];
// for (int i = 0; i < n; i++) {
// parent[i] = i;
// size[i] = 1;
// }
// }
//
// int find(int x) {
// if (parent[x] != x) {
// parent[x] = find(parent[x]); // Path compression
// }
// return parent[x];
// }
//
// void union(int x, int y) {
// int rootX = find(x);
// int rootY = find(y);
//
// if (rootX == rootY) return;
//
// // Union by size: attach smaller tree to larger tree
// if (size[rootX] < size[rootY]) {
// parent[rootX] = rootY;
// size[rootY] += size[rootX];
// } else {
// parent[rootY] = rootX;
// size[rootX] += size[rootY];
// }
// }
// }
//}
//
diylc/diylc-core/src/main/java/org/diylc/presenter/G2DWrapper.java
+21 -3
View File
@@ -63,6 +63,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.log4j.Logger;
import org.diylc.common.ObjectCache;
import org.diylc.common.ZoomableStroke;
import org.diylc.core.IDrawingObserver;
@@ -79,9 +80,14 @@ import org.diylc.core.IDrawingObserver;
class G2DWrapper extends Graphics2D implements IDrawingObserver {
public static int LINE_SENSITIVITY_MARGIN = 2;
public static int CURVE_SENSITIVITY = 6;
public static int CURVE_SENSITIVITY = 6;
private static final Logger LOG = Logger.getLogger(G2DWrapper.class);
public static String DEBUG_AREA_PERFORMANCE = "org.diylc.debugAreaPerformance";
private boolean drawingComponent = false;
private final boolean debugAreaPerformance;
private boolean trackingAllowed = true;
private boolean trackingContinuityAllowed = false;
private boolean trackingContinuityPositive = true;
@@ -115,6 +121,8 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
public G2DWrapper(Graphics2D canvasGraphics, double zoom) {
super();
this.canvasGraphics = canvasGraphics;
String debugAreaPerformanceStr = System.getProperty(DEBUG_AREA_PERFORMANCE);
debugAreaPerformance = "true".equalsIgnoreCase(debugAreaPerformanceStr);
this.zoom = zoom;
currentArea = new Area();
continuityPositiveAreas = new HashMap<String, Area>();
@@ -236,8 +244,18 @@ class G2DWrapper extends Graphics2D implements IDrawingObserver {
Area area = new Area(s);
area.transform(currentTx);
if (trackingAllowed)
currentArea.add(area);
Area areaBefore = null;
if (debugAreaPerformance) {
areaBefore = new Area(currentArea);
}
if (trackingAllowed) {
currentArea.add(area);
if (debugAreaPerformance && currentArea.equals(areaBefore)) {
LOG.warn("Detected unnecessary shape tracking at", new Throwable());
}
}
Map<String, Area> toAdd;
if (trackingContinuityAllowed) {
diylc/diylc-core/src/main/resources/update.xml
+40
View File
@@ -296,5 +296,45 @@
</changes>
<url>https://github.com/bancika/diy-layout-creator/releases</url>
</org.diylc.appframework.update.Version>
<org.diylc.appframework.update.Version>
<versionNumber>
<major>5</major>
<minor>4</minor>
<build>0</build>
</versionNumber>
<releaseDate>2025-05-13 00:00:00.000 CET</releaseDate>
<name></name>
<changes>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>'AI Analyzer' feature added which uses AI to scan the circuit diagram and report issues and suggestions</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Significantly improve rendering performance of most components</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>'Open Jack 1/4"' and 'Potentiometer Panel' now tolerate connections anywhere on the lugs instead of dead center only</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Increased maximum number of switching combinations to 256 for circuit analysis</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>'Pilot Lamp Holder' component can sometimes hang the application</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Fixed the issue with embedding image files into DIY projects</description>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>BUG_FIX</changeType>
<description>Fixed the issue with some components (e.g. DIP IC) jumping when showing underside of a board</description>
</org.diylc.appframework.update.Change>
</changes>
<url>https://github.com/bancika/diy-layout-creator/releases</url>
</org.diylc.appframework.update.Version>
</a>
</java.util.Arrays_-ArrayList>
diylc/diylc-core/src/test/java/org/diylc/plugins/chatbot/service/NetlistBuilderTest.java
+188
View File
@@ -0,0 +1,188 @@
//package org.diylc.plugins.chatbot.service;
//
//import org.diylc.core.IContinuity;
//import org.diylc.core.IDIYComponent;
//import org.diylc.core.ComponentState;
//import org.diylc.core.IDrawingObserver;
//import org.diylc.core.Project;
//import org.diylc.core.VisibilityPolicy;
//import org.diylc.netlist.Node;
//import org.diylc.presenter.ContinuityArea;
//import org.junit.Test;
//import org.diylc.components.AbstractComponent;
//
//import java.awt.Graphics2D;
//import java.awt.geom.Area;
//import java.awt.geom.Point2D;
//import java.util.*;
//
//import static org.junit.Assert.*;
//
//public class NetlistBuilderTest {
//
// // Mock component that implements IContinuity
// private static class MockConductiveComponent extends AbstractComponent<Void> implements IContinuity {
// private final Point2D[] points;
// private final boolean[][] connections;
//
// public MockConductiveComponent(Point2D[] points, boolean[][] connections) {
// this.points = points;
// this.connections = connections;
// }
//
// @Override
// public int getControlPointCount() {
// return points.length;
// }
//
// @Override
// public Point2D getControlPoint(int index) {
// return points[index];
// }
//
// @Override
// public boolean isControlPointSticky(int index) {
// return true;
// }
//
// @Override
// public boolean arePointsConnected(int index1, int index2) {
// return connections[index1][index2];
// }
//
// @Override
// public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project, IDrawingObserver drawingObserver) {
// // Not needed for testing
// }
//
// @Override
// public void drawIcon(Graphics2D g2d, int width, int height) {
// // Not needed for testing
// }
//
// @Override
// public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
// return VisibilityPolicy.ALWAYS;
// }
//
// @Override
// public void setControlPoint(Point2D point, int index) {
// // Not needed for testing
// }
//
// @Override
// public Void getValue() {
// return null;
// }
//
// @Override
// public void setValue(Void value) {
// // Not needed for testing
// }
// }
//
// // Mock component that doesn't implement IContinuity
// private static class MockNonConductiveComponent extends AbstractComponent<Void> {
// private final Point2D[] points;
//
// public MockNonConductiveComponent(Point2D[] points) {
// this.points = points;
// }
//
// @Override
// public int getControlPointCount() {
// return points.length;
// }
//
// @Override
// public Point2D getControlPoint(int index) {
// return points[index];
// }
//
// @Override
// public boolean isControlPointSticky(int index) {
// return true;
// }
//
// @Override
// public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project, IDrawingObserver drawingObserver) {
// // Not needed for testing
// }
//
// @Override
// public void drawIcon(Graphics2D g2d, int width, int height) {
// // Not needed for testing
// }
//
// @Override
// public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
// return VisibilityPolicy.ALWAYS;
// }
//
// @Override
// public void setControlPoint(Point2D point, int index) {
// // Not needed for testing
// }
//
// @Override
// public Void getValue() {
// return null;
// }
//
// @Override
// public void setValue(Void value) {
// // Not needed for testing
// }
// }
//
// @Test
// public void testBuildNets() {
// // Create test components
// Point2D[] points1 = {
// new Point2D.Double(0, 0),
// new Point2D.Double(10, 0),
// new Point2D.Double(20, 0)
// };
// boolean[][] connections1 = {
// {false, true, false},
// {true, false, true},
// {false, true, false}
// };
// MockConductiveComponent comp1 = new MockConductiveComponent(points1, connections1);
//
// Point2D[] points2 = {
// new Point2D.Double(30, 0),
// new Point2D.Double(40, 0)
// };
// MockNonConductiveComponent comp2 = new MockNonConductiveComponent(points2);
//
// // Create a continuity area that connects comp1 and comp2
// Area area = new Area();
// area.add(new Area(new java.awt.geom.Rectangle2D.Double(15, -5, 20, 10)));
// ContinuityArea continuityArea = new ContinuityArea(0, area);
//
// // Build nets
// List<IDIYComponent<?>> components = Arrays.asList(comp1, comp2);
// List<ContinuityArea> continuityAreas = Collections.singletonList(continuityArea);
// List<Set<Node>> nets = NetlistBuilder.buildNets(components, continuityAreas);
//
// // Verify results
// assertEquals("Should have exactly one net", 1, nets.size());
// Set<Node> net = nets.get(0);
// assertEquals("Net should contain all terminals", 5, net.size());
//
// // Verify that all terminals are connected
// Set<Integer> terminalIndices = new HashSet<>();
// for (Node node : net) {
// terminalIndices.add(node.getPointIndex());
// System.out.println("Found terminal: " + node.getPointIndex() + " at " + node.getPoint2D());
// }
// System.out.println("All terminals: " + terminalIndices);
// assertEquals("Should contain all terminal indices", 5, terminalIndices.size());
// assertTrue("Should contain terminal 0", terminalIndices.contains(0));
// assertTrue("Should contain terminal 1", terminalIndices.contains(1));
// assertTrue("Should contain terminal 2", terminalIndices.contains(2));
// assertTrue("Should contain terminal 3", terminalIndices.contains(3));
// assertTrue("Should contain terminal 4", terminalIndices.contains(4));
// }
//}
diylc/diylc-library/src/main/java/org/diylc/components/AbstractLeadedComponent.java
+33 -30
View File
@@ -355,39 +355,42 @@ public abstract class AbstractLeadedComponent<T> extends AbstractLabeledComponen
if (getDisplay() == Display.BOTH) {
label = getName() + " " + (getValue() == null ? "" : getValue().toString());
}
Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
// Don't offset in outline mode.
int offset = outlineMode ? 0 : getLabelOffset((int) length, (int) width, (int) textRect.getWidth());
// Adjust label angle if needed to make sure that it's readable.
if ((theta >= Math.PI / 2 && theta <= Math.PI) || (theta < -Math.PI / 2 && theta > -Math.PI)) {
g2d.rotate(Math.PI, length / 2, width / 2);
theta += Math.PI;
offset = -offset;
}
drawingObserver.startTracking();
if (getMoveLabel()) {
g2d.setTransform(oldTransform);
g2d.translate(getPoints()[2].getX(), getPoints()[2].getY());
if (getLabelOriantation() != LabelOriantation.Horizontal) {
g2d.rotate(theta);
if (!label.isEmpty()) {
Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d);
// Don't offset in outline mode.
int offset = outlineMode ? 0 : getLabelOffset((int) length, (int) width, (int) textRect.getWidth());
// Adjust label angle if needed to make sure that it's readable.
if ((theta >= Math.PI / 2 && theta <= Math.PI) || (theta < -Math.PI / 2 && theta > -Math.PI)) {
g2d.rotate(Math.PI, length / 2, width / 2);
theta += Math.PI;
offset = -offset;
}
StringUtils.drawCenteredText(g2d, label, offset, 0, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
g2d.setTransform(oldTransform);
} else {
if (isStanding() || getLabelOriantation() == LabelOriantation.Horizontal) {
if (getMoveLabel()) {
drawingObserver.startTracking();
g2d.setTransform(oldTransform);
g2d.translate(getPoints()[2].getX(), getPoints()[2].getY());
if (getLabelOriantation() != LabelOriantation.Horizontal) {
g2d.rotate(theta);
}
StringUtils.drawCenteredText(g2d, label, offset, 0, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
g2d.setTransform(oldTransform);
double x = (getPoints()[0].getX() + getPoints()[1].getX() - length) / 2.0;
double y = (getPoints()[0].getY() + getPoints()[1].getY() - width) / 2.0;
g2d.drawString(label, (int) (x + (length - textRect.getWidth()) / 2 + offset),
(int)(y + calculateLabelYOffset(shapeRect, textRect, fontMetrics)));
} else {
g2d.drawString(label, (int) (length - textRect.getWidth()) / 2 + offset,
calculateLabelYOffset(shapeRect, textRect, fontMetrics));
g2d.setTransform(oldTransform);
}
if (isStanding() || getLabelOriantation() == LabelOriantation.Horizontal) {
drawingObserver.startTracking();
g2d.setTransform(oldTransform);
double x = (getPoints()[0].getX() + getPoints()[1].getX() - length) / 2.0;
double y = (getPoints()[0].getY() + getPoints()[1].getY() - width) / 2.0;
g2d.drawString(label, (int) (x + (length - textRect.getWidth()) / 2 + offset),
(int) (y + calculateLabelYOffset(shapeRect, textRect, fontMetrics)));
} else {
drawingObserver.stopTracking();
g2d.drawString(label, (int) (length - textRect.getWidth()) / 2 + offset,
calculateLabelYOffset(shapeRect, textRect, fontMetrics));
g2d.setTransform(oldTransform);
}
}
}
// if (getLabelOriantation() == LabelOriantation.Horizontal) {
//
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/PCBTerminalBlock.java
+4 -3
View File
@@ -213,6 +213,9 @@ public class PCBTerminalBlock extends AbstractTransparentComponent<PCBTerminalBl
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
g2d.fill(body[0]);
// Do not track these changes because the whole switch has been tracked
// so far.
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
Color finalBorderColor;
@@ -232,9 +235,7 @@ public class PCBTerminalBlock extends AbstractTransparentComponent<PCBTerminalBl
g2d.setColor(finalBorderColor);
g2d.draw(body[0]);
}
// Do not track these changes because the whole switch has been tracked
// so far.
drawingObserver.stopTracking();
// Draw lugs.
int circleDiameter = getClosestOdd((int) (getPitch().convertToPixels() * 3d / 5));
diylc/diylc-library/src/main/java/org/diylc/components/connectivity/SolderPad.java
+1
View File
@@ -109,6 +109,7 @@ public class SolderPad extends AbstractTransparentComponent<Void>
g2d.fill(new Rectangle2D.Double(point.getX() - diameter / 2, point.getY() - diameter / 2,
diameter, diameter));
}
drawingObserver.stopTracking();
drawingObserver.stopTrackingContinuityArea();
if (gerberDrawingObserver != null)
gerberDrawingObserver.stopGerberOutput(org.diylc.core.gerber.GerberLayer.SolderMaskBot);
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/BatterySnap9V.java
+2
View File
@@ -103,6 +103,8 @@ public class BatterySnap9V extends AbstractTransparentComponent<String> {
: color.brighter();
}
drawingObserver.stopTracking();
g2d.setColor(finalBorderColor);
g2d.draw(body[0]);
g2d.setColor(METAL_COLOR.darker());
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/ClosedJack1_4.java
+2
View File
@@ -236,6 +236,8 @@ public class ClosedJack1_4 extends AbstractMultiPartComponent<JackType> implemen
g2d.setComposite(oldComposite);
// }
drawingObserver.stopTracking();
Color finalBorderColor;
if (outlineMode) {
Theme theme =
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/DIPSwitch.java
+2 -2
View File
@@ -356,6 +356,8 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
g2d.fill(mainArea);
g2d.setComposite(oldComposite);
drawingObserver.stopTracking();
Color finalBorderColor;
if (outlineMode) {
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
@@ -392,8 +394,6 @@ public class DIPSwitch extends AbstractTransparentComponent<String> implements I
}
}
drawingObserver.stopTracking();
// Draw label.
g2d.setFont(project.getFont());
Color finalLabelColor;
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/MiniRelay.java
+2
View File
@@ -304,6 +304,8 @@ public class MiniRelay extends AbstractLabeledComponent<String> implements IGerb
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
g2d.fill(mainArea);
g2d.setComposite(oldComposite);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/OpenJack1_4.java
+45 -11
View File
@@ -129,18 +129,29 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<OpenJackType> {
if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BASE_COLOR);
g2d.setColor(Constants.TRANSPARENT_COLOR);
drawingObserver.startTrackingContinuityArea(true);
g2d.fill(body[1]);
g2d.fill(body[2]);
if (body[3] != null)
g2d.fill(body[3]);
g2d.fill(body[4]);
g2d.fill(body[5]);
if (body[6] != null)
g2d.fill(body[6]);
drawingObserver.stopTrackingContinuityArea();
if (!outlineMode) {
g2d.setColor(BASE_COLOR);
g2d.fill(body[1]);
g2d.fill(body[2]);
if (body[3] != null)
g2d.fill(body[3]);
}
g2d.setComposite(oldComposite);
// }
drawingObserver.stopTracking();
if (outlineMode) {
Theme theme =
(Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
@@ -148,16 +159,12 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<OpenJackType> {
} else {
finalBorderColor = BASE_COLOR.darker();
}
drawingObserver.stopTracking();
g2d.setColor(finalBorderColor);
g2d.draw(body[1]);
g2d.draw(body[2]);
if (body[3] != null)
g2d.draw(body[3]);
drawingObserver.startTracking();
// draw labels
if (showLabels) {
@@ -193,7 +200,7 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<OpenJackType> {
public Area[] getBody() {
if (body == null) {
body = new Area[4];
body = new Area[7];
double x = controlPoints[0].getX();
double y = controlPoints[0].getY();
@@ -224,6 +231,13 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<OpenJackType> {
body[1] = tip;
// no-hole tip for continuity
tip =
new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength
- ringDiameter / 2, springWidth, springWidth));
tip.subtract(wafer);
body[4] = tip;
Area sleeve =
new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength,
springWidth, springWidth));
@@ -237,6 +251,17 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<OpenJackType> {
body[2] = sleeve;
// no-hole sleeve for continuity
sleeve =
new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength,
springWidth, springWidth));
sleeve.transform(AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SLEEVE_SWITCHED_THETA : SLEEVE_THETA, x, centerY));
sleeve.add(new Area(new Ellipse2D.Double(x - ringDiameter / 2, centerY - ringDiameter / 2, ringDiameter,
ringDiameter)));
sleeve.subtract(new Area(new Ellipse2D.Double(x - innerDiameter / 2, centerY - innerDiameter / 2, innerDiameter,
innerDiameter)));
body[5] = sleeve;
if (getValue() != OpenJackType.MONO) {
Area ringOrSwitch =
new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength,
@@ -248,6 +273,15 @@ public class OpenJack1_4 extends AbstractMultiPartComponent<OpenJackType> {
outerDiameter)));
body[3] = ringOrSwitch;
ringOrSwitch =
new Area(new RoundRectangle2D.Double(x - springWidth / 2, y - holeToEdge, springWidth, springLength,
springWidth, springWidth));
ringOrSwitch.transform(AffineTransform.getRotateInstance(getValue() == OpenJackType.SWITCHED ? SWITCH_THETA : RING_THETA, x, centerY));
ringOrSwitch.subtract(new Area(new Ellipse2D.Double(x - outerDiameter / 2, centerY - outerDiameter / 2, outerDiameter,
outerDiameter)));
body[6] = ringOrSwitch;
}
// Rotate if needed
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/OpenJack1_8.java
+2 -2
View File
@@ -141,6 +141,8 @@ public class OpenJack1_8 extends AbstractMultiPartComponent<OpenJackType> {
g2d.setComposite(oldComposite);
// }
drawingObserver.stopTracking();
if (outlineMode) {
Theme theme =
(Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
@@ -148,8 +150,6 @@ public class OpenJack1_8 extends AbstractMultiPartComponent<OpenJackType> {
} else {
finalBorderColor = BASE_COLOR.darker();
}
drawingObserver.stopTracking();
g2d.setColor(finalBorderColor);
g2d.draw(body[1]);
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/PilotLampHolder.java
+1
View File
@@ -134,6 +134,7 @@ public class PilotLampHolder extends AbstractMultiPartComponent<String> {
g2d.fill(body[2]);
drawingObserver.stopTrackingContinuityArea();
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
// }
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/PinHeader.java
+1
View File
@@ -232,6 +232,7 @@ public class PinHeader extends AbstractTransparentComponent<Void> {
g2d.setColor(shroudColor);
g2d.fill(shroudArea);
}
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/PlasticDCJack.java
+1
View File
@@ -142,6 +142,7 @@ public class PlasticDCJack extends AbstractMultiPartComponent<String> implements
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
g2d.fill(body[0]);
drawingObserver.stopTracking();
if (!outlineMode) {
g2d.setColor(PHENOLIC_DARK_COLOR);
g2d.fill(body[1]);
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/RCAJack.java
+4
View File
@@ -93,6 +93,8 @@ public class RCAJack extends AbstractMultiPartComponent<String> {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : WAFER_COLOR);
g2d.fill(body[0]);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
// }
@@ -116,8 +118,10 @@ public class RCAJack extends AbstractMultiPartComponent<String> {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BASE_COLOR);
drawingObserver.startTrackingContinuityArea(true);
drawingObserver.startTracking();
g2d.fill(body[1]);
g2d.fill(body[2]);
drawingObserver.stopTracking();
drawingObserver.stopTrackingContinuityArea();
if (body[3] != null)
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/RotarySwitchOpen.java
+3 -1
View File
@@ -362,7 +362,9 @@ public class RotarySwitchOpen extends AbstractAngledComponent<RotarySwitchOpenTy
drawingObserver.startTrackingContinuityArea(true);
for (int i = secondLevelStart; i < body.length; i++) {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : pinColor);
drawingObserver.startTracking();
g2d.fill(body[i]);
drawingObserver.stopTracking();
g2d.setColor(outlineMode ? finalBorderColor : pinColor.darker());
g2d.draw(body[i]);
}
@@ -376,8 +378,8 @@ public class RotarySwitchOpen extends AbstractAngledComponent<RotarySwitchOpenTy
}
g2d.setColor(finalBorderColor);
drawingObserver.startTracking();
g2d.draw(body[0]);
drawingObserver.stopTracking();
// Draw pins
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/RotarySwitchSealed.java
+1 -2
View File
@@ -182,6 +182,7 @@ public class RotarySwitchSealed extends AbstractAngledComponent<RotarySwitchSeal
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getColor());
g2d.fill(body[0]);
}
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
if (outlineMode) {
@@ -198,8 +199,6 @@ public class RotarySwitchSealed extends AbstractAngledComponent<RotarySwitchSeal
g2d.setColor(finalBorderColor);
g2d.draw(body[0]);
drawingObserver.stopTracking();
// Draw pins
if (!outlineMode) {
for (int i = 1; i < controlPoints.length; i++) {
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/SlideSwitch.java
+2 -4
View File
@@ -247,7 +247,7 @@ public class SlideSwitch extends AbstractTransparentComponent<SlideSwitchType> i
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
g2d.fill(body[0]);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
Color finalBorderColor;
@@ -269,9 +269,7 @@ public class SlideSwitch extends AbstractTransparentComponent<SlideSwitchType> i
}
g2d.draw(body[0]);
}
// Do not track these changes because the whole switch has been tracked
// so far.
drawingObserver.stopTracking();
// Draw lugs.
int lugWidth;
diylc/diylc-library/src/main/java/org/diylc/components/electromechanical/TactileMicroSwitch.java
+4
View File
@@ -232,7 +232,9 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> impleme
Rectangle2D rect = new Rectangle2D.Double(point.getX() - pinSize / 2,
point.getY() - pinSize / 2, pinSize, pinSize);
g2d.setColor(PIN_COLOR);
drawingObserver.startTracking();
g2d.fill(rect);
drawingObserver.stopTrackingContinuityArea();
g2d.setColor(PIN_BORDER_COLOR);
g2d.draw(rect);
}
@@ -242,7 +244,9 @@ public class TactileMicroSwitch extends AbstractLabeledComponent<String> impleme
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
drawingObserver.stopTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setColor(INDENT_COLOR);
g2d.fill(indentArea);
diylc/diylc-library/src/main/java/org/diylc/components/guitar/AbstractGuitarPickup.java
+1 -1
View File
@@ -66,7 +66,7 @@ public abstract class AbstractGuitarPickup extends AbstractLabeledComponent<Stri
updateControlPoints();
}
protected void drawlTerminalLabels(Graphics2D g2d, Color color, Project project) {
protected void drawTerminalLabels(Graphics2D g2d, Color color, Project project) {
Point2D[] points = getControlPoints();
g2d.setColor(color);
diylc/diylc-library/src/main/java/org/diylc/components/guitar/AbstractSingleOrHumbuckerPickup.java
+1 -1
View File
@@ -34,7 +34,7 @@ public abstract class AbstractSingleOrHumbuckerPickup extends AbstractGuitarPick
private static final long serialVersionUID = 1L;
@Override
protected void drawlTerminalLabels(Graphics2D g2d, Color color, Project project) {
protected void drawTerminalLabels(Graphics2D g2d, Color color, Project project) {
Point2D[] points = getControlPoints();
g2d.setColor(color);
diylc/diylc-library/src/main/java/org/diylc/components/guitar/HumbuckerPickup.java
+13 -3
View File
@@ -93,6 +93,8 @@ public class HumbuckerPickup extends AbstractGuitarPickup {
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
IDrawingObserver drawingObserver) {
drawingObserver.stopTracking();
Shape[] body = getBody();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
@@ -102,10 +104,16 @@ public class HumbuckerPickup extends AbstractGuitarPickup {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : color);
if (getType() != HumbuckerType.Filtertron)
if (getType() != HumbuckerType.Filtertron) {
drawingObserver.startTracking();
g2d.fill(body[0]);
if (body[1] != null)
drawingObserver.stopTracking();
}
if (body[1] != null) {
drawingObserver.startTracking();
g2d.fill(body[1]);
drawingObserver.stopTracking();
}
if (!outlineMode) {
if (body[4] != null) {
@@ -120,7 +128,9 @@ public class HumbuckerPickup extends AbstractGuitarPickup {
if (getType() == HumbuckerType.Filtertron) {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : color);
drawingObserver.startTracking();
g2d.fill(body[0]);
drawingObserver.stopTracking();
}
// g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : POINT_COLOR);
@@ -175,7 +185,7 @@ public class HumbuckerPickup extends AbstractGuitarPickup {
drawMainLabel(g2d, project, outlineMode, componentState);
drawlTerminalLabels(g2d, finalBorderColor, project);
drawTerminalLabels(g2d, finalBorderColor, project);
}
@Override
diylc/diylc-library/src/main/java/org/diylc/components/guitar/JazzBassPickup.java
+4 -2
View File
@@ -81,6 +81,7 @@ public class JazzBassPickup extends AbstractSingleOrHumbuckerPickup {
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
IDrawingObserver drawingObserver) {
Shape[] body = getBody();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
@@ -91,7 +92,8 @@ public class JazzBassPickup extends AbstractSingleOrHumbuckerPickup {
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : color);
g2d.fill(body[0]);
g2d.fill(body[1]);
g2d.fill(body[1]);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -137,7 +139,7 @@ public class JazzBassPickup extends AbstractSingleOrHumbuckerPickup {
// VerticalAlignment.CENTER);
drawMainLabel(g2d, project, outlineMode, componentState);
drawlTerminalLabels(g2d, finalBorderColor, project);
drawTerminalLabels(g2d, finalBorderColor, project);
}
@SuppressWarnings("incomplete-switch")
diylc/diylc-library/src/main/java/org/diylc/components/guitar/LPSwitch.java
+4
View File
@@ -93,6 +93,8 @@ public class LPSwitch extends AbstractTransparentComponent<String> implements IS
g2d.setComposite(oldComposite);
}
drawingObserver.stopTracking();
Color finalBorderColor;
if (outlineMode) {
@@ -127,7 +129,9 @@ public class LPSwitch extends AbstractTransparentComponent<String> implements IS
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(2));
g2d.setColor(METAL_COLOR);
drawingObserver.startTracking();
g2d.draw(body[2]);
drawingObserver.stopTracking();
}
@SuppressWarnings("incomplete-switch")
diylc/diylc-library/src/main/java/org/diylc/components/guitar/LeverSwitch.java
+4
View File
@@ -111,6 +111,8 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
g2d.setComposite(oldComposite);
}
drawingObserver.stopTracking();
Color finalBorderColor;
if (outlineMode) {
Theme theme =
@@ -142,7 +144,9 @@ public class LeverSwitch extends AbstractAngledComponent<LeverSwitch.LeverSwitch
g2d.draw(body[1]);
g2d.setColor(LUG_COLOR);
drawingObserver.startTracking();
g2d.fill(body[2]);
drawingObserver.stopTracking();
g2d.setColor(LUG_COLOR.darker());
g2d.draw(body[2]);
diylc/diylc-library/src/main/java/org/diylc/components/guitar/P90Pickup.java
+2 -1
View File
@@ -107,6 +107,7 @@ public class P90Pickup extends AbstractSingleOrHumbuckerPickup {
g2d.fill(body[1]);
// g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : POINT_COLOR);
// g2d.fill(body[2]);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -153,7 +154,7 @@ public class P90Pickup extends AbstractSingleOrHumbuckerPickup {
// VerticalAlignment.CENTER);
drawMainLabel(g2d, project, outlineMode, componentState);
drawlTerminalLabels(g2d, finalBorderColor, project);
drawTerminalLabels(g2d, finalBorderColor, project);
// terminal labels
// Point[] points = getControlPoints();
// g2d.setColor(finalBorderColor);
diylc/diylc-library/src/main/java/org/diylc/components/guitar/PBassPickup.java
+2 -1
View File
@@ -90,6 +90,7 @@ public class PBassPickup extends AbstractSingleOrHumbuckerPickup {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : color);
g2d.fill(body[0]);
g2d.fill(body[1]);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -135,7 +136,7 @@ public class PBassPickup extends AbstractSingleOrHumbuckerPickup {
// VerticalAlignment.CENTER);
drawMainLabel(g2d, project, outlineMode, componentState);
drawlTerminalLabels(g2d, finalBorderColor, project);
drawTerminalLabels(g2d, finalBorderColor, project);
}
@SuppressWarnings("incomplete-switch")
diylc/diylc-library/src/main/java/org/diylc/components/guitar/S1Switch.java
+1
View File
@@ -162,6 +162,7 @@ public class S1Switch extends AbstractTransparentComponent<Void> implements ISwi
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
g2d.fill(body);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
Color finalBorderColor;
diylc/diylc-library/src/main/java/org/diylc/components/guitar/SchallerMegaSwitch.java
+7
View File
@@ -110,11 +110,14 @@ public class SchallerMegaSwitch extends AbstractAngledComponent<String> implemen
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BASE_COLOR);
g2d.fill(body[0]);
drawingObserver.stopTracking();
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : WAFER_COLOR);
g2d.fill(body[1]);
g2d.setComposite(oldComposite);
}
drawingObserver.stopTracking();
Color finalBorderColor;
if (outlineMode) {
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY,
@@ -150,12 +153,16 @@ public class SchallerMegaSwitch extends AbstractAngledComponent<String> implemen
g2d.draw(body[1]);
g2d.setColor(LUG_COLOR);
drawingObserver.startTracking();
g2d.fill(body[2]);
drawingObserver.stopTracking();
g2d.setColor(LUG_COLOR.darker());
g2d.draw(body[2]);
for (int i = 3; i < body.length; i++) {
g2d.setColor(ISwitch.POLE_COLORS[i - 3]);
drawingObserver.startTracking();
g2d.fill(body[i]);
drawingObserver.stopTracking();
g2d.setColor(ISwitch.POLE_COLORS[i - 3].darker());
g2d.draw(body[i]);
}
diylc/diylc-library/src/main/java/org/diylc/components/guitar/SingleCoilPickup.java
+3 -1
View File
@@ -124,6 +124,8 @@ public class SingleCoilPickup extends AbstractSingleOrHumbuckerPickup {
g2d.fill(body[0]);
else
g2d.fill(body[3]);
drawingObserver.stopTracking();
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getLugColor());
g2d.fill(body[1]);
@@ -172,7 +174,7 @@ public class SingleCoilPickup extends AbstractSingleOrHumbuckerPickup {
drawMainLabel(g2d, project, outlineMode, componentState);
drawlTerminalLabels(g2d, finalBorderColor, project);
drawTerminalLabels(g2d, finalBorderColor, project);
}
@Override
diylc/diylc-library/src/main/java/org/diylc/components/guitar/StingrayBassPickup.java
+3 -2
View File
@@ -102,6 +102,7 @@ public class StingrayBassPickup extends AbstractGuitarPickup {
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : color);
g2d.fill(body[0]);
g2d.fill(body[1]);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -148,7 +149,7 @@ public class StingrayBassPickup extends AbstractGuitarPickup {
drawMainLabel(g2d, project, outlineMode, componentState);
drawlTerminalLabels(g2d, finalBorderColor, project);
drawTerminalLabels(g2d, finalBorderColor, project);
}
@SuppressWarnings("incomplete-switch")
@@ -336,4 +337,4 @@ public class StingrayBassPickup extends AbstractGuitarPickup {
// just to disable editor
return super.getPolarity();
}
}
}
diylc/diylc-library/src/main/java/org/diylc/components/misc/Image.java
+1
View File
@@ -234,6 +234,7 @@ public class Image extends AbstractTransparentComponent<Void> {
public void setData(byte[] data) {
this.data = data;
this.imageIcon = null;
this.image = null;
if (getSizingMode() == ImageSizingMode.TwoPoints) {
ImageIcon imageIcon = getImage();
diylc/diylc-library/src/main/java/org/diylc/components/passive/PotentiometerPanel.java
+14 -5
View File
@@ -121,7 +121,7 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
if (body == null) {
// mandatory: 0, 1, 2 pins, 3 body, 9 wafer
// optional: 4, 5, 6 lugs, 7 nut, 8 shaft
body = new Area[10];
body = new Area[13];
// Add lugs.
int pinWidth = (int) PIN_SIZE.convertToPixels();
@@ -210,6 +210,7 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
new Area(new Ellipse2D.Double(controlPoints[i].getX() - lugDiameter / 2, controlPoints[i].getY() - lugDiameter / 2,
lugDiameter, lugDiameter));
body[4 + i] = area;
body[10 + i] = new Area(area);
}
for (int i = 0; i < 3; i++) {
@@ -272,6 +273,11 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
case 9:
g2d.setColor(getWaferColor());
break;
case 10:
case 11:
case 12:
g2d.setColor(Constants.TRANSPARENT_COLOR);
break;
default:
g2d.setColor(getBodyColor());
}
@@ -281,11 +287,11 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
if (!outlineMode) {
// if (i >= 3 && i <= 6)
// drawingObserver.startTrackingContinuityArea(true);
if (i >= 10)
drawingObserver.startTrackingContinuityArea(true);
g2d.fill(shape);
// if (i >= 3 && i <= 6)
// drawingObserver.stopTrackingContinuityArea();
if (i >= 10)
drawingObserver.stopTrackingContinuityArea();
}
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -302,6 +308,9 @@ public class PotentiometerPanel extends AbstractPotentiometer implements ILayere
g2d.draw(shape);
}
}
drawingObserver.stopTracking();
// Draw caption.
g2d.setFont(project.getFont());
diylc/diylc-library/src/main/java/org/diylc/components/passive/TrimmerPotentiometer.java
+3 -4
View File
@@ -375,14 +375,13 @@ public class TrimmerPotentiometer extends AbstractPotentiometer {
Shape shaftShape = getBody()[1];
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
if (mainShape != null) {
g2d.setColor(bodyColor);
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
Composite oldComposite = g2d.getComposite();
if (alpha < MAX_ALPHA) {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
if (!outlineMode) {
g2d.fill(mainShape);
}
g2d.fill(mainShape);
drawingObserver.stopTracking();
if (!outlineMode && shaftShape != null) {
g2d.setColor(SHAFT_COLOR);
g2d.fill(shaftShape);
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/DIL_IC.java
+4 -2
View File
@@ -315,7 +315,9 @@ public class DIL_IC extends AbstractLabeledComponent<String> implements IGerberC
Rectangle2D rect = new Rectangle2D.Double(point.getX() - pinSize / 2,
point.getY() - pinSize / 2, pinSize, pinSize);
g2d.setColor(PIN_COLOR);
drawingObserver.startTracking();
g2d.fill(rect);
drawingObserver.stopTracking();
g2d.setColor(PIN_BORDER_COLOR);
g2d.draw(rect);
}
@@ -325,7 +327,9 @@ public class DIL_IC extends AbstractLabeledComponent<String> implements IGerberC
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
drawingObserver.startTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
@@ -356,8 +360,6 @@ public class DIL_IC extends AbstractLabeledComponent<String> implements IGerberC
}
}
drawingObserver.stopTracking();
// Draw label.
g2d.setFont(project.getFont());
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/SIL_IC.java
+1
View File
@@ -308,6 +308,7 @@ public class SIL_IC extends AbstractTransparentComponent<String> implements IGer
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/TransistorTO1.java
+4
View File
@@ -161,6 +161,8 @@ public class TransistorTO1 extends AbstractTransistorPackage {
@Override
public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
IDrawingObserver drawingObserver) {
drawingObserver.stopTracking();
if (checkPointsClipped(g2d.getClip())) {
return;
}
@@ -184,7 +186,9 @@ public class TransistorTO1 extends AbstractTransistorPackage {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
drawingObserver.startTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/TransistorTO126.java
+12 -1
View File
@@ -183,6 +183,7 @@ public class TransistorTO126 extends AbstractTransistorPackage {
if (checkPointsClipped(g2d.getClip())) {
return;
}
drawingObserver.stopTracking();
int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
@@ -211,7 +212,9 @@ public class TransistorTO126 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX() + leadLength - leadThickness / 2, point.getY());
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -220,7 +223,9 @@ public class TransistorTO126 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX(), point.getY() + leadLength - leadThickness / 2);
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -229,7 +234,9 @@ public class TransistorTO126 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX() - leadLength - leadThickness / 2, point.getY());
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -238,7 +245,9 @@ public class TransistorTO126 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX(), point.getY() - leadLength);
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -266,7 +275,9 @@ public class TransistorTO126 extends AbstractTransistorPackage {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
g2d.fill(mainArea);
drawingObserver.startTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
if (!outlineMode) {
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/TransistorTO220.java
+11
View File
@@ -210,6 +210,7 @@ public class TransistorTO220 extends AbstractTransistorPackage {
if (checkPointsClipped(g2d.getClip())) {
return;
}
drawingObserver.stopTracking();
int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
@@ -238,7 +239,9 @@ public class TransistorTO220 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX() + leadLength - leadThickness / 2, point.getY());
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -247,7 +250,9 @@ public class TransistorTO220 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX(), point.getY() + leadLength - leadThickness / 2);
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -256,7 +261,9 @@ public class TransistorTO220 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX() - leadLength - leadThickness / 2, point.getY());
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -265,7 +272,9 @@ public class TransistorTO220 extends AbstractTransistorPackage {
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness));
g2d.setColor(finalPinBorderColor);
line = new Line2D.Double(point.getX(), point.getY(), point.getX(), point.getY() - leadLength);
drawingObserver.startTracking();
g2d.draw(line);
drawingObserver.stopTracking();
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(leadThickness - 2));
g2d.setColor(finalPinColor);
g2d.draw(line);
@@ -294,7 +303,9 @@ public class TransistorTO220 extends AbstractTransistorPackage {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
drawingObserver.startTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
Color finalTabColor;
if (outlineMode) {
finalTabColor = theme.getOutlineColor();
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/TransistorTO3.java
+3
View File
@@ -231,6 +231,7 @@ public class TransistorTO3 extends AbstractLabeledComponent<String> {
if (checkPointsClipped(g2d.getClip())) {
return;
}
drawingObserver.stopTracking();
int pinSize = (int) PIN_DIAMETER.convertToPixels() / 2 * 2;
Theme theme = (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
@@ -251,7 +252,9 @@ public class TransistorTO3 extends AbstractLabeledComponent<String> {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
drawingObserver.startTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
diylc/diylc-library/src/main/java/org/diylc/components/semiconductors/TransistorTO92.java
+3
View File
@@ -187,6 +187,7 @@ public class TransistorTO92 extends AbstractTransistorPackage {
if (checkPointsClipped(g2d.getClip())) {
return;
}
drawingObserver.stopTracking();
int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1f));
@@ -206,7 +207,9 @@ public class TransistorTO92 extends AbstractTransistorPackage {
g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
}
g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : bodyColor);
drawingObserver.startTracking();
g2d.fill(mainArea);
drawingObserver.stopTracking();
g2d.setComposite(oldComposite);
Color finalBorderColor;
if (outlineMode) {
diylc/diylc-swing/src/main/java/org/diylc/swing/ActionFactory.java
+5
View File
@@ -21,6 +21,7 @@ import java.awt.datatransfer.Clipboard;
import java.awt.datatransfer.ClipboardOwner;
import javax.swing.Icon;
import org.apache.log4j.Logger;
import org.diylc.swing.actions.analyze.AiAnalyzeAction;
import org.diylc.swing.actions.analyze.HighlightConnectedAreasAction;
import org.diylc.swingframework.IDrawingProvider;
@@ -275,6 +276,10 @@ public class ActionFactory {
return new GenerateNetlistAction(plugInPort, swingUI, includeSwitches);
}
public AiAnalyzeAction createAiAnalyzeAction(IPlugInPort plugInPort, ISwingUI swingUI) {
return new AiAnalyzeAction(plugInPort, swingUI);
}
public SummarizeNetlistAction createSummarizeNetlistAction(IPlugInPort plugInPort,
ISwingUI swingUI, INetlistAnalyzer summarizer, boolean includeSwitches) {
return new SummarizeNetlistAction(plugInPort, swingUI, summarizer, includeSwitches);
diylc/diylc-swing/src/main/java/org/diylc/swing/actions/analyze/AiAnalyzeAction.java
+59
View File
@@ -0,0 +1,59 @@
package org.diylc.swing.actions.analyze;
import org.diylc.common.INetlistAnalyzer;
import org.diylc.common.IPlugInPort;
import org.diylc.common.ITask;
import org.diylc.netlist.Netlist;
import org.diylc.netlist.Summary;
import org.diylc.swing.ISwingUI;
import org.diylc.swingframework.TextDialog;
import org.diylc.utils.IconLoader;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.List;
public class AiAnalyzeAction extends AbstractAction {
private static final long serialVersionUID = 1L;
private IPlugInPort plugInPort;
private ISwingUI swingUI;
public AiAnalyzeAction(IPlugInPort plugInPort, ISwingUI swingUI) {
super();
this.plugInPort = plugInPort;
this.swingUI = swingUI;
putValue(AbstractAction.NAME, "AI Circuit Analyzer");
putValue(AbstractAction.SMALL_ICON, IconLoader.Brain.getIcon());
}
@Override
public void actionPerformed(ActionEvent e) {
swingUI.executeBackgroundTask(new ITask<String>() {
@Override
public String doInBackground() throws Exception {
return plugInPort.getChatbotService().analyzeCircuit();
}
@Override
public void failed(Exception e) {
swingUI.showMessage(e.getMessage(), "AI Circuit Analyzer", ISwingUI.ERROR_MESSAGE);
}
@Override
public void complete(String res) {
if (res == null || res.isEmpty()) {
swingUI.showMessage("The generated analysis is empty, nothing to show.",
"AI Circuit Analyzer", ISwingUI.INFORMATION_MESSAGE);
return;
}
new TextDialog(swingUI.getOwnerFrame().getRootPane(), res, "AI Circuit Analyzer",
new Dimension(800, 600)).setVisible(true);
}
}, true);
}
}
diylc/diylc-swing/src/main/java/org/diylc/swing/plugins/analyze/AnalyzeMenuPlugin.java
+1
View File
@@ -66,6 +66,7 @@ public class AnalyzeMenuPlugin implements IPlugIn {
List<Action> menuActions = new ArrayList<>();
// Add all menu actions to the list
menuActions.add(actionFactory.createAiAnalyzeAction(plugInPort, swingUI));
menuActions.add(actionFactory.createCheckProximityAction(plugInPort, swingUI));
menuActions.add(actionFactory.createBomAction(plugInPort));
menuActions.add(actionFactory.createGenerateNetlistAction(plugInPort, swingUI, false));
diylc/diylc-swing/src/main/java/org/diylc/utils/IconLoader.java
+1 -1
View File
@@ -72,7 +72,7 @@ public enum IconLoader {
ComponentLarge("component_large.png"), ImportNetlist("import_netlist.png"), SplashIC("splash_ic.png"),
ComponentPreferences("component_preferences.png"), ComponentReplace("component_replace.png"), Barcode("barcode.png"),
DocumentGerber("document_gerber.png"), DocumentX2("document_x2.png"), Export("export.png"), Multimeter("multimeter.png"),
Patreon("patreon.png");
Patreon("patreon.png"), Brain("brain.png");
protected String name;
diylc/diylc-swing/src/main/resources/diylc-swing-images/brain.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 802 B

knowledge/building.sql
+44
View File
@@ -0,0 +1,44 @@
DELETE FROM diylc_knowledge_base WHERE section = 'Circuit Building Tips - Component placement';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('Building', 'Circuit Building Tips - Component placement','
When designing a circuit layout, it''s a good practice to align the component placement with the signal path—typically from left to right, though the reverse can also work depending on the context. One key consideration is to keep AC power sources as far away from the signal path as possible to minimize noise and interference. A common strategy is to position the power supply on the opposite side of the board from the input and ensure that the DC supply flows in the opposite direction of the signal.
Components are often arranged perpendicular to the signal path. This orientation can help make efficient use of space while maintaining a clear flow of the circuit.
When working with integrated circuits—like in a Tubescreamer-style overdrive pedal—the same principles apply, although it can be a bit more challenging. A useful approach is to place the IC at the center of the layout and arrange surrounding components in a “bug-like” formation, radiating outward. This helps maintain logical signal flow and simplifies connections, especially in point-to-point builds.');
DELETE FROM diylc_knowledge_base WHERE section = 'Circuit Building Tips - Grounding scheme';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('Building', 'Circuit Building Tips - Grounding scheme','
For both amplifiers and effects, a variation of the bus grounding scheme is often effective. The input jack should be grounded either through direct contact with the chassis or via a short ground lead to minimize noise at the entry point.
It''s a good idea to ground all stages of the amplifier in close proximity to each other, along with their corresponding filter capacitors. This approach resembles star grounding and helps reduce ground loops and hum.
When grounding control pots, it''s best to connect them to the bus near the stage they belong to. Keeping grounds local to each stage helps maintain a clean, stable ground reference throughout the circuit.');
DELETE FROM diylc_knowledge_base WHERE section = 'Circuit Building Tips - Lead dress';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('Building', 'Circuit Building Tips - Lead dress','
Lead routing plays a critical role in minimizing noise. Keep the following guidelines in mind:
- Shorter is better: Keep leads as short as practical to reduce the chance of picking up interference.
- Separate AC and signal paths: Maintain as much distance as possible between leads carrying AC power and those carrying audio signals.
- Use orthogonal crossings: If AC and signal leads must cross, do so at right angles to minimize crosstalk.
- Respect signal levels: Avoid routing high-level signal leads close to low-level signal paths. If necessary, use shielded wire or route the leads orthogonally to each other.
Balancing these principles often involves compromise, but following them as closely as possible leads to cleaner, quieter builds.
');
DELETE FROM diylc_knowledge_base WHERE section = 'Circuit Building Tips - Shielded wire';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('Building', 'Circuit Building Tips - Shielded wire','
Shielded wire can help eliminate noise and oscillations, especially in sensitive parts of a circuit. It’s most useful at the input, where low-level signals are especially vulnerable to interference. Since any noise picked up there will be amplified downstream, keeping this path clean is essential.
Generally, only one end of the shield should be grounded to avoid ground loops. However, in some cases—such as connecting a gain pot—it may be practical to ground both ends and use the shield as the ground conductor.
While shielded wire improves noise resistance, it’s harder to work with than standard wire. Teflon-coated shielded wire is a strong choice due to its durability and resistance to melting during soldering, though it''s less flexible than PVC-insulated wire.
Use shielded wire where it matters most, and route it thoughtfully—keeping input and output paths orthogonal and avoiding tight clusters with unrelated leads. This helps reduce crosstalk and keeps the layout clean and quiet.
');
DELETE FROM diylc_knowledge_base WHERE section = 'Circuit Building Tips - Twisted wire pair';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('Building', 'Circuit Building Tips - Twisted wire pair','
Twisting wire pairs is a simple and effective technique for reducing noise in AC-carrying leads—such as tube heater lines or high-voltage secondaries. By twisting the wires tightly, electromagnetic radiation from one lead cancels out that of the other, helping to minimize interference.
To create a clean and consistent twist, place both wires in the chuck of a hand drill and twist slowly while holding the other end about 5 inches apart. This method produces uniform results in seconds and is far more effective than twisting by hand.
For best results, twists should be tight, uniform, and run parallel to the target route. Zip wire (parallel conductor cable) is also effective for AC lines, as it naturally maintains close and consistent spacing, which also aids in noise rejection.
As a general rule, keep AC leads well separated from sensitive signal paths and ensure good grounding practices—such as grounding central tube socket pins to a chassis lug—to further reduce noise and hum.');
DELETE FROM diylc_knowledge_base WHERE section = 'Circuit Building Tips - Shielding with Components and Materials';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('Building', 'Circuit Building Tips - Shielding with Components and Materials', '
Effective shielding isn’t limited to wires—many components can serve as physical barriers to block noise. For example, transformers can act as shields when placed between noisy elements (like rectifier diodes) and sensitive circuitry. Grounding the transformer’s metal housing enhances this shielding effect.
Large electrolytic capacitors also serve a dual purpose. Since one terminal is grounded, they can be positioned between noise sources and signal paths to absorb interference.
Sheet metal, such as aluminum L-profiles, can be used to mount and simultaneously shield power transformers or tubes from other parts of the circuit. Even tube sockets may contribute—some include a central metal sleeve that can be grounded to help reduce pin-to-pin interference.
Pots also offer shielding when their bodies make contact with a grounded chassis. If using a painted enclosure, ensure bare metal contact by stripping paint around pot holes. Alternatively, grounding a bus wire across the pot backs works too—but avoid mixing both methods to prevent ground loops.
Strategic placement and grounding of these components can significantly reduce noise and improve circuit performance.');
knowledge/user_manual.sql
+8
View File
@@ -288,3 +288,11 @@ There are several ways to create a new component:
- for more complex components that require custom appearance and behavior, you can create a new component from scratch using the Component API, as described in the [Component API](https://github.com/bancika/diy-layout-creator/blob/wiki/ComponentAPI.md) documentation
- you can file a component request on the [DIYLC GitHub repository](https://github.com/bancika/diy-layout-creator/issues) and I will implement it if I think it would be useful for other users without guaranteeing if and when it will be implemented
- you can reach out to me at [bancika@gmail.com](mailto:bancika@gmail.com) to sponsor a custom component for your project and expedite its development');
DELETE FROM diylc_knowledge_base WHERE section = 'User Manual - Panning/Moving the Screen/Canvas';
INSERT INTO diylc_knowledge_base(category, section, content) VALUES ('User Manual', 'Panning/Moving the Screen/Canvas','
There are several ways you can pan the screen/canvas and move around:
- horizontal and vertical scroll bars
- touch pad (if available)
- mouse scroll button (if available) - hold ctrl for horizontal scrolling
- click on the tiny "Auto-scroll" button in the bottom-right corner of the canvas to open a miniature version of the canvas and quickly jump to any part of it');