From 2e7ca34754c4b392da2591e5958002166d6dc32b Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 11 Dec 2017 21:43:25 +0100
Subject: [PATCH] better warning message if a pin label is missing during
 analysis

---
 src/main/java/de/neemann/digital/core/Model.java | 3 ++-
 src/main/java/de/neemann/digital/gui/Main.java   | 4 ++--
 src/main/resources/lang/lang_de.xml              | 5 +++--
 src/main/resources/lang/lang_en.xml              | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/neemann/digital/core/Model.java b/src/main/java/de/neemann/digital/core/Model.java
index 6ec0dc49a..10975bd80 100644
--- a/src/main/java/de/neemann/digital/core/Model.java
+++ b/src/main/java/de/neemann/digital/core/Model.java
@@ -530,7 +530,8 @@ public class Model implements Iterable<Node> {
         if (signal.isValid()) {
             signals.add(signal);
             outputs.add(signal);
-        }
+        } else
+            isInvalidSignal = true;
     }
 
     /**
diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java
index 58f630667..ce3d0abd1 100644
--- a/src/main/java/de/neemann/digital/gui/Main.java
+++ b/src/main/java/de/neemann/digital/gui/Main.java
@@ -998,7 +998,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
                             .setVisible(true);
                     ensureModelIsStopped();
                 } catch (PinException | NodeException | AnalyseException | ElementNotFoundException | BacktrackException | RuntimeException e1) {
-                    showErrorAndStopModel(Lang.get("msg_analyseErr"), e1);
+                    new ErrorMessage(Lang.get("msg_analyseErr")).addCause(e1).show(Main.this);
                 }
             }
         }
@@ -1042,7 +1042,7 @@ public final class Main extends JFrame implements ClosingWindowListener.ConfirmS
                 circuitComponent.modify(new ModifyMeasurementOrdering(names));
             }
         } catch (NodeException | PinException | ElementNotFoundException | RuntimeException e) {
-            showErrorAndStopModel(Lang.get("msg_errorCreatingModel"), e);
+            new ErrorMessage(Lang.get("msg_errorCreatingModel")).addCause(e).show(Main.this);
         }
     }
 
diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml
index 020e6a51b..6dd4ec882 100644
--- a/src/main/resources/lang/lang_de.xml
+++ b/src/main/resources/lang/lang_de.xml
@@ -1234,8 +1234,9 @@ eine &lt;a href=&quot;https://github.com/hneemann/Digital/issues/new?labels=enha
     <string name="msg_errInFile_N">Aufgetreten in Datei {0}.</string>
     <string name="msg_affectedComponentsAre_N">Betroffen sind: {0}.</string>
     <string name="msg_signal_N">Leitung {0}</string>
-    <string name="msg_invalidSignalsAnalysed">Wenn Eingänge keinen Namen haben, werden diese nicht
-        als Variablen in die Analyse einbezogen, sondern wie Konstanten behandelt!</string>
+    <string name="msg_invalidSignalsAnalysed">Wenn Eingänge keine Bezeichnung haben, werden diese nicht
+        als Variablen in die Analyse einbezogen, sondern wie Konstanten behandelt!
+        Ausgänge, die keine Bezeichnung haben, werden ignoriert.</string>
     <string name="msg_thereAreMissingPinNumbers">Für die Pins {0} wurden keine Pinnummern festgelegt!</string>
     <string name="msg_modelHasErrors">Es kann nur eine fehlerfreie Schaltung exportiert werden!</string>
     <string name="msg_noKVMapAvailable">Keine KV-Tafel verfügbar!</string>
diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml
index 036cc3692..058d60b81 100644
--- a/src/main/resources/lang/lang_en.xml
+++ b/src/main/resources/lang/lang_en.xml
@@ -1219,8 +1219,10 @@ an &lt;a href=&quot;https://github.com/hneemann/Digital/issues/new?labels=enhanc
     <string name="msg_errInFile_N">Occurred in file {0}.</string>
     <string name="msg_affectedComponentsAre_N">Affected are: {0}.</string>
     <string name="msg_signal_N">Signal {0}</string>
-    <string name="msg_invalidSignalsAnalysed">If inputs have no name set, they are not included
-        as variables in the analysis, but treated as constants!</string>
+    <string name="msg_invalidSignalsAnalysed">If inputs have no label set, they are not included
+        as variables in the analysis, but treated as constants!
+        Outputs without a label are ignored.
+    </string>
     <string name="msg_thereAreMissingPinNumbers">No pin numbers assigned to the pins {0}!</string>
     <string name="msg_modelHasErrors">You can only export a circuit without errors!</string>
     <string name="msg_noKVMapAvailable">No KV map available!</string>