From fffa2cd28c1486499a3e2ca6edbf2d69aeb89f7b Mon Sep 17 00:00:00 2001 From: hneemann Date: Fri, 15 Apr 2016 12:08:18 +0200 Subject: [PATCH] Data dialog scrolls automatically to the right most position. --- .../neemann/digital/gui/components/data/DataSetDialog.java | 5 ++++- src/main/resources/lang/lang_de.properties | 5 +++++ src/main/resources/lang/lang_en.properties | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/neemann/digital/gui/components/data/DataSetDialog.java b/src/main/java/de/neemann/digital/gui/components/data/DataSetDialog.java index fa8dc51c3..23fcc5f52 100644 --- a/src/main/java/de/neemann/digital/gui/components/data/DataSetDialog.java +++ b/src/main/java/de/neemann/digital/gui/components/data/DataSetDialog.java @@ -28,6 +28,7 @@ public class DataSetDialog extends JDialog implements ModelStateObserver { private static final int MAX_SAMPLE_SIZE = 1000; private final ArrayList signals; private final DataSetComponent dsc; + private final JScrollPane scrollPane; private DataSet dataSet; private DataSetObserver dataSetObserver; @@ -57,7 +58,7 @@ public class DataSetDialog extends JDialog implements ModelStateObserver { dataSetObserver = new DataSetObserver(type, dataSet); dsc = new DataSetComponent(dataSet); - JScrollPane scrollPane = new JScrollPane(dsc); + scrollPane = new JScrollPane(dsc); getContentPane().add(scrollPane); addWindowListener(new WindowAdapter() { @@ -117,5 +118,7 @@ public class DataSetDialog extends JDialog implements ModelStateObserver { dataSetObserver.handleEvent(event); dsc.revalidate(); dsc.repaint(); + JScrollBar bar = scrollPane.getHorizontalScrollBar(); + SwingUtilities.invokeLater(() -> bar.setValue(bar.getMaximum())); } } diff --git a/src/main/resources/lang/lang_de.properties b/src/main/resources/lang/lang_de.properties index b1e4c561b..7bde2165b 100644 --- a/src/main/resources/lang/lang_de.properties +++ b/src/main/resources/lang/lang_de.properties @@ -35,6 +35,8 @@ key_valueIsProbe=Als Messwert verwenden key_showListing=Zeige Listing an, wenn verf\u00FCgbar key_showDataTable=Zeige Messwertetabelle key_showDataGraph=Zeige Messwertegraph +key_showDataGraphMicro=Zeige Messwertgraph im Mikroschrittmodus +key_maxStepCount=Maximale Messpunktezahl key_microStep=Zeige Mikroschritte key_isHighZ=Eingang kann hochohmig sein key_runRealTime=Echtzeittakt starten @@ -216,4 +218,7 @@ win_saveChanges=\u00C4nderungen speichern? win_confirmExit=Beenden best\u00E4tigen! win_stateChanged=Die Datei wurde ver\u00E4ndert! win_measures=Messwerte +win_measures_microstep=Messwerte im Miroschrittmodus +win_measures_fullstep=Messwerte im Vollschrittmodus + win_listing=Listing \ No newline at end of file diff --git a/src/main/resources/lang/lang_en.properties b/src/main/resources/lang/lang_en.properties index aec4c2f24..5f6d1f186 100644 --- a/src/main/resources/lang/lang_en.properties +++ b/src/main/resources/lang/lang_en.properties @@ -35,6 +35,8 @@ key_valueIsProbe=Use as measurment value key_showListing=Show list file if available key_showDataTable=Show measurement values key_showDataGraph=Show measurement graph +key_showDataGraphMicro=Show measurement graph in micro step mode +key_maxStepCount=Max number of steps to show key_microStep=Show micro steps key_isHighZ=Is three-state input key_runRealTime=Start real time clock