[Magicmap-commits] SF.net SVN: magicmap: [546] trunk/magicmapclient/src/net/sf/magicmap/client /model/measurement/MeasurementModel.java

[<fle...@us...>]

Revision: 546
          http://svn.sourceforge.net/magicmap/?rev=546&view=rev
Author:   flederohr
Date:     2007-02-17 06:11:46 -0800 (Sat, 17 Feb 2007)

Log Message:
-----------
use avarage signal for update of AccessPointSignaLevel
cleaned up updateScanresult(APSeerNode, Mac[], Signal[])-Method

Modified Paths:
--------------
    trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java

Modified: trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java	2007-02-17 08:14:13 UTC (rev 545)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/model/measurement/MeasurementModel.java	2007-02-17 14:11:46 UTC (rev 546)
@@ -1,9 +1,9 @@
 
 package net.sf.magicmap.client.model.measurement;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 import javax.swing.event.EventListenerList;
@@ -68,28 +68,23 @@
                 client.notSeesAccessPoint(nodeModel.findAccessPoint(apMac));
             } else {
                 updateAccessPoint(client, accessPoint);
-                client.setSignalLevelForAcessPoint(nodeModel.findAccessPoint(apMac), signalLevel);
+                client.setSignalLevelForAcessPoint(nodeModel.findAccessPoint(apMac), accessPoint
+                        .getAverageSignalLevel());
             }
         }
     }
 
     public void updateScanResult(AccessPointSeerNode client, String[] apMac, double[] signalLevel){
-        ArrayList<AccessPointNode> seenAps = client.getSeenAccessPoints();
-        INodeModel nodeModel = client.getModel();
+        HashSet<String> seenAps = new HashSet<String>();
+        for (SeenAccessPoint sap : this.get(client)) {
+            seenAps.add(sap.getMac());
+        }
         for (int i = 0; i < apMac.length; ++i) {
-            AccessPointNode ap = nodeModel.findAccessPoint(apMac[i]);
-            if (ap != null) {
-                seenAps.remove(ap);
-                updateScanResult(client, apMac[i], signalLevel[i]);
-                client.setSignalLevelForAcessPoint(ap, signalLevel[i]);
-            } else {
-                ap = new AccessPointNode(apMac[i], nodeModel);
-                nodeModel.addNode(ap);
-                client.seesAccessPoint(ap, signalLevel[i]);
-            }
+            seenAps.remove(apMac);
+            updateScanResult(client, apMac[i], signalLevel[i]);
         }
-        for (AccessPointNode ap : seenAps) {
-            client.notSeesAccessPoint(ap);
+        for (String mac : seenAps) {
+            updateScanResult(client, mac, Double.NEGATIVE_INFINITY);
         }
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.