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

added distribution assembly

Browse Source
This commit is contained in:
hneemann 2016-04-18 20:44:23 +02:00
parent 57e2a9337d
commit f7a018afd3
5 changed files with 72 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
distAssembly.xml Normal file
View File

@ -0,0 +1,45 @@
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>distribution</id>
<formats>
<format>zip</format>
</formats>
<files>
<file>
<source>${basedir}/target/Digital.jar</source>
<outputDirectory>/</outputDirectory>
</file>
</files>
<fileSets>
<fileSet>
<directory>${basedir}/src/main/dig/combinatorial</directory>
<outputDirectory>/examples/combinatorial/</outputDirectory>
<includes>
<include>*.dig</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/dig/sequential</directory>
<outputDirectory>/examples/sequential/</outputDirectory>
<includes>
<include>*.dig</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/dig/processor</directory>
<outputDirectory>/examples/processor/</outputDirectory>
<includes>
<include>*.dig</include>
</includes>
</fileSet>
<fileSet>
<directory>${basedir}/src/main/dig/hazard</directory>
<outputDirectory>/examples/hazard/</outputDirectory>
<includes>
<include>*.dig</include>
</includes>
</fileSet>
</fileSets>
</assembly>

10
pom.xml
View File

@ -160,6 +160,16 @@
<goal>single</goal>
</goals>
</execution>
<execution>
<id>make-dstribution</id>
<phase>install</phase>
<configuration>
<descriptor>distAssembly.xml</descriptor>
</configuration>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>

6
src/main/dig/processor/Processor.dig
View File

@ -232,6 +232,10 @@
<visualElement>
<elementName>Clock</elementName>
<elementAttributes>
<entry>
<string>runRealTime</string>
<boolean>true</boolean>
</entry>
<entry>
<string>rotation</string>
<rotation rotation="2"/>
@ -242,7 +246,7 @@
</entry>
<entry>
<string>Frequency</string>
<int>50</int>
<int>100</int>
</entry>
</elementAttributes>
<pos x="1060" y="460"/>

14
src/main/java/de/neemann/digital/draw/shapes/TunnelShape.java
View File

@ -21,6 +21,7 @@ public class TunnelShape implements Shape {
private final PinDescription input;
private final String label;
// private ObservableValue inValue;
/**
* Creates a new instance
@ -41,16 +42,23 @@ public class TunnelShape implements Shape {
@Override
public InteractorInterface applyStateMonitor(IOState ioState, Observer guiObserver) {
// inValue = ioState.getInput(0).addObserverToValue(guiObserver);
return null;
}
@Override
public void drawTo(Graphic gr, boolean highLight) {
// if (inValue!=null) {
// Style style = Style.getWireStyle(inValue);
// Vector pos= new Vector(14,0);
// Vector rad = new Vector(3,3);
// gr.drawCircle(pos.sub(rad),pos.add(rad),style);
// }
gr.drawPolygon(new Polygon(true)
.add(0, 0)
.add(SIZE, SIZE2)
.add(SIZE, -SIZE2), Style.NORMAL);
Vector pos = new Vector(SIZE + SIZE2, 0);
.add(SIZE, SIZE2 - 3)
.add(SIZE, -SIZE2 + 3), Style.NORMAL);
Vector pos = new Vector(SIZE + SIZE2 / 2, 0);
gr.drawText(pos, pos.add(1, 0), label, Orientation.LEFTCENTER, Style.SHAPE_PIN);
}
}

1
src/main/resources/lang/lang_en.properties
View File

@ -251,3 +251,4 @@ elem_Decode_pin_sel=This input selects the enabled output
elem_Text_tt=Shows a text in the circuit
key_Default_tt=Is set if the model is started
err_labelNotConnectedToNet_N=A tunnel {0} is not connected!
key_Width_tt=With of symbol if this circuit is used in an element ins an other circuit.