Changeset 11555 in osm for applications/editors/josm/plugins/globalsat/src/org

Timestamp:

2008-10-29T22:29:00+01:00 (16 years ago)

Author:

ramack

Message:

added support to configure the device

Location:

applications/editors/josm/plugins/globalsat/src/org

Files:

• kaintoch/gps/globalsat/dg100/Dg100Config.java (modified) (4 diffs)
• openstreetmap/josm/plugins/globalsat/GlobalsatConfigDialog.java (added)
• openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java (modified) (3 diffs)
• openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java (modified) (5 diffs)
• openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java (modified) (5 diffs)

applications/editors/josm/plugins/globalsat/src/org/kaintoch/gps/globalsat/dg100/Dg100Config.java

@@ -156 +156 @@
          * @return Returns the disableLogDist.
          */
-        public byte getDisableLogDist()
-        {
-                return disableLogDist;
+        public boolean getDisableLogDist()
+        {
+                return disableLogDist != 0;
         }
 
@@ -164 +164 @@
          * @param disableLogDist The disableLogDist to set.
          */
-        public void setDisableLogDist(byte disableLogDist)
-        {
-                this.disableLogDist = disableLogDist;
+        public void setDisableLogDist(boolean disableLogDist)
+        {
+            this.disableLogDist = (byte)(disableLogDist ? 1 : 0);
         }
 
@@ -172 +172 @@
          * @return Returns the disableLogSpeed.
          */
-        public byte getDisableLogSpeed()
-        {
-                return disableLogSpeed;
+        public boolean getDisableLogSpeed()
+        {
+                return disableLogSpeed != 0;
         }
 
@@ -180 +180 @@
          * @param disableLogSpeed The disableLogSpeed to set.
          */
-        public void setDisableLogSpeed(byte disableLogSpeed)
-        {
-                this.disableLogSpeed = disableLogSpeed;
+        public void setDisableLogSpeed(boolean disableLogSpeed)
+        {
+            this.disableLogSpeed = (byte)(disableLogSpeed ? 1 : 0);
         }
 

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatDg100.java

@@ -18 +18 @@
 
 import org.kaintoch.gps.globalsat.dg100.Response;
+import org.kaintoch.gps.globalsat.dg100.Dg100Config;
 import org.kaintoch.gps.globalsat.dg100.FileInfoRec;
 import org.kaintoch.gps.globalsat.dg100.GpsRec;
@@ -124 +125 @@
     public void cancel(){
         cancelled = true;
+        disconnect();
     }
 
@@ -258 +260 @@
         int len = sendCmd(src, response, -1);
         return Response.parseResponse(response, len);
+    }
+
+    private Response sendCmdGetConfig() throws IOException, UnsupportedCommOperationException
+    {
+        byte[] src = dg100CmdGetConfig;
+        int len = sendCmd(src, response, -1);
+        return Response.parseResponse(response, len);
+    }
+
+    public Dg100Config getConfig() throws ConnectionException{
+        try{
+            if(port == null){
+                connect();
+            }
+            Response response = sendCmdGetConfig();
+            return response.getConfig();
+        }catch(Exception e){
+            throw new ConnectionException(e);
+        }
+    }
+
+
+    private void sendCmdSetConfig(Dg100Config config) throws IOException, UnsupportedCommOperationException
+    {
+        byte[] src = dg100CmdSetConfig;
+        ByteBuffer buf = ByteBuffer.wrap(src);
+        if (config != null){
+            config.write(buf);
+        }
+        updateCheckSum(buf);
+        int len = sendCmd(src, response, -1);
+
+        Response.parseResponse(response, len);
+    }
+
+    public void setConfig(Dg100Config conf) throws ConnectionException{
+        try{
+            sendCmdSetConfig(conf);
+        }catch(Exception e){
+            throw new ConnectionException(e);
+        }
     }
 

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatImportDialog.java

@@ -22 +22 @@
 import javax.swing.JComboBox;
 import javax.swing.ListCellRenderer;
+import javax.swing.JDialog;
 
 import gnu.io.*;
@@ -70 +71 @@
                     Object i = portCombo.getSelectedItem();
                     if(i instanceof CommPortIdentifier){
+                        GlobalsatPlugin.setPortIdent((CommPortIdentifier)i);
                         Main.pref.put("globalsat.portIdentifier", ((CommPortIdentifier)i).getName());
                     }
@@ -108 +110 @@
                 public void actionPerformed(java.awt.event.ActionEvent e){
                     System.out.println("configureing the device");
+                    try{
+                        
+                        GlobalsatConfigDialog dialog = new GlobalsatConfigDialog(GlobalsatPlugin.dg100().getConfig());
+                        JOptionPane pane = new JOptionPane(dialog, JOptionPane.PLAIN_MESSAGE, JOptionPane.OK_CANCEL_OPTION);
+                        JDialog dlg = pane.createDialog(Main.parent, tr("Configure Device"));
+                        dialog.setOptionPane(pane);
+                        dlg.setVisible(true);
+                        if(((Integer)pane.getValue()) == JOptionPane.OK_OPTION){
+                            GlobalsatPlugin.dg100().setConfig(dialog.getConfig());
+                        }
+                        dlg.dispose();
+
+                    }catch(GlobalsatDg100.ConnectionException ex){
+                        JOptionPane.showMessageDialog(Main.parent, tr("Connection Error.") + " " + ex.toString());
+                    }
+                    System.out.println("configureing the device finised");
                 }
             });
@@ -116 +134 @@
         c.gridx = 2;
         c.gridy = 1;
-        //        add(configBtn, c);
+        add(configBtn, c);
 
         
@@ -141 +159 @@
                 if(sel != null && port.getName() == sel){
                     portCombo.setSelectedItem(port);
+                    GlobalsatPlugin.setPortIdent(port);
                 }
             }
         }
         portCombo.setVisible(true);
+        GlobalsatPlugin.setPortIdent(getPort());
+
     }
         

applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java

@@ -27 +27 @@
 
 public class GlobalsatPlugin extends Plugin {
+    private static GlobalsatDg100 device = null;
+    public static GlobalsatDg100 dg100(){
+        return device;
+    }
+
+    public static void setPortIdent(CommPortIdentifier port){
+        if(device != null){
+            device.disconnect();
+        }
+        device = new GlobalsatDg100(port);
+    }
 
     private static class ImportTask extends PleaseWaitRunnable {
         public GpxData data;
-        private GlobalsatDg100 dg100;
         public Exception eee;
         private boolean deleteAfter;
 
-        public ImportTask(GlobalsatDg100 dg100, boolean delete){
+        public ImportTask(boolean delete){
             super(tr("Importing data from device."));
-            this.dg100 = dg100;
             deleteAfter = delete;
         }
@@ -44 +53 @@
             Main.pleaseWaitDlg.currentAction.setText(tr("Importing data from DG100..."));
             try{
-                data = dg100.readData();
+                data = GlobalsatPlugin.dg100().readData();
             }catch(Exception e){
                 eee = e;
@@ -51 +60 @@
 
         @Override protected void finish() {
-            if(deleteAfter && dg100.isCancelled() == false){
+            if(deleteAfter && GlobalsatPlugin.dg100().isCancelled() == false){
                 Main.pref.put("globalsat.deleteAfterDownload", true);
                 try{
-                    dg100.deleteData();
+                    GlobalsatPlugin.dg100().deleteData();
                 }catch(Exception ex){
                     JOptionPane.showMessageDialog(Main.parent, tr("Error deleting data.") + " " + ex.toString());
@@ -72 +81 @@
                 JOptionPane.showMessageDialog(Main.parent, tr("Connection failed.") + " (" + eee.toString() + ")");
             }
-            dg100.disconnect();
+            GlobalsatPlugin.dg100().disconnect();
         }
 
         @Override protected void cancel() {
-            dg100.cancel();
-            dg100.disconnect();
+            GlobalsatPlugin.dg100().cancel();
+            GlobalsatPlugin.dg100().disconnect();
         }
     }
@@ -108 +117 @@
             dlg.setVisible(true);
             if(((Integer)pane.getValue()) == JOptionPane.OK_OPTION){
-                GlobalsatDg100 dg100 = new GlobalsatDg100(dialog.getPort());
-                ImportTask task = new ImportTask(dg100, dialog.deleteFilesAfterDownload());
+                setPortIdent(dialog.getPort());
+                ImportTask task = new ImportTask(dialog.deleteFilesAfterDownload());
                 Main.worker.execute(task);
             }