Index: applications/editors/josm/plugins/NanoLog/build.xml =================================================================== --- applications/editors/josm/plugins/NanoLog/build.xml (revision 27939) +++ applications/editors/josm/plugins/NanoLog/build.xml (revision 27939) @@ -0,0 +1,246 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Building against core revision ${coreversion.info.entry.revision}. + Plugin-Mainversion is set to ${plugin.main.version}. + + + + + Commiting the plugin source with message '${commit.message}' ... + + + + + + + + + + Updating plugin source ... + + + + + + Updating ${plugin.jar} ... + + + + + + + + + + ***** Properties of published ${plugin.jar} ***** + Commit message : '${commit.message}' + Plugin-Mainversion: ${plugin.main.version} + JOSM build version: ${coreversion.info.entry.revision} + Plugin-Version : ${version.entry.commit.revision} + ***** / Properties of published ${plugin.jar} ***** + + Now commiting ${plugin.jar} ... + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java =================================================================== --- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java (revision 27939) +++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogEntry.java (revision 27939) @@ -0,0 +1,33 @@ +package nanolog; + +import java.util.Date; +import org.openstreetmap.josm.data.coor.LatLon; + +/** + * This holds one NanoLog entry. + * + * @author zverik + */ +public class NanoLogEntry { + private LatLon pos; + private Date time; + private String message; + private int direction; + private LatLon tmpPos; + + public int getDirection() { + return direction; + } + + public String getMessage() { + return message; + } + + public LatLon getPos() { + return tmpPos == null ? pos : tmpPos; + } + + public Date getTime() { + return time; + } +} Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java =================================================================== --- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java (revision 27939) +++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogLayer.java (revision 27939) @@ -0,0 +1,160 @@ +package nanolog; + +import java.awt.Color; +import java.awt.Graphics2D; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.beans.PropertyChangeListener; +import java.io.*; +import java.util.ArrayList; +import java.util.List; +import javax.swing.AbstractAction; +import javax.swing.Action; +import javax.swing.Icon; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.RenameLayerAction; +import org.openstreetmap.josm.actions.SaveAction; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; +import org.openstreetmap.josm.gui.MapView; +import org.openstreetmap.josm.gui.dialogs.LayerListDialog; +import org.openstreetmap.josm.gui.dialogs.LayerListPopup; +import org.openstreetmap.josm.gui.layer.JumpToMarkerActions; +import org.openstreetmap.josm.gui.layer.Layer; +import static org.openstreetmap.josm.tools.I18n.tr; +import static org.openstreetmap.josm.tools.I18n.trn; +import org.openstreetmap.josm.tools.ImageProvider; + +/** + * + * @author zverik + */ +public class NanoLogLayer extends Layer implements JumpToMarkerActions.JumpToMarkerLayer { + + private List log; + private int selectedEntry; + + public NanoLogLayer( File file ) throws IOException { + super(tr("NanoLog")); + log = readNanoLog(file); + selectedEntry = -1; + } + + public static List readNanoLog( File file ) throws IOException { + List result = new ArrayList(); + BufferedReader r = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF8")); + while( r.ready() ) { + String line = r.readLine(); + if( line != null ) { + // parse it + } + } + r.close(); + return result; + } + + @Override + public void paint( Graphics2D g, MapView mv, Bounds box ) { + // todo + int radius = 4; + int width = Main.map.mapView.getWidth(); + int height = Main.map.mapView.getHeight(); + Rectangle clip = g.getClipBounds(); + for( NanoLogEntry entry : log ) { + if( entry.getPos() != null ) { + Point p = mv.getPoint(entry.getPos()); + g.setColor(Color.green); + g.fillOval(p.x - radius, p.y - radius, radius * 2, radius * 2); + } + } + if( selectedEntry >= 0 && selectedEntry < log.size() ) { + Point p = mv.getPoint(log.get(selectedEntry).getPos()); + g.setColor(Color.red); + g.fillOval(p.x - radius, p.y - radius, radius * 2, radius * 2); + } + } + + @Override + public Icon getIcon() { + return ImageProvider.get("nanolog.png"); + } + + @Override + public String getToolTipText() { + return tr("NanoLog of {0} entries", log.size()); + } + + @Override + public void mergeFrom( Layer from ) { + // todo + } + + @Override + public boolean isMergable( Layer other ) { + return other instanceof NanoLogLayer; + } + + @Override + public void visitBoundingBox( BoundingXYVisitor v ) { + for( NanoLogEntry entry : log ) + v.visit(entry.getPos()); + } + + @Override + public Object getInfoComponent() { + StringBuilder b = new StringBuilder(); + int cnt = 0; + for( NanoLogEntry e : log ) + if( e.getPos() != null ) + cnt++; + b.append(tr("NanoLog of {0} lines, {1} of them with coordinates.", log.size(), cnt)); + return b.toString(); + } + + @Override + public Action[] getMenuEntries() { + return new Action[] { + LayerListDialog.getInstance().createShowHideLayerAction(), + LayerListDialog.getInstance().createDeleteLayerAction(), + new RenameLayerAction(null, this), + SeparatorLayerAction.INSTANCE, + new CorrelateEntries(), + new SaveLayer(), + SeparatorLayerAction.INSTANCE, + new LayerListPopup.InfoAction(this) + }; + } + + public void jumpToNextMarker() { + selectedEntry++; + if( selectedEntry < 0 ) + selectedEntry = 0; + else if( selectedEntry >= log.size() ) + selectedEntry = log.size() - 1; + Main.map.repaint(); + } + + public void jumpToPreviousMarker() { + selectedEntry--; + if( selectedEntry < 0 ) + selectedEntry = 0; + else if( selectedEntry >= log.size() ) + selectedEntry = log.size() - 1; + Main.map.repaint(); + } + + private class CorrelateEntries extends AbstractAction { + + public void actionPerformed( ActionEvent e ) { + // todo + } + } + + private class SaveLayer extends AbstractAction { + + public void actionPerformed( ActionEvent e ) { + // todo + } + } +} Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java =================================================================== --- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java (revision 27939) +++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPanel.java (revision 27939) @@ -0,0 +1,35 @@ +package nanolog; + +import javax.swing.*; +import org.openstreetmap.josm.gui.dialogs.ToggleDialog; +import static org.openstreetmap.josm.tools.I18n.tr; +import org.openstreetmap.josm.tools.Shortcut; + +/** + * NanoLog Panel. Displays the selected log item, along with surrounding 30-50 lines. + * + * @author zverik + */ +public class NanoLogPanel extends ToggleDialog { + private JList logPanel; + private LogListModel listModel; + + public NanoLogPanel() { + super(tr("NanoLog"), "nanolog", tr("Open NanoLog panel"), null, 150, true); + + listModel = new LogListModel(); + logPanel = new JList(listModel); + createLayout(logPanel, true, null); + } + + private class LogListModel extends AbstractListModel { + + public int getSize() { + return 0; + } + + public String getElementAt( int index ) { + return ""; // todo + } + } +} Index: applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java =================================================================== --- applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java (revision 27939) +++ applications/editors/josm/plugins/NanoLog/src/nanolog/NanoLogPlugin.java (revision 27939) @@ -0,0 +1,43 @@ +package nanolog; + +import java.awt.event.ActionEvent; +import javax.swing.JFileChooser; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.JosmAction; +import org.openstreetmap.josm.gui.MapFrame; +import org.openstreetmap.josm.plugins.Plugin; +import org.openstreetmap.josm.plugins.PluginInformation; +import static org.openstreetmap.josm.tools.I18n.tr; + +/** + * Add NanoLog opening menu item and the panel. + * + * @author zverik + */ +public class NanoLogPlugin extends Plugin { + public NanoLogPlugin( PluginInformation info ) { + super(info); + Main.main.menu.fileMenu.add(new OpenNanoLogLayerAction()); + } + + @Override + public void mapFrameInitialized( MapFrame oldFrame, MapFrame newFrame ) { + if( oldFrame == null && newFrame != null ) { + newFrame.addToggleDialog(new NanoLogPanel()); + } + } + + private class OpenNanoLogLayerAction extends JosmAction { + + public OpenNanoLogLayerAction() { + super(tr("Open NanoLog file..."), "nanolog.png", tr("Open NanoLog file..."), null, false); + } + + public void actionPerformed( ActionEvent e ) { + JFileChooser fc = new JFileChooser(); + if( fc.showOpenDialog(Main.parent) == JFileChooser.APPROVE_OPTION ) { + // open layer, ok + } + } + } +}