Plaster over clock rate setting bug...

...when hardware provides a clock but user selects internal computer clcok as time source.
JMRI · Apr 19, 2019 · e15dac8 · e15dac8
1 parent b39ba52
commit e15dac8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/java/src/jmri/jmrit/simpleclock/SimpleClockBundle.properties b/java/src/jmri/jmrit/simpleclock/SimpleClockBundle.properties
@@ -65,6 +65,7 @@ MinutesError = Error in Fast Time minutes entry:
 MinutesRangeError = Minutes entry not within allowed 0 - 59 range.
 NegativeRateError = Error in entry - Rate cannot be negative.
 NonIntegerError = Error in entry - Your hardware clock requires an integer rate.
+NonIntegerErrorCantChangeSource = Your hardware clock requires an integer rate. Cannot change time source to hardware clock with non-integer rate.
 
 #Reminder1 = Please remember to save your changes to disk.
 #Reminder2 = ( Select 'Store panels...' in the Panels menu. )

diff --git a/java/src/jmri/jmrit/simpleclock/SimpleClockBundle_de.properties b/java/src/jmri/jmrit/simpleclock/SimpleClockBundle_de.properties
@@ -53,7 +53,8 @@ HoursRangeError = Stundeneingabe nicht im erlaubten Bereich 0 - 23.
 MinutesError = Fehler bei der Eingabe der Minuten der Startzeit:
 MinutesRangeError = Minuteneingabe nicht im erlaubten Bereich 0 - 59.
 NegativeRateError = Fehler im Wertebereich - Wert darf nicht negativ sein.
-NonIntegerError = Fehler im Wertebereich - Systemuhr ben\u00f6tigt einen Integerwert.
+NonIntegerError = Fehler im Wertebereich - Systemuhr ben\u00f6tigt einen ganzzahligen Zeitfaktor.
+NonIntegerErrorCantChangeSource = Systemuhr ben\u00f6tigt einen ganzzahligen Zeitfaktor. Kann Zeitquelle nicht auf Systemuhr umstellen, solange Zeitfaktor nicht ganzzahlig ist.
 
 #Reminder1 = Nicht vergessen, die \u00c4nderungen zu speichern.
 #Reminder2 = ( W\u00e4hle "Speichere Gleisstellbild" im Menu "Panels")

diff --git a/java/src/jmri/jmrit/simpleclock/SimpleClockFrame.java b/java/src/jmri/jmrit/simpleclock/SimpleClockFrame.java
@@ -514,7 +514,7 @@ void updateRunningButton() {
                     Bundle.getMessage("ErrorTitle"), JOptionPane.ERROR_MESSAGE);
             return null;
         }
-        if (InstanceManager.getDefault(jmri.ClockControl.class).requiresIntegerRate()) {
+        if (InstanceManager.getDefault(jmri.ClockControl.class).requiresIntegerRate() && !clock.getInternalMaster()) {
             double frac = rate - (int) rate;
             if (frac > 0.001) {
                 JOptionPane.showMessageDialog(this, Bundle.getMessage("NonIntegerError"),
@@ -546,6 +546,8 @@ public void setRateButtonActionPerformed() {
 
     /**
      * Handle time source change
+     *
+     * Only changes the time source if the rate is OK (typically: Integer) for new source
      */
     private void setTimeSourceChanged() {
         int index = timeSourceBox.getSelectedIndex();
@@ -561,6 +563,17 @@ private void setTimeSourceChanged() {
         if (index == internalSourceIndex) {
             clock.setInternalMaster(true, true);
         } else {
+	    // only change if new source is okay with current rate
+	    if (InstanceManager.getDefault(jmri.ClockControl.class).requiresIntegerRate()) {
+		double rate = clock.userGetRate();
+		double frac = rate - (int) rate;
+		if (frac > 0.001) {
+		    JOptionPane.showMessageDialog(this, Bundle.getMessage("NonIntegerErrorCantChangeSource"),
+		            Bundle.getMessage("ErrorTitle"), JOptionPane.ERROR_MESSAGE);
+		    timeSourceBox.setSelectedIndex(internalSourceIndex);
+		    return;
+		}
+            }
             clock.setInternalMaster(false, true);
         }
         changed = true;

diff --git a/java/src/jmri/jmrit/simpleclock/SimpleTimebase.java b/java/src/jmri/jmrit/simpleclock/SimpleTimebase.java
@@ -288,7 +288,11 @@ public void setInternalMaster(boolean master, boolean update) {
             }
         }
     }
-
+    /**
+     * Get internalMaster field
+     *
+     * @returns true if fast clock time is derived from internal computer clock, false if derived from hardware clock
+     */
     @Override
     public boolean getInternalMaster() {
         return internalMaster;