From ac84ef2e6987fd9f1da65bd5fedb6d0fac92e4ff Mon Sep 17 00:00:00 2001 From: hneemann Date: Tue, 2 May 2017 19:38:49 +0200 Subject: [PATCH] some typos --- distribution/ReleaseNotes.txt | 5 +- .../digital/draw/elements/Circuit.java | 4 +- .../java/de/neemann/digital/gui/Main.java | 8 +-- .../components/testing/TestDataEditor.java | 2 +- src/main/resources/lang/lang_de.xml | 4 +- src/main/resources/lang/lang_en.xml | 50 +++++++++---------- src/test/resources/docu/static_en.xml | 6 +-- 7 files changed, 40 insertions(+), 39 deletions(-) diff --git a/distribution/ReleaseNotes.txt b/distribution/ReleaseNotes.txt index f9cdd86e6..4545edd7a 100644 --- a/distribution/ReleaseNotes.txt +++ b/distribution/ReleaseNotes.txt @@ -1,9 +1,10 @@ Release Notes -planed as v0.12 -- added the possibility to open a circuit from the command line +v0.11.1, released on 02. May 2017 +- Added the possibility to open a circuit from the command line. - The backspace key works like the delete key. - Avoid extreme long lines in the error message dialog. +- Some minor bug fixes. v0.11, released on 20. Apr 2017 - Added floating gate FETs. diff --git a/src/main/java/de/neemann/digital/draw/elements/Circuit.java b/src/main/java/de/neemann/digital/draw/elements/Circuit.java index 861093e01..a8989bf5b 100644 --- a/src/main/java/de/neemann/digital/draw/elements/Circuit.java +++ b/src/main/java/de/neemann/digital/draw/elements/Circuit.java @@ -606,11 +606,11 @@ public void actualToDefault() { } /** - * All fuses (diodes) are set to unprogramed so that they are working again. + * All fuses (diodes) are restored to "not programed" so that they are working again. * * @param library library to determine which elements are programmable */ - public void unprogramAllFuses(ElementLibrary library) { + public void restoreAllFuses(ElementLibrary library) { for (VisualElement ve : visualElements) if (library.isProgrammable(ve.getElementName())) { ve.getElementAttributes().set(Keys.BLOWN, false); diff --git a/src/main/java/de/neemann/digital/gui/Main.java b/src/main/java/de/neemann/digital/gui/Main.java index 8882f3c75..1d6d89b66 100644 --- a/src/main/java/de/neemann/digital/gui/Main.java +++ b/src/main/java/de/neemann/digital/gui/Main.java @@ -519,13 +519,13 @@ public void actionPerformed(ActionEvent e) { } }.setToolTip(Lang.get("menu_actualToDefault_tt")); - ToolTipAction unprogramAllFuses = new ToolTipAction(Lang.get("menu_unprogramAllFuses")) { + ToolTipAction restoreAllFuses = new ToolTipAction(Lang.get("menu_restoreAllFuses")) { @Override public void actionPerformed(ActionEvent e) { - circuitComponent.getCircuit().unprogramAllFuses(library); + circuitComponent.getCircuit().restoreAllFuses(library); stoppedState.enter(); } - }.setToolTip(Lang.get("menu_unprogramAllFuses_tt")); + }.setToolTip(Lang.get("menu_restoreAllFuses_tt")); ToolTipAction insertAsNew = new ToolTipAction(Lang.get("menu_insertAsNew")) { @Override @@ -560,7 +560,7 @@ public void actionPerformed(ActionEvent actionEvent) { edit.add(editAttributes.createJMenuItem()); edit.add(actualToDefault.createJMenuItem()); - edit.add(unprogramAllFuses.createJMenuItem()); + edit.add(restoreAllFuses.createJMenuItem()); edit.addSeparator(); edit.add(orderInputs.createJMenuItem()); edit.add(orderOutputs.createJMenuItem()); diff --git a/src/main/java/de/neemann/digital/gui/components/testing/TestDataEditor.java b/src/main/java/de/neemann/digital/gui/components/testing/TestDataEditor.java index eb62b8f54..d9c3f86d7 100644 --- a/src/main/java/de/neemann/digital/gui/components/testing/TestDataEditor.java +++ b/src/main/java/de/neemann/digital/gui/components/testing/TestDataEditor.java @@ -53,7 +53,7 @@ public void actionPerformed(ActionEvent e) { getAttributeDialog().fireOk(); TestDataDialog dialog = new TestDataDialog(getAttributeDialog().getDialogParent(), data, key, elementAttributes); Main main = getAttributeDialog().getMain(); - if (main!=null) + if (main != null) main.getWindowPosManager().register("testdata", dialog); dialog.setVisible(true); } diff --git a/src/main/resources/lang/lang_de.xml b/src/main/resources/lang/lang_de.xml index f750e670d..0eb5e2ed4 100644 --- a/src/main/resources/lang/lang_de.xml +++ b/src/main/resources/lang/lang_de.xml @@ -723,8 +723,8 @@ Sind evtl. die Namen der Variablen nicht eindeutig? Führt alle Tests in der Schaltung aus! Eingänge übernehmen Aktuelle Eingangswerte als neue Vorgabewerte übernehmen. - Alle Dioden/FGFETS zurücksetzen - Setzt alle Dioden (Fuses) bzw. FGFETs in den unprogrammierten Zustand zurück. Die Konfiguration geht dabei verloren! + Alle Dioden/FGFETS zurücksetzen + Setzt alle Dioden (Fuses) bzw. FGFETs in den unprogrammierten Zustand zurück. Die Konfiguration geht dabei verloren! Diode programmieren Hilfe Zeigt eine Dokumentation der vorhandenen Elemente. diff --git a/src/main/resources/lang/lang_en.xml b/src/main/resources/lang/lang_en.xml index 4c071be96..3398bffd5 100644 --- a/src/main/resources/lang/lang_en.xml +++ b/src/main/resources/lang/lang_en.xml @@ -27,7 +27,7 @@ Reload last hex file Save Create - Create a circuit in a seperate window + Create a circuit in a separate window Edit detached Opens the dialog as a non modal dialog Browser @@ -47,7 +47,7 @@ Outputs Attributes Add - A component for simple add caluclations. Adds the two integer values from input a and input b (a+b). The result will be incremented by one if the carry input is set. + A component for simple add calculations. Adds the two integer values from input a and input b (a+b). The result will be incremented by one if the carry input is set. First input to add. Second input to add. Carry input, if set the result is incremented by one. @@ -182,7 +182,7 @@ This pin selects the input which value is to output. A component which uses the value of the sel pin to decide which input value is set to the output. NAnd - A combiation of AND and NOT. Returns 0 only if all inputs are set to 1. If on of the inputs is set to 0 the output is set to 1. + A combination of AND and NOT. Returns 0 only if all inputs are set to 1. If on of the inputs is set to 0 the output is set to 1. NOr A combination of OR and NOT. Returns a 0 if one of the inputs is set to 1. If all inputs are set to 0 the output is also set to 1. Not @@ -232,7 +232,7 @@ Graphic RAM Used to show a bitmap graphic. This element works similar to a RAM. In addition it - shows its content on a grahic screen. Every pixel is represented by a memory address. There are to screens supported + shows its content on a graphic screen. Every pixel is represented by a memory address. There are to screens supported to implement screen switching (See input B). The address to read and write. If this input is high when the clock becomes high, the the data is stored. @@ -286,20 +286,20 @@ The output bits {0}. The output bit {0}. Sub - A component for simple substractions. Substracts binary numbers on input a and input b (a-b). If the carry input is set to 1 the result is decremented by 1. + A component for simple subtractions. Subtracts binary numbers on input a and input b (a-b). If the carry input is set to 1 the result is decremented by 1. Carry input, if set the result is decremented by one. - Input a for substraction. - Input b for substraction. - Output returns the result of the substraction. - Output returns 1 if an overflow occured. + Input a for subtraction. + Input b for subtraction. + Output returns the result of the subtraction. + Output returns 1 if an overflow occurred. T-FlipFlop T A component with one input. Toggles the state of the output on a rising edge at the input. - Clock. A rising edgt toggles the output. + Clock. A rising edge toggles the output. Returns the stored value. Returns the negated stored value. Terminal - Clock. A risig edge writes the value at the input to the terminal window. + Clock. A rising edge writes the value at the input to the terminal window. The data to write to the terminal You can write ASCII characters to this terminal. The terminal opens its own window to visualize the output. @@ -452,14 +452,14 @@ allowed are {1} variables but {2} are found. Value {0} in line {1} is not a number! Expected {0} but found {1} values in line {2}! Unexpected token ({0}) in line {1}. - Varianble {0} not found! + Variable {0} not found! No input signals defined in test vector! No output signals defined in test vector! Not test data found. Error during execution of a remote command It's not allowed to connect a pull up and a pull down resistor to a single wire. Could not open the browser. - The splitter does not support high z inputs! Use a pull up or pull down resisitor. + The splitter does not support high z inputs! Use a pull up or pull down resistor. A splitter which allows high z inputs can only have one input! Could not create folder "{0}"! It is not allowed to connect only inputs to a switch. @@ -488,7 +488,7 @@ The names of the variables may not be unique. Color The Color of the element. Timeout cycles - If this ammount of cycles is reached without a break signal, an error is created. + If this amount of cycles is reached without a break signal, an error is created. Data The values stored in this element. Default @@ -496,7 +496,7 @@ The names of the variables may not be unique. Description A short description of this element and its usage. Frequency/Hz - The realtime frequency used for the real time clock + The real time frequency used for the real time clock Use IEEE 91-1984 shapes Use IEEE 91-1984 shapes instead of rectangular shapes Input Splitting @@ -508,9 +508,9 @@ The names of the variables may not be unique. Size The size of the component in the circuit. Language - Netname + Net name All nets with identical name are connected together. - Otput Splitting + Output splitting Example "4,2,2" or "[Bits]*[Count] like "1*16" for 16 single bits. Number of Selector Bits Number of bits used for the selector input. @@ -543,16 +543,16 @@ The names of the variables may not be unique. Start real time clock If enabled the runtime clock is started when the circuit is started Show measurement graph - Show measurement graph in single gatem step mode + Show measurement graph in single gate step mode Show measurement values Show list file if available Lines The number of lines to show. Characters per line The number of characters shown in a single line. - Use as measurment value + Use as measurement value Is set the value is a measurement value and appears in the graph and data table. - Testdata + Test data The description of the test case. Details of the syntax can be found in the help dialog of the test data editor. Width in pixels The screen width in pixels. @@ -573,7 +573,7 @@ The names of the variables may not be unique. With this option you can stabilize the display by keeping the LEDs on until the common cathode goes down again. This simulates a frequency above the critical flicker fusion frequency. ATF1502 Fitter - Path to the fitter for the ATF1502. Enter the full path to the file fit1502.exe provided bei ATMEL. + Path to the fitter for the ATF1502. Enter the full path to the file fit1502.exe provided by ATMEL. Pin number An empty field means this signal is not assigned to a pin. Rows @@ -605,7 +605,7 @@ The names of the variables may not be unique. Simulation Settings Settings used to start the simulation Settings - Edits Digitals Preferences + Edits Digitals preferences Stop Simulation Stops the simulation and allows to edits the circuit. Components @@ -715,8 +715,8 @@ The names of the variables may not be unique. Runs all test cases in the circuit Set Inputs Use actual input values as new default values. - Reset all diodes and FGFETs - Resets all diodes (fuses) and FGFETs to the unprogramed state. The actual fuse configuration is lost! + Reset all diodes and FGFETs + Resets all diodes (fuses) and FGFETs to the "not programed" state. The actual fuse configuration is lost! Program diode Components Shows a list of all available components. @@ -740,7 +740,7 @@ The icons are taken from the Tango Desktop Project. Error calculating a step Error creating the circuit Error during simplification - Error editing a atribute value + Error editing a attribute value Error importing the circuit {0}! Error updating the component library!! Error reading a file diff --git a/src/test/resources/docu/static_en.xml b/src/test/resources/docu/static_en.xml index b47b429b1..dbdf13394 100644 --- a/src/test/resources/docu/static_en.xml +++ b/src/test/resources/docu/static_en.xml @@ -95,7 +95,7 @@ devices are supported. - In addition to purely combinatorial circuits, it is also possible to analyze or generate sequential cicuits. + In addition to purely combinatorial circuits, it is also possible to analyze or generate sequential circuits. Instead of a simple truth table a so-called state transition table is created. Each flip-flop thereby appears on the input side and the output side of the state transition table. In this table, on the right-hand side, you can find the next state, which will @@ -150,7 +150,7 @@ website. From the WinCupl installation, only the file fit1502.exe is needed and this file can be stored in any folder. - On Linux systesm, fit1502.exe can also be executed by Digital if wine is installed. + On Linux systems, fit1502.exe can also be executed by Digital if wine is installed. @@ -223,7 +223,7 @@ I have created a JEDEC file. How to program it to a GAL16v8 or GAL22v10? - To programm such a chip a special programmer hardware is necessary. + To program such a chip a special programmer hardware is necessary. \ No newline at end of file