From 2786acc39f2ea7dfbd158e744692ea14b17e750d Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Wed, 30 Mar 2016 18:29:39 +0200
Subject: [PATCH] modified break shape

---
 src/main/dig/processor/Control.dig            |  4 +++
 src/main/dig/processor/Processor.dig          | 33 ++++++++++---------
 .../digital/draw/shapes/BreakShape.java       |  2 +-
 src/main/resources/lang/lang_de.properties    |  3 ++
 src/main/resources/lang/lang_en.properties    |  3 ++
 5 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/main/dig/processor/Control.dig b/src/main/dig/processor/Control.dig
index f2930cccf..c711b7c5c 100644
--- a/src/main/dig/processor/Control.dig
+++ b/src/main/dig/processor/Control.dig
@@ -337,6 +337,10 @@
     <visualElement>
       <elementName>Break</elementName>
       <elementAttributes>
+        <entry>
+          <string>Cycles</string>
+          <int>1000000</int>
+        </entry>
         <entry>
           <string>Label</string>
           <string>Break</string>
diff --git a/src/main/dig/processor/Processor.dig b/src/main/dig/processor/Processor.dig
index 20d5e3901..addc1406e 100644
--- a/src/main/dig/processor/Processor.dig
+++ b/src/main/dig/processor/Processor.dig
@@ -169,16 +169,17 @@
         <entry>
           <string>Data</string>
           <data>
-            <size>65536</size>
-            <long>5130</long>
+            <size>46</size>
+            <long>5380</long>
             <long>8417</long>
             <long>19680</long>
             <long>8417</long>
             <long>5367</long>
             <long>19695</long>
-            <long>28162</long>
+            <long>28163</long>
             <long>20992</long>
             <long>31744</long>
+            <long>28662</long>
             <long>8417</long>
             <long>19693</long>
             <long>734</long>
@@ -191,7 +192,7 @@
             <long>8417</long>
             <long>19680</long>
             <long>8417</long>
-            <long>5624</long>
+            <long>5625</long>
             <long>19695</long>
             <long>28657</long>
             <long>65535</long>
@@ -202,7 +203,7 @@
             <long>8417</long>
             <long>19680</long>
             <long>8417</long>
-            <long>32804</long>
+            <long>32805</long>
             <long>4848</long>
             <long>19695</long>
             <long>28645</long>
@@ -220,9 +221,9 @@
         </entry>
         <entry>
           <string>lastDataFile</string>
-          <file>
+          <string>
             /home/hneemann/Dokumente/DHBW/Technische_Informatik_II/Systemnahes_Programmieren/java/assembler3/src/main/asm/fibonacci.hex
-          </file>
+          </string>
         </entry>
       </elementAttributes>
       <pos x="60" y="220"/>
@@ -270,7 +271,7 @@
         </entry>
         <entry>
           <string>Frequency</string>
-          <int>10</int>
+          <int>1000</int>
         </entry>
       </elementAttributes>
       <pos x="560" y="230"/>
@@ -358,7 +359,7 @@
     </wire>
     <wire>
       <p1 x="310" y="360"/>
-      <p2 x="630" y="360"/>
+      <p2 x="640" y="360"/>
     </wire>
     <wire>
       <p1 x="220" y="10"/>
@@ -498,7 +499,7 @@
     </wire>
     <wire>
       <p1 x="560" y="210"/>
-      <p2 x="640" y="210"/>
+      <p2 x="630" y="210"/>
     </wire>
     <wire>
       <p1 x="460" y="30"/>
@@ -537,7 +538,7 @@
       <p2 x="600" y="100"/>
     </wire>
     <wire>
-      <p1 x="640" y="100"/>
+      <p1 x="630" y="100"/>
       <p2 x="650" y="100"/>
     </wire>
     <wire>
@@ -561,7 +562,7 @@
       <p2 x="390" y="110"/>
     </wire>
     <wire>
-      <p1 x="630" y="110"/>
+      <p1 x="640" y="110"/>
       <p2 x="650" y="110"/>
     </wire>
     <wire>
@@ -653,8 +654,8 @@
       <p2 x="320" y="260"/>
     </wire>
     <wire>
-      <p1 x="640" y="100"/>
-      <p2 x="640" y="210"/>
+      <p1 x="630" y="100"/>
+      <p2 x="630" y="210"/>
     </wire>
     <wire>
       <p1 x="200" y="70"/>
@@ -817,8 +818,8 @@
       <p2 x="180" y="180"/>
     </wire>
     <wire>
-      <p1 x="630" y="110"/>
-      <p2 x="630" y="360"/>
+      <p1 x="640" y="110"/>
+      <p2 x="640" y="360"/>
     </wire>
     <wire>
       <p1 x="440" y="80"/>
diff --git a/src/main/java/de/neemann/digital/draw/shapes/BreakShape.java b/src/main/java/de/neemann/digital/draw/shapes/BreakShape.java
index 1ae35e9a3..02ab75a4d 100644
--- a/src/main/java/de/neemann/digital/draw/shapes/BreakShape.java
+++ b/src/main/java/de/neemann/digital/draw/shapes/BreakShape.java
@@ -14,7 +14,7 @@ import de.neemann.digital.draw.graphics.Vector;
  */
 public class BreakShape implements Shape {
     private static final int SIZE = 8;
-    private static final int SIZEQ = 5;
+    private static final int SIZEQ = 3;
     private static final Vector RAD = new Vector(SIZE, SIZE);
     private static final Vector D1 = new Vector(SIZEQ, -SIZEQ);
     private static final Vector D2 = new Vector(SIZEQ, SIZEQ);
diff --git a/src/main/resources/lang/lang_de.properties b/src/main/resources/lang/lang_de.properties
index 513a78dd1..0602419a9 100644
--- a/src/main/resources/lang/lang_de.properties
+++ b/src/main/resources/lang/lang_de.properties
@@ -80,6 +80,9 @@ stat_clocks={0} Halbzyklen
 
 btn_edit=Bearbeiten
 btn_load=Laden
+btn_reload=Neu Laden
+btn_reload_tt=Letzte Datei noch einmal laden
+
 tt_moveItemUp=Eintrag nach oben schieben
 tt_moveItemDown=Eintrag nach unten schieben
 menu_file=Datei
diff --git a/src/main/resources/lang/lang_en.properties b/src/main/resources/lang/lang_en.properties
index f4cb41f9d..2b071eeb0 100644
--- a/src/main/resources/lang/lang_en.properties
+++ b/src/main/resources/lang/lang_en.properties
@@ -81,6 +81,9 @@ stat_clocks={0} half cycles
 
 btn_edit=Edit
 btn_load=Load
+btn_reload=Reload
+btn_reload_tt=Reload last hex file
+
 tt_moveItemUp=Move the item up
 tt_moveItemDown=Move the item down
 menu_file=File