Added scrolling via miniature

src/org/interreg/docexplore/gui/image/ImageView.java

@@ -47,7 +47,9 @@ public class ImageView extends EditorView
 					fit();
 			}
 		});
-	}
+	}
+	
+	@Override protected NavViewInputListener createInputListener() {return new ImageViewInputListener(this);}
 	
 	protected void constrain()
 	{
@@ -91,7 +93,8 @@ public class ImageView extends EditorView
 	
 	float miniAlpha = 0;
 	protected AffineTransform miniTransform = new AffineTransform();
-	Point2D br = new Point2D.Double(), brt = new Point2D.Double();
+	Point2D br = new Point2D.Double(), brt = new Point2D.Double();
+	float miniw = 0, minih = 0; 
 	protected void drawMini(Graphics2D g, double pixelSize)
 	{
 		int iw = getImageWidth(), ih = getImageHeight();
@@ -103,22 +106,22 @@ public class ImageView extends EditorView
 		float talpha = (r-l)*(d-u) < 1 ? 1 : 0;
 		if (talpha != miniAlpha)
 			miniAlpha = Math.max(talpha < miniAlpha ? talpha : 0, Math.min(talpha > miniAlpha ? talpha : 1, miniAlpha+(talpha < miniAlpha ? -.1f : .1f)));
-		
+		
+		miniw = minih = 0;
 		if (miniAlpha > 0)
 		{
 			float miniSize = miniSizeFactor*Math.min(getWidth(), getHeight());
-			float mw = iw < ih ? miniSize : iw*miniSize/ih;
-			float mh = iw < ih ? ih*miniSize/iw : miniSize;
+			miniw = iw < ih ? miniSize : iw*miniSize/ih;
+			minih = iw < ih ? ih*miniSize/iw : miniSize;
 			
 			miniTransform.setTransform(defaultTransform);
 			if (rot != ViewRotation.None)
 			{
 				miniTransform.quadrantRotate(-rot.ordinal(), 0, 0);
-				br.setLocation(mw, mh);
+				br.setLocation(miniw, minih);
 				miniTransform.transform(br, brt);
 				miniTransform.setToTranslation(brt.getX() < 0 ? -brt.getX() : 0, brt.getY() < 0 ? -brt.getY() : 0);
 				miniTransform.quadrantRotate(-rot.ordinal(), 0, 0);
-				miniTransform.transform(br, brt);
 			}
 			g.setTransform(miniTransform);
 			Stroke oldStroke = g.getStroke();
@@ -126,12 +129,12 @@ public class ImageView extends EditorView
 			Composite oldComposite = g.getComposite();
 			g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, miniAlpha));
 			
-			renderMini(g, pixelSize, (int)mw, (int)mh);
+			renderMini(g, pixelSize, (int)miniw, (int)minih);
 			
 			g.setColor(Color.white);
-			g.drawRect(0, 0, (int)mw, (int)mh);
+			g.drawRect(0, 0, (int)miniw, (int)minih);
 			g.setColor(Color.blue);
-			g.drawRect((int)(l*mw), (int)(u*mh), (int)((r-l)*mw), (int)((d-u)*mh));
+			g.drawRect((int)(l*miniw), (int)(u*minih), (int)((r-l)*miniw), (int)((d-u)*minih));
 			
 			g.setComposite(oldComposite);
 			g.setStroke(oldStroke);

src/org/interreg/docexplore/gui/image/ImageViewInputListener.java

+package org.interreg.docexplore.gui.image;
+
+import java.awt.event.MouseEvent;
+import java.awt.geom.Point2D;
+
+public class ImageViewInputListener extends EditorViewInputListener
+{
+	ImageView view;
+
+	public ImageViewInputListener(ImageView view)
+	{
+		super(view);
+		
+		this.view = view;
+	}
+
+	Point2D f = new Point2D.Double(), p = new Point2D.Double();
+	@Override public void mousePressed(MouseEvent e)
+	{
+		if (view.miniw*view.minih > 0)
+			try 
+		{
+			f.setLocation(0, 0);
+			view.miniTransform.inverseTransform(e.getPoint(), p);
+			double x = p.getX()/view.miniw, y = p.getY()/view.minih;
+			if (x >= 0 && y >= 0 && x <= 1 && y <= 1)
+			{
+				view.setView(x*view.getImageWidth(), y*view.getImageHeight());
+				return;
+			}
+		}
+		catch (Exception ex) {}
+		super.mousePressed(e);
+	}
+}

src/org/interreg/docexplore/gui/image/NavView.java

@@ -103,6 +103,7 @@ public class NavView extends JPanel
 		repaint();
 	}
 	public void setView(NavView view) {setView(view.x0, view.y0, view.scale);}
+	public void setView(double x0, double y0) {setView(x0, y0, scale, rot);}
 	public void setView(double x0, double y0, double scale) {setView(x0, y0, scale, rot);}
 	public void setView(double x0, double y0, double scale, ViewRotation rot)
 	{

src/org/interreg/docexplore/gui/image/NavViewInputListener.java

@@ -46,7 +46,7 @@ public class NavViewInputListener implements MouseListener, MouseMotionListener,
 	boolean panning = false;
 	int panDownX = 0, panDownY = 0, panCurX = 0, panCurY = 0;
 	@Override public void mousePressed(MouseEvent e)
-	{System.out.println(view.toViewX(e.getX(), e.getY())+","+view.toViewY(e.getX(), e.getY()));
+	{
 		if ((e.getModifiers() & panningButton) != 0)
 		{
 			panning = true;

src/org/interreg/docexplore/manuscript/app/editors/PosterPageEditor.java

@@ -219,7 +219,8 @@ public class PosterPageEditor extends PageEditor
 		}
 		else super.drawImage(g, pixelSize);
 	}
-	
+	
+	AffineTransform miniOverlayTransform = new AffineTransform();
 	@Override protected void renderMini(Graphics2D g, double pixelSize, int mw, int mh)
 	{
 		if (!isPoster)
@@ -238,9 +239,9 @@ public class PosterPageEditor extends PageEditor
 			Stroke oldStroke = g.getStroke();
 			g.setStroke(new BasicStroke(getImageWidth()*2f/mw));
 			AffineTransform old = g.getTransform();
-			AffineTransform scaled = (AffineTransform)old.clone();
-			scaled.scale(mw*1./getImageWidth(), mh*1./getImageHeight());
-			g.setTransform(scaled);
+			miniOverlayTransform.setTransform(old);
+			miniOverlayTransform.scale(mw*1./getImageWidth(), mh*1./getImageHeight());
+			g.setTransform(miniOverlayTransform);
 			drawOverlay(g, pixelSize);
 			g.setTransform(old);
 			g.setStroke(oldStroke);