Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java =================================================================== --- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (revision 14779) +++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (revision 16290) @@ -47,28 +47,28 @@ * anything...) */ -public abstract class PicLayerAbstract extends Layer +public abstract class PicLayerAbstract extends Layer { - // Counter - just for naming of layers - private static int m_counter = 0; - // This is the main image to be displayed - private BufferedImage m_image = null; - // Initial position of the image in the real world - private EastNorth m_initial_position; - // Position of the image in the real world - private EastNorth m_position; - // Angle of rotation of the image - private double m_angle = 0.0; - // Scale of the image - private double m_scale = 1.0; - // The scale that was set on the map during image creation - private double m_initial_scale = 0; - // Popup menu items - private Component m_popupmenu[] = null; - // Layer icon + // Counter - just for naming of layers + private static int m_counter = 0; + // This is the main image to be displayed + private BufferedImage m_image = null; + // Initial position of the image in the real world + private EastNorth m_initial_position; + // Position of the image in the real world + private EastNorth m_position; + // Angle of rotation of the image + private double m_angle = 0.0; + // Scale of the image + private double m_scale = 1.0; + // The scale that was set on the map during image creation + private double m_initial_scale = 0; + // Popup menu items + private Component m_popupmenu[] = null; + // Layer icon private Icon m_layericon = null; - - /** - * Constructor - */ + + /** + * Constructor + */ public PicLayerAbstract() { super("PicLayer #" + m_counter); @@ -76,5 +76,5 @@ //Increase number m_counter++; - + // Create popup menu // Reset submenu @@ -87,13 +87,13 @@ // Main menu m_popupmenu = new Component[]{ - reset_submenu, - new JSeparator(), - new JMenuItem( new HelpAction() ) + reset_submenu, + new JSeparator(), + new JMenuItem( new HelpAction() ) }; - + // Load layer icon m_layericon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(PicLayerAbstract.class.getResource("/images/layericon.png"))); - } - + } + /** * Initializes the image. Gets the image from a subclass and stores some @@ -101,161 +101,161 @@ */ public void Initialize() throws IOException { - - // Create image - Image image = createImage(); - if ( image == null ) { - throw new IOException( "Image not created properly."); - } - // Convert to Buffered Image - not sure if this is the right way... - m_image = new BufferedImage( image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB ); - Graphics g = m_image.getGraphics(); - g.drawImage( image, 0, 0, null ); - - // If the map does not exist - we're screwed. We should not get into this situation in the first place! - if ( Main.map != null && Main.map.mapView != null ) { - // Geographical position of the image - m_initial_position = m_position = Main.map.mapView.getCenter(); - // Initial scale at which the image was loaded - m_initial_scale = Main.map.mapView.getScale(); - } else { - throw new IOException( "Could not find the map object." ); - } - } - + + // Create image + Image image = createImage(); + if ( image == null ) { + throw new IOException( "Image not created properly."); + } + // Convert to Buffered Image - not sure if this is the right way... + m_image = new BufferedImage( image.getWidth(null), image.getHeight(null), BufferedImage.TYPE_INT_ARGB ); + Graphics g = m_image.getGraphics(); + g.drawImage( image, 0, 0, null ); + + // If the map does not exist - we're screwed. We should not get into this situation in the first place! + if ( Main.map != null && Main.map.mapView != null ) { + // Geographical position of the image + m_initial_position = m_position = Main.map.mapView.getCenter(); + // Initial scale at which the image was loaded + m_initial_scale = Main.map.mapView.getMapScale(); + } else { + throw new IOException( "Could not find the map object." ); + } + } + /** * To be overridden by subclasses. Provides an image from an external sources. * Throws exception if something does not work. - * + * * TODO: Replace the IOException by our own exception. */ protected abstract Image createImage() throws IOException; - + /** * To be overridden by subclasses. Returns the user readable name of the layer. */ protected abstract String getPicLayerName(); - - @Override - public Icon getIcon() { - return m_layericon; - } - - @Override - public Object getInfoComponent() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Component[] getMenuEntries() { - return m_popupmenu; - } - - @Override - public String getToolTipText() { - return getPicLayerName(); - } - - @Override - public boolean isMergable(Layer arg0) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void mergeFrom(Layer arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void paint(Graphics arg0, MapView arg1) { - - if ( m_image != null && arg0 instanceof Graphics2D) { - - // Position image at the right graphical place - EastNorth center = Main.map.mapView.getCenter(); - EastNorth leftop = Main.map.mapView.getEastNorth( 0, 0 ); - double pixel_per_en = ( Main.map.mapView.getWidth() / 2.0 ) / ( center.east() - leftop.east() ); - - // This is now the offset in screen pixels - double pic_offset_x = (( m_position.east() - leftop.east() ) * pixel_per_en); - double pic_offset_y = (( leftop.north() - m_position.north() ) * pixel_per_en); - - // Let's use Graphics 2D - Graphics2D g = (Graphics2D)arg0.create(); - // Move - g.translate( pic_offset_x, pic_offset_y ); - // Rotate - g.rotate( m_angle * Math.PI / 180.0 ); - // Scale - double scale = m_scale * m_initial_scale / Main.map.mapView.getScale(); - g.scale( scale, scale ); - - // Draw picture - g.drawImage( m_image, -m_image.getWidth() / 2, -m_image.getHeight() / 2, null ); - - // Draw additional rectangle for the active pic layer - if ( Main.map.mapView.getActiveLayer() == this ) { - g.setColor( new Color( 0xFF0000 ) ); - g.drawRect( - -m_image.getWidth() / 2, - -m_image.getHeight() / 2, - m_image.getWidth(), - m_image.getHeight() - ); - } - } else { - // TODO: proper logging - System.out.println( "PicLayerAbstract::paint - general drawing error (m_image is null or Graphics not 2D" ); - } - } - - /** - * Moves the picture. Scaled in EastNorth... - */ - public void movePictureBy( double east, double north ) { - m_position = m_position.add( east, north ); - } - - /** - * Scales the picture. Scaled in... don't know but works ok :) - */ - public void scalePictureBy( double scale ) { - m_scale += scale; - } - - /** - * Rotates the picture. Scales in angles. - */ - public void rotatePictureBy( double angle ) { - m_angle += angle; - } - - /** - * Sets the image position to the initial position - */ - public void resetPosition() { - m_position = m_initial_position; - } - - /** - * Sets the image scale to 1.0 - */ - public void resetScale() { - m_scale = 1.0; - } - - /** - * Sets the image angle to 0.0 - */ - public void resetAngle() { - m_angle = 0.0; - } - - @Override - public void visitBoundingBox(BoundingXYVisitor arg0) { - // TODO Auto-generated method stub - - } + + @Override + public Icon getIcon() { + return m_layericon; + } + + @Override + public Object getInfoComponent() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Component[] getMenuEntries() { + return m_popupmenu; + } + + @Override + public String getToolTipText() { + return getPicLayerName(); + } + + @Override + public boolean isMergable(Layer arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public void mergeFrom(Layer arg0) { + // TODO Auto-generated method stub + + } + + @Override + public void paint(Graphics arg0, MapView arg1) { + + if ( m_image != null && arg0 instanceof Graphics2D) { + + // Position image at the right graphical place + EastNorth center = Main.map.mapView.getCenter(); + EastNorth leftop = Main.map.mapView.getEastNorth( 0, 0 ); + double pixel_per_en = ( Main.map.mapView.getWidth() / 2.0 ) / ( center.east() - leftop.east() ); + + // This is now the offset in screen pixels + double pic_offset_x = (( m_position.east() - leftop.east() ) * pixel_per_en); + double pic_offset_y = (( leftop.north() - m_position.north() ) * pixel_per_en); + + // Let's use Graphics 2D + Graphics2D g = (Graphics2D)arg0.create(); + // Move + g.translate( pic_offset_x, pic_offset_y ); + // Rotate + g.rotate( m_angle * Math.PI / 180.0 ); + // Scale + double scale = m_scale * m_initial_scale / Main.map.mapView.getMapScale(); + g.scale( scale, scale ); + + // Draw picture + g.drawImage( m_image, -m_image.getWidth() / 2, -m_image.getHeight() / 2, null ); + + // Draw additional rectangle for the active pic layer + if ( Main.map.mapView.getActiveLayer() == this ) { + g.setColor( new Color( 0xFF0000 ) ); + g.drawRect( + -m_image.getWidth() / 2, + -m_image.getHeight() / 2, + m_image.getWidth(), + m_image.getHeight() + ); + } + } else { + // TODO: proper logging + System.out.println( "PicLayerAbstract::paint - general drawing error (m_image is null or Graphics not 2D" ); + } + } + + /** + * Moves the picture. Scaled in EastNorth... + */ + public void movePictureBy( double east, double north ) { + m_position = m_position.add( east, north ); + } + + /** + * Scales the picture. Scaled in... don't know but works ok :) + */ + public void scalePictureBy( double scale ) { + m_scale += scale; + } + + /** + * Rotates the picture. Scales in angles. + */ + public void rotatePictureBy( double angle ) { + m_angle += angle; + } + + /** + * Sets the image position to the initial position + */ + public void resetPosition() { + m_position = m_initial_position; + } + + /** + * Sets the image scale to 1.0 + */ + public void resetScale() { + m_scale = 1.0; + } + + /** + * Sets the image angle to 0.0 + */ + public void resetAngle() { + m_angle = 0.0; + } + + @Override + public void visitBoundingBox(BoundingXYVisitor arg0) { + // TODO Auto-generated method stub + + } }