Changeset 32109 in osm

Timestamp:

2016-03-09T17:13:00+01:00 (9 years ago)

Author:

roland

Message:

Fixed various bugs (see git repo)

Location:

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline

Files:

• Beam.java (modified) (6 diffs)
• BeamGeography.java (modified) (1 diff)
• IndoorSweeplineController.java (modified) (1 diff)
• IndoorSweeplineModel.java (modified) (3 diffs)
• IndoorSweeplineWizardDialog.java (modified) (4 diffs)
• ModelGeography.java (modified) (1 diff)

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/Beam.java

@@ -6 +6 @@
 public class Beam
 {
-    public Beam(double width, CorridorPart.ReachableSide defaultSide)
-    {
+    public Beam(Vector<Double> blueprint, double blueprintOffset, CorridorPart.ReachableSide defaultSide)
+    {
+        offset = blueprintOffset;
         parts = new Vector<CorridorPart>();
         
-        setDefaultSide_(defaultSide);   
-        addCorridorPart_(true, width);
+        setDefaultSide_(defaultSide);
+        if (defaultSide == CorridorPart.ReachableSide.RIGHT)
+        {
+            for (int i = 1; i < blueprint.size(); i += 2)
+            {
+                addCorridorPart_(true, CorridorPart.Type.WALL,
+                    blueprint.elementAt(i).doubleValue() - blueprint.elementAt(i-1).doubleValue());
+                if (i+1 < blueprint.size())
+                    addCorridorPart_(true, CorridorPart.Type.VOID,
+                        blueprint.elementAt(i+1).doubleValue() - blueprint.elementAt(i).doubleValue());
+            }
+        }
+        else
+        {
+            for (int i = 1; i < blueprint.size(); i += 2)
+            {
+                addCorridorPart_(true, CorridorPart.Type.PASSAGE,
+                    blueprint.elementAt(i).doubleValue() - blueprint.elementAt(i-1).doubleValue());
+                if (i+1 < blueprint.size())
+                    addCorridorPart_(true, CorridorPart.Type.VOID,
+                        blueprint.elementAt(i+1).doubleValue() - blueprint.elementAt(i).doubleValue());
+            }
+        }
         adjustStripCache();
     }
@@ -19 +41 @@
     {
         this.defaultSide = defaultSide;
-        defaultType = defaultSide == CorridorPart.ReachableSide.RIGHT ?
-            CorridorPart.Type.WALL : CorridorPart.Type.PASSAGE;
     }
     
@@ -34 +54 @@
         return parts;
     }
-
-    
-    private void addCorridorPart_(boolean append, double width)
+    
+    
+    public double getBeamOffset()
+    {
+        return offset;
+    }
+    
+    public void setBeamOffset(double beamOffset)
+    {
+        offset = beamOffset;
+    }
+
+    
+    private void addCorridorPart_(boolean append, CorridorPart.Type type, double width)
     {
         CorridorPart.ReachableSide side = defaultSide == CorridorPart.ReachableSide.RIGHT ?
@@ -42 +73 @@
             
         if (append)
-            parts.add(new CorridorPart(width, defaultType, side));
-        else
-            parts.add(0, new CorridorPart(width, defaultType, side));
+            parts.add(new CorridorPart(width, type, side));
+        else
+            parts.add(0, new CorridorPart(width, type, side));
     }
 
     public void addCorridorPart(boolean append, double width)
     {
-        addCorridorPart_(append, width);
+        addCorridorPart_(append,
+            defaultSide == CorridorPart.ReachableSide.RIGHT ? CorridorPart.Type.WALL : CorridorPart.Type.PASSAGE,
+            width);
         adjustStripCache();
     }
@@ -177 +210 @@
     
     
+    private double offset;
     private Vector<CorridorPart> parts;
     private Vector<StripPosition> lhsStrips;
@@ -314 +348 @@
     
     
-    private CorridorPart.Type defaultType;
     private CorridorPart.ReachableSide defaultSide;
 }

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/BeamGeography.java

@@ -46 +46 @@
 
     
-    public void adjustNodes(LatLon pivot, Vector<CorridorPart> parts)
+    public void adjustNodes(LatLon pivot, Vector<CorridorPart> parts, double beamOffset)
     {
+        double offset = -beamOffset;
         this.parts = parts;
-        adjustNode(0, new LatLon(pivot.lat(), pivot.lon()));
+        
+        adjustNode(0, new LatLon(addMetersToLat(pivot, offset), pivot.lon()));
     
-        double offset = 0;
         for (int i = 0; i < parts.size(); ++i)
         {

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineController.java

@@ -73 +73 @@
     }
     
+    public double getBeamOffset(int index)
+    {
+        return model.getBeamOffset(index);
+    }
+    
+    public void setBeamOffset(int index, double beamOffset)
+    {
+        model.setBeamOffset(index, beamOffset);
+    }
+    
     public List<CorridorPart> getBeamParts(int index)
     {

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineModel.java

@@ -11 +11 @@
 
 /* TODO:
-- offset
-- replicate last stopline
 - focus to useful table entry after cell edit
 - keyboard shortcuts
@@ -63 +61 @@
         for (int i = 0; i < strips.size(); ++i)
             offset += strips.elementAt(i).width;
-            
-        beams.add(new Beam(width, side));
+        
+        if (strips.size() == 0)
+        {
+            Vector<Double> blueprint = new Vector<Double>();
+            blueprint.addElement(0.);
+            blueprint.addElement(10.);
+            beams.add(new Beam(blueprint, 0., side));
+        }
+        else
+            beams.add(new Beam(strips.elementAt(strips.size()-1).lhs,
+                beams.elementAt(beams.size()-1).getBeamOffset(), side));
         
         if (strips.size() > 0)
@@ -128 +135 @@
         strips.elementAt(index / 2).width = value;
         
+        updateOsmModel();
+    }
+    
+    
+    public double getBeamOffset(int index)
+    {
+        return beams.elementAt(index / 2).getBeamOffset();
+    }
+    
+    public void setBeamOffset(int index, double beamOffset)
+    {
+        beams.elementAt(index / 2).setBeamOffset(beamOffset);       
         updateOsmModel();
     }

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/IndoorSweeplineWizardDialog.java

@@ -54 +54 @@
         panel.add(new JButton(next), 2, 2, 2, 1);
 
-        panel.add(new JLabel(tr("Strip width:")), 0, 3, 3, 1);
+        panel.add(makeWidthLabel(), 0, 3, 3, 1);
         panel.add(makeWidthField(), 3, 3, 1, 1);
 
@@ -85 +85 @@
         try
         {
-            stripWidth.setEditable(beamIndex % 2 == 1);
             if (beamIndex % 2 == 0)
-                stripWidth.setText("---");
+            {
+                widthOffsetLabel.setText("Offset into background:");
+                stripWidth.setText(Double.toString(controller.getBeamOffset(beamIndex)));
+            }
             else
+            {
+                widthOffsetLabel.setText("Strip width:");
                 stripWidth.setText(Double.toString(controller.getStripWidth(beamIndex)));
+            }
         }
         catch (IllegalStateException ex)
@@ -364 +369 @@
     
     
+    private JLabel widthOffsetLabel;
+    
+    private JLabel makeWidthLabel()
+    {
+        widthOffsetLabel = new JLabel(tr("Offset into background:"));
+        return widthOffsetLabel;
+    }
+    
+    
     private JTextField stripWidth;
     
@@ -399 +413 @@
             try
             {
-                if (beamIndex % 2 == 1)
+                if (beamIndex % 2 == 0)
+                    controller.setBeamOffset(beamIndex, Double.parseDouble(stripWidth.getText()));
+                else
                     controller.setStripWidth(beamIndex, Double.parseDouble(stripWidth.getText()));
             }

applications/editors/josm/plugins/indoor_sweepline/src/indoor_sweepline/ModelGeography.java

@@ -76 +76 @@
                 beamsGeography.setElementAt(new BeamGeography(dataSet, this), i);
             beamsGeography.elementAt(i).adjustNodes(new LatLon(center.lat(), addMetersToLon(center, offset)),
-                beams.elementAt(i).getBeamParts());
+                beams.elementAt(i).getBeamParts(), beams.elementAt(i).getBeamOffset());
                 
             if (i < strips.size())