Menu
▾
▴
magicmap-commits
|
From: <Jan...@us...> - 2007-02-18 21:03:30
|
Revision: 549
http://svn.sourceforge.net/magicmap/?rev=549&view=rev
Author: Jan_fride
Date: 2007-02-18 13:03:02 -0800 (Sun, 18 Feb 2007)
Log Message:
-----------
Added handlilng for node trees.
MapNodes can contains children. (still beta)
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-02-18 21:01:59 UTC (rev 548)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-02-18 21:03:02 UTC (rev 549)
@@ -259,7 +259,9 @@
this.currentMap = map;
try {
this.serverManager.reloadMap();
+ this.nodeModel.setCurrentMap(map);
this.nodeModel.addNode(this.client);
+
this.mapView.loadMap(map);
} catch (MalformedURLException e) {
System.out.println("Map loading failed." + e.getMessage());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-02-19 15:00:13
|
Revision: 553
http://svn.sourceforge.net/magicmap/?rev=553&view=rev
Author: flederohr
Date: 2007-02-19 07:00:06 -0800 (Mon, 19 Feb 2007)
Log Message:
-----------
Bug fixed: reload map failure
Solution: reset position and fixstatus of client instead of setting to null
set client to null at disconnect
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-02-18 22:46:32 UTC (rev 552)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-02-19 15:00:06 UTC (rev 553)
@@ -261,7 +261,7 @@
this.serverManager.reloadMap();
this.nodeModel.setCurrentMap(map);
this.nodeModel.addNode(this.client);
-
+
this.mapView.loadMap(map);
} catch (MalformedURLException e) {
System.out.println("Map loading failed." + e.getMessage());
@@ -318,8 +318,10 @@
this.serverManager.closeMap();
this.poller.stop();
this.measurementModel.clear();
+ // reset the client
+ this.client.setPosition(0, 0, 0);
+ this.client.setFix(false);
this.nodeModel.clear();
- this.client = null;
}
/**
@@ -396,8 +398,8 @@
this.pluginManager.dispose();
if (isMapLoaded()) closeMap();
-
this.serverManager.disconnect(callback);
+ this.client = null;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fle...@us...> - 2007-10-12 13:27:36
|
Revision: 675
http://magicmap.svn.sourceforge.net/magicmap/?rev=675&view=rev
Author: flederohr
Date: 2007-10-12 06:27:07 -0700 (Fri, 12 Oct 2007)
Log Message:
-----------
better handling of map loading
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-10-08 15:24:07 UTC (rev 674)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-10-12 13:27:07 UTC (rev 675)
@@ -6,11 +6,8 @@
import java.io.IOException;
import java.net.MalformedURLException;
-import java.net.SocketTimeoutException;
import java.net.URL;
-import java.rmi.UnknownHostException;
import java.util.ArrayList;
-import java.util.Collection;
import net.sf.magicmap.client.gui.MainGUI;
import net.sf.magicmap.client.gui.utils.GUIUtils;
@@ -29,7 +26,6 @@
import net.sf.magicmap.client.measurement.interfaces.AbstractScanner;
import net.sf.magicmap.client.measurement.interfaces.AbstractScannerHandler;
import net.sf.magicmap.client.meta.MapInfo;
-import net.sf.magicmap.client.model.measurement.IMeasurementModel;
import net.sf.magicmap.client.model.node.ClientNode;
import net.sf.magicmap.client.model.node.GeoPos;
import net.sf.magicmap.client.model.node.INodeModel;
@@ -234,10 +230,12 @@
this.client.getMeasurementModel().clear();
this.client.setPosition(0, 0, 0);
this.client.setFix(false);
- this.nodeModel.clear();
-
+ for (Node node : new ArrayList<Node>(nodeModel.getNodes())) {
+ if (node instanceof MapNode) continue;
+ nodeModel.removeNode(node);
+ }
// TODO: move this to right click menu
- this.retrieveMapNames(this, false);
+ // this.retrieveMapNames(this, false);
}
/**
@@ -530,15 +528,13 @@
URL imageURL = new URL(mapDTO.getImageURL());
// check if map image is accessible
imageURL.openStream();
-
+
INodeModel nodeModel = Controller.getInstance().getNodeModel();
MapNode node = new MapNode(nodeModel);
node.setName(mapDTO.getName());
node.setDisplayName(mapDTO.getName());
node.setMapInfo(mapDTO);
nodeModel.addNode(node);
- } catch (MalformedURLException e) {
- } catch (IOException e) {
- }
+ } catch (MalformedURLException e) {} catch (IOException e) {}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <an...@us...> - 2007-11-08 14:08:10
|
Revision: 689
http://magicmap.svn.sourceforge.net/magicmap/?rev=689&view=rev
Author: anweiss
Date: 2007-11-08 05:33:19 -0800 (Thu, 08 Nov 2007)
Log Message:
-----------
Removed heigth and width in the map title.
Modified Paths:
--------------
trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
Modified: trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java
===================================================================
--- trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-11-08 13:30:41 UTC (rev 688)
+++ trunk/magicmapclient/src/net/sf/magicmap/client/controller/Controller.java 2007-11-08 13:33:19 UTC (rev 689)
@@ -180,13 +180,13 @@
this.scannerAllocator.startAllScanner();
this.pluginManager.loadMap();
- if (this.currentMap.realheight > 0 && this.currentMap.realwidth > 0)
+// if (this.currentMap.realheight > 0 && this.currentMap.realwidth > 0)
// TODO: Interface f\xFCr GUI mit methode setMapTitle()
- ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - "
- + this.currentMap.name + " Gr\xF6\xDFe: " + this.currentMap.realwidth + " X "
- + this.currentMap.realheight + " cm");
+// ((MapView) MainGUI.getInstance().getJComponent("mapView")).setTitle(GUIUtils.i18n("map", false) + " - "
+// + this.currentMap.name + " Gr\xF6\xDFe: " + this.currentMap.realwidth + " X "
+// + this.currentMap.realheight + " cm");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X