new system to select the shape of a embedded circuit

This commit is contained in:
hneemann 2018-07-29 11:46:52 +02:00
parent 6773c23193
commit 43a31a84af
104 changed files with 287 additions and 250 deletions

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>backgroundColor</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>Description</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -3,8 +3,8 @@
<version>1</version>
<attributes>
<entry>
<string>isDIL</string>
<boolean>true</boolean>
<string>shapeType</string>
<shapeType>DIL</shapeType>
</entry>
<entry>
<string>pinCount</string>

View File

@ -2,6 +2,10 @@
<circuit>
<version>1</version>
<attributes>
<entry>
<string>shapeType</string>
<de.neemann.digital.draw.shapes.CustomCircuitShapeType>CUSTOM</de.neemann.digital.draw.shapes.CustomCircuitShapeType>
</entry>
<entry>
<string>Description</string>
<string>Arithmetic Logical unit.

View File

@ -17,6 +17,7 @@ import de.neemann.digital.draw.graphics.Orientation;
import de.neemann.digital.draw.graphics.Style;
import de.neemann.digital.draw.library.ElementLibrary;
import de.neemann.digital.draw.model.InverterConfig;
import de.neemann.digital.draw.shapes.CustomCircuitShapeType;
import de.neemann.digital.draw.shapes.custom.CustomShapeDescription;
import de.neemann.gui.Screen;
import de.neemann.gui.language.Language;
@ -527,18 +528,12 @@ public final class Keys {
public static final Key<String> PINNUMBER =
new Key<>("pinNumber", "").setSecondary();
/**
* true if shape is a dil shape
*/
public static final Key<Boolean> IS_DIL
= new Key<>("isDIL", false).setSecondary();
/**
* the pin count
*/
public static final Key<Integer> PINCOUNT =
new Key.KeyInteger("pinCount", 0)
.setMin(0)
.setDependsOn(IS_DIL)
.setSecondary();
@ -552,8 +547,7 @@ public final class Keys {
* Background Color of nested circuits
*/
public static final Key<java.awt.Color> BACKGROUND_COLOR
= new Key<>("backgroundColor", new Color(255, 255, 180, 200))
.setDependsOn(IS_DIL, true);
= new Key<>("backgroundColor", new Color(255, 255, 180, 200));
/**
* the screen resolution
@ -647,10 +641,10 @@ public final class Keys {
new Key<>("noComponentToolTips", false);
/**
* Used to show the default shape also if the circuit defines a DIL.
* defines the shape type of the custom circuit
*/
public static final Key<Boolean> USE_DEFAULT_SHAPE
= new Key<Boolean>("useDefShape", false);
public static final Key<CustomCircuitShapeType> SHAPE_TYPE
= new Key.KeyEnum<>("shapeType", CustomCircuitShapeType.DEFAULT, CustomCircuitShapeType.values()).setSecondary();
/**
* Shape used to represent a visual element

View File

@ -24,6 +24,7 @@ import de.neemann.digital.core.wiring.Clock;
import de.neemann.digital.draw.graphics.*;
import de.neemann.digital.draw.graphics.Vector;
import de.neemann.digital.draw.model.InverterConfig;
import de.neemann.digital.draw.shapes.CustomCircuitShapeType;
import de.neemann.digital.draw.shapes.Drawable;
import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.draw.shapes.custom.CustomShapeDescription;
@ -97,6 +98,7 @@ public class Circuit {
xStream.alias("poly", CustomShapeDescription.PolygonHolder.class);
xStream.alias("text", CustomShapeDescription.TextHolder.class);
xStream.alias("polygon", Polygon.class);
xStream.alias("shapeType", CustomCircuitShapeType.class);
xStream.registerConverter(new PolygonConverter());
return xStream;
}

View File

@ -8,7 +8,10 @@ package de.neemann.digital.draw.library;
import de.neemann.digital.core.arithmetic.*;
import de.neemann.digital.core.arithmetic.Comparator;
import de.neemann.digital.core.basic.*;
import de.neemann.digital.core.element.*;
import de.neemann.digital.core.element.ElementAttributes;
import de.neemann.digital.core.element.ElementFactory;
import de.neemann.digital.core.element.ElementTypeDescription;
import de.neemann.digital.core.element.Keys;
import de.neemann.digital.core.extern.External;
import de.neemann.digital.core.flipflops.*;
import de.neemann.digital.core.io.*;
@ -19,12 +22,10 @@ import de.neemann.digital.core.pld.PullDown;
import de.neemann.digital.core.pld.PullUp;
import de.neemann.digital.core.switching.*;
import de.neemann.digital.core.wiring.*;
import de.neemann.digital.core.flipflops.Monoflop;
import de.neemann.digital.draw.elements.Circuit;
import de.neemann.digital.draw.elements.PinException;
import de.neemann.digital.draw.elements.Tunnel;
import de.neemann.digital.draw.shapes.ShapeFactory;
import de.neemann.digital.draw.shapes.custom.CustomShapeDescription;
import de.neemann.digital.gui.Settings;
import de.neemann.digital.gui.components.data.DummyElement;
import de.neemann.digital.gui.components.graphics.GraphicCard;
@ -602,6 +603,7 @@ public class ElementLibrary implements Iterable<ElementLibrary.ElementContainer>
setShortName(file.getName());
addAttribute(Keys.ROTATE);
addAttribute(Keys.LABEL);
addAttribute(Keys.SHAPE_TYPE);
}
/**
@ -645,18 +647,6 @@ public class ElementLibrary implements Iterable<ElementLibrary.ElementContainer>
return super.getDescription(elementAttributes);
}
@Override
public ArrayList<Key> getAttributeList() {
final ArrayList<Key> list = super.getAttributeList();
if (getAttributes().get(Keys.IS_DIL)
|| getAttributes().get(Keys.CUSTOM_SHAPE) != CustomShapeDescription.EMPTY) {
ArrayList<Key> li = new ArrayList<>(list);
li.add(Keys.USE_DEFAULT_SHAPE);
return li;
}
return list;
}
}

View File

@ -0,0 +1,31 @@
/*
* Copyright (c) 2018 Helmut Neemann.
* Use of this source code is governed by the GPL v3 license
* that can be found in the LICENSE file.
*/
package de.neemann.digital.draw.shapes;
/**
* Defines the kind of shape used for a embedded circuit
*/
public enum CustomCircuitShapeType {
/**
* The default shape. inputs at the left, outputs at the right
*/
DEFAULT,
/**
* A DIL shape
*/
DIL,
/**
* Pin positions are dependent on the pin positions in the circuit
*/
LAYOUT,
/**
* Shape is defined in the circuit itself.
*/
CUSTOM
}

View File

@ -170,32 +170,37 @@ public final class ShapeFactory {
if (pt instanceof ElementLibrary.ElementTypeDescriptionCustom) {
// Custom component
ElementLibrary.ElementTypeDescriptionCustom customDescr = (ElementLibrary.ElementTypeDescriptionCustom) pt;
if (!elementAttributes.get(Keys.USE_DEFAULT_SHAPE)) {
final CustomShapeDescription customShapeDescription = customDescr.getAttributes().get(Keys.CUSTOM_SHAPE);
if (customShapeDescription != CustomShapeDescription.EMPTY)
return new CustomShape(customShapeDescription,
pt.getInputDescription(elementAttributes),
pt.getOutputDescriptions(elementAttributes));
else if (customDescr.getAttributes().get(Keys.IS_DIL)) {
CustomCircuitShapeType shapeType = customDescr.getAttributes().get(Keys.SHAPE_TYPE);
final CustomCircuitShapeType localShapeType = elementAttributes.get(Keys.SHAPE_TYPE);
if (!localShapeType.equals(CustomCircuitShapeType.DEFAULT))
shapeType = localShapeType;
switch (shapeType) {
case DIL:
return new DILShape(
pt.getShortName(),
pt.getInputDescription(elementAttributes),
pt.getOutputDescriptions(elementAttributes),
elementAttributes.getLabel(),
customDescr.getAttributes());
}
case CUSTOM:
final CustomShapeDescription customShapeDescription = customDescr.getAttributes().get(Keys.CUSTOM_SHAPE);
if (customShapeDescription != CustomShapeDescription.EMPTY)
return new CustomShape(customShapeDescription,
pt.getInputDescription(elementAttributes),
pt.getOutputDescriptions(elementAttributes));
default:
return new GenericShape(
pt.getShortName(),
pt.getInputDescription(elementAttributes),
pt.getOutputDescriptions(elementAttributes),
elementAttributes.getLabel(),
true,
customDescr.getAttributes().get(Keys.WIDTH))
.setColor(customDescr.getAttributes().get(Keys.BACKGROUND_COLOR));
}
// Neither DIL nor custom shape.
return new GenericShape(
pt.getShortName(),
pt.getInputDescription(elementAttributes),
pt.getOutputDescriptions(elementAttributes),
elementAttributes.getLabel(),
true,
customDescr.getAttributes().get(Keys.WIDTH))
.setColor(customDescr.getAttributes().get(Keys.BACKGROUND_COLOR));
} else {
// Internal component without own shape.
// Internal component without it's own shape.
return new GenericShape(
pt.getShortName(),
pt.getInputDescription(elementAttributes),
@ -207,7 +212,7 @@ public final class ShapeFactory {
}
}
} else {
// Internal component with own shape.
// Internal component with it's own shape.
ElementTypeDescription pt = library.getElementType(elementName);
return cr.create(elementAttributes,
pt.getInputDescription(elementAttributes),
@ -247,7 +252,7 @@ public final class ShapeFactory {
}
@Override
public Shape create(ElementAttributes attributes, PinDescriptions inputs, PinDescriptions outputs) throws NodeException {
public Shape create(ElementAttributes attributes, PinDescriptions inputs, PinDescriptions outputs) {
return new GenericShape(name, inputs, outputs)
.invert(invers)
.setInverterConfig(attributes.get(Keys.INVERTER_CONFIG));

View File

@ -64,11 +64,9 @@ public class CircuitComponent extends JComponent implements Circuit.ChangedListe
static {
ATTR_LIST.add(Keys.WIDTH);
ATTR_LIST.add(Keys.IS_DIL);
ATTR_LIST.add(Keys.SHAPE_TYPE);
ATTR_LIST.add(Keys.PINCOUNT);
ATTR_LIST.add(Keys.BACKGROUND_COLOR);
if (Main.isExperimentalMode())
ATTR_LIST.add(Keys.CUSTOM_SHAPE);
ATTR_LIST.add(Keys.DESCRIPTION);
ATTR_LIST.add(Keys.LOCKED_MODE);
ATTR_LIST.add(Keys.ROMMANAGER);

Some files were not shown because too many files have changed in this diff Show More