Changeset 356

Timestamp:

10/05/2011 03:31:57 AM (20 months ago)

Author:

dschultzca

Message:

Moved COM port Auto Refresh to Settings menu to free up more control bar space.

Location:

trunk

Files:

• release_notes.txt (modified) (1 diff)
• src/com/romraider/logger/ecu/EcuLogger.java (modified) (3 diffs)
• src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java (modified) (3 diffs)
• src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java (modified) (3 diffs)
• src/com/romraider/logger/ecu/ui/swing/menubar/action/ComPortAutoRefreshAction.java (added)

trunk/release_notes.txt

@@ -79 +79 @@
   and restored between sessions.  INFO should be the normal state to keep the
   rr_system.log file in-check.
+- Moved the COM port Auto Refresh checkbox to the Settings menu.
 --- Editor ---
 - Set JInternalFrame.isPalette in TableFarme.java so table titles are visible on

trunk/src/com/romraider/logger/ecu/EcuLogger.java

@@ -216 +216 @@
     private JTabbedPane tabbedPane;
     private SerialPortComboBox portsComboBox;
-    private JCheckBox portRefresh;
     private DataUpdateHandlerManager dataHandlerManager;
     private DataRegistrationBroker dataTabBroker;
@@ -1066 +1065 @@
         comboBoxPanel.add(new JLabel("COM Port:"));
         comboBoxPanel.add(portsComboBox);
-        portRefresh = new JCheckBox("Auto Refresh");
-        portRefresh.setToolTipText("Check to enable automatic COM port refreshing");
-        portRefresh.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent actionEvent) {
-                refresher.setRefreshMode(portRefresh.isSelected());
-                settings.setRefreshMode(portRefresh.isSelected());
-            }
-        });
-        comboBoxPanel.add(portRefresh);
 
         final JCheckBox ecuCheckBox = new JCheckBox("ECU");
@@ -1457 +1447 @@
     }
 
-        private void setRefreshMode(boolean refreshMode) {
-        portRefresh.setSelected(refreshMode);
+        public void setRefreshMode(boolean refreshMode) {
+                settings.setRefreshMode(refreshMode);
         refresher.setRefreshMode(refreshMode);
         }

trunk/src/com/romraider/logger/ecu/comms/manager/QueryManagerImpl.java

@@ -20 +20 @@
 package com.romraider.logger.ecu.comms.manager;
 
+import static com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory.getConnection;
+import static com.romraider.logger.ecu.definition.EcuDataType.EXTERNAL;
+import static com.romraider.util.ParamChecker.checkNotNull;
+import static com.romraider.util.ThreadUtil.runAsDaemon;
+import static com.romraider.util.ThreadUtil.sleep;
+import static java.util.Collections.synchronizedList;
+import static java.util.Collections.synchronizedMap;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.swing.SwingUtilities;
+
+import org.apache.log4j.Logger;
+
 import com.romraider.Settings;
-import com.romraider.logger.ecu.comms.manager.PollingState;
 import com.romraider.logger.ecu.comms.io.connection.LoggerConnection;
-import static com.romraider.logger.ecu.comms.io.connection.LoggerConnectionFactory.getConnection;
 import com.romraider.logger.ecu.comms.query.EcuInitCallback;
 import com.romraider.logger.ecu.comms.query.EcuQuery;
@@ -33 +49 @@
 import com.romraider.logger.ecu.comms.query.ResponseImpl;
 import com.romraider.logger.ecu.definition.EcuData;
-import static com.romraider.logger.ecu.definition.EcuDataType.EXTERNAL;
 import com.romraider.logger.ecu.definition.ExternalData;
 import com.romraider.logger.ecu.definition.LoggerData;
@@ -40 +55 @@
 import com.romraider.logger.ecu.ui.handler.DataUpdateHandler;
 import com.romraider.logger.ecu.ui.handler.file.FileLoggerControllerSwitchMonitor;
-import static com.romraider.util.ParamChecker.checkNotNull;
-import static com.romraider.util.ThreadUtil.runAsDaemon;
-import static com.romraider.util.ThreadUtil.sleep;
-import static java.util.Collections.synchronizedList;
-import static java.util.Collections.synchronizedMap;
-import org.apache.log4j.Logger;
-import javax.swing.SwingUtilities;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 public final class QueryManagerImpl implements QueryManager {
     private static final Logger LOGGER = Logger.getLogger(QueryManagerImpl.class);
-    private final DecimalFormat format = new DecimalFormat("0.00");
     private final List<StatusChangeListener> listeners = synchronizedList(new ArrayList<StatusChangeListener>());
     private final Map<String, Query> queryMap = synchronizedMap(new HashMap<String, Query>());

trunk/src/com/romraider/logger/ecu/ui/swing/menubar/EcuLoggerMenuBar.java

@@ -26 +26 @@
 import static java.awt.event.KeyEvent.VK_C;
 import static java.awt.event.KeyEvent.VK_D;
+import static java.awt.event.KeyEvent.VK_E;
 import static java.awt.event.KeyEvent.VK_F;
 import static java.awt.event.KeyEvent.VK_F7;
@@ -50 +51 @@
 
 import com.romraider.logger.ecu.EcuLogger;
+import com.romraider.logger.ecu.ui.swing.menubar.action.ComPortAutoRefreshAction;
 import com.romraider.logger.ecu.ui.swing.menubar.action.DisconnectAction;
 import com.romraider.logger.ecu.ui.swing.menubar.action.ExitAction;
@@ -93 +95 @@
         settingsMenu.add(new JSeparator());
         settingsMenu.add(new RadioButtonMenuItem("Control File Logging With Defogger Switch", VK_C, getKeyStroke(VK_C, CTRL_MASK), new LogFileControllerSwitchAction(logger), logger.getSettings().isFileLoggingControllerSwitchActive()));
+        RadioButtonMenuItem autoRefresh = new RadioButtonMenuItem("Enable COM port Auto Refresh", VK_E, getKeyStroke(VK_E, CTRL_MASK), new ComPortAutoRefreshAction(logger), logger.getSettings().getRefreshMode());
+        autoRefresh.setToolTipText("Select to enable automatic COM port refreshing");
+        settingsMenu.add(autoRefresh);
         RadioButtonMenuItem fastPoll = new RadioButtonMenuItem("Enable Fast Polling Mode", VK_M, getKeyStroke(VK_M, CTRL_MASK), new FastPollModeAction(logger), logger.getSettings().isFastPoll());
         fastPoll.setToolTipText("Select to enable faster polling of the ECU");
         settingsMenu.add(fastPoll);
+        settingsMenu.add(new JSeparator());
         settingsMenu.add(new RadioButtonMenuItem("Use Absolute Timestamp In Log File", VK_T, getKeyStroke(VK_T, CTRL_MASK), new LogFileAbsoluteTimestampAction(logger), logger.getSettings().isFileLoggingAbsoluteTimestamp()));
         add(settingsMenu);