Commit cee370ed authored by Christopher Reis's avatar Christopher Reis

Tracks without bugs for one sat, GUI locks up multiple

parent 66a06e44
...@@ -52,7 +52,6 @@ public class Application { ...@@ -52,7 +52,6 @@ public class Application {
public void actionPerformed(ActionEvent evt) { public void actionPerformed(ActionEvent evt) {
List<satPosition> pos = TrackerList.getTracks(); List<satPosition> pos = TrackerList.getTracks();
threeDview.updateTracks(pos); threeDview.updateTracks(pos);
System.out.println("update");
} }
}; };
...@@ -73,8 +72,8 @@ public class Application { ...@@ -73,8 +72,8 @@ public class Application {
try { try {
Application window = new Application(); Application window = new Application();
window.frmSatelliteTracker.setVisible(true); window.frmSatelliteTracker.setVisible(true);
new javax.swing.Timer(500, updateTracks).start(); //new javax.swing.Timer(500, updateTracks).start();
new javax.swing.Timer(500, addtrack).start(); new javax.swing.Timer(10 00, addtrack).start();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
......
...@@ -94,7 +94,7 @@ public class satelliteTree extends JInternalFrame { ...@@ -94,7 +94,7 @@ public class satelliteTree extends JInternalFrame {
BufferedImage img = null; BufferedImage img = null;
try { try {
img = ImageIO.read(new File("//C:\\Users\\Christopher\\Documents\\GitHub\\Satellite\\satellite.png")); img = ImageIO.read(new File("D:\\MyDocuments\\GitHub\\Satellite\\satellite.png"));
//D:\\MyDocuments\\GitHub\\Satellite\\satellite.png //D:\\MyDocuments\\GitHub\\Satellite\\satellite.png
//C:\\Users\\Christopher\\Documents\\GitHub\\Satellite\\satellite.png //C:\\Users\\Christopher\\Documents\\GitHub\\Satellite\\satellite.png
} catch (IOException e) { } catch (IOException e) {
......
...@@ -24,6 +24,7 @@ public class view3D extends JInternalFrame{ ...@@ -24,6 +24,7 @@ public class view3D extends JInternalFrame{
private List<satPosition> trackList = new ArrayList<satPosition>(); private List<satPosition> trackList = new ArrayList<satPosition>();
WorldWindowGLCanvas wwd; WorldWindowGLCanvas wwd;
RenderableLayer layer = new RenderableLayer();
public view3D() public view3D()
{ {
...@@ -82,13 +83,16 @@ public class view3D extends JInternalFrame{ ...@@ -82,13 +83,16 @@ public class view3D extends JInternalFrame{
} }
public void addTrack(String name, Double lat, Double lon){ public void addTrack(String name, Double lat, Double lon){
RenderableLayer layer = new RenderableLayer();
Iterable<Renderable> iter = layer.getRenderables(); Iterable<Renderable> iter = layer.getRenderables();
for(Renderable rend : iter){ while(iter.iterator().hasNext()){
Renderable rend = iter.iterator().next();
if(rend instanceof PointPlacemark){ if(rend instanceof PointPlacemark){
PointPlacemark delp = (PointPlacemark)rend; PointPlacemark delp = (PointPlacemark)rend;
if(delp.getLabelText().equals(name)){ if(delp.getLabelText().equals(name)){
delp.setPosition(Position.fromDegrees(lat, lon)); delp.setPosition(Position.fromDegrees(lat, lon));
wwd.redraw();
return; return;
} }
} }
...@@ -99,10 +103,10 @@ public class view3D extends JInternalFrame{ ...@@ -99,10 +103,10 @@ public class view3D extends JInternalFrame{
pp.setLineEnabled(false); pp.setLineEnabled(false);
pp.setAltitudeMode(WorldWind.CLAMP_TO_GROUND); pp.setAltitudeMode(WorldWind.CLAMP_TO_GROUND);
PointPlacemarkAttributes attrs = new PointPlacemarkAttributes(); PointPlacemarkAttributes attrs = new PointPlacemarkAttributes();
attrs.setImageAddress("gov/nasa/worldwindx/examples/images/audioicon-64.png"); attrs.setImageAddress("D:\\MyDocuments\\GitHub\\Satellite\\satellite.png");
attrs.setHeading(-45d); attrs.setHeading(-45d);
attrs.setHeadingReference(AVKey.RELATIVE_TO_GLOBE); attrs.setHeadingReference(AVKey.RELATIVE_TO_GLOBE);
attrs.setScale(0.6); attrs.setScale(0.05);
// attrs.setImageOffset(new Offset(0.5, 0.5, AVKey.FRACTION, AVKey.FRACTION)); // attrs.setImageOffset(new Offset(0.5, 0.5, AVKey.FRACTION, AVKey.FRACTION));
attrs.setImageOffset(new Offset(19d, 8d, AVKey.PIXELS, AVKey.PIXELS)); attrs.setImageOffset(new Offset(19d, 8d, AVKey.PIXELS, AVKey.PIXELS));
attrs.setLabelColor("ffffffff"); attrs.setLabelColor("ffffffff");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment