Changeset 610

Timestamp:

12/12/13 11:30:56 (10 years ago)

Author:

jts21

Message:

Partial tiling implemented

Location:

trunk/src/org/expeditee

Files:

• io/WebParser.java (modified) (2 diffs)
• items/Picture.java (modified) (3 diffs)

trunk/src/org/expeditee/io/WebParser.java

@@ -468 +468 @@
                 }
                 
-                Text text = new Text(out.getName() + " " + width);
+                Text text = new Text("@i: " + out.getName() + " " + width);
                 text.setPosition(x, y);
 
@@ -475 +475 @@
                 float invScale = 1 / pic.getScale();
                 
+                // System.out.println("unscaled crop: " + cropStartX + " " + cropStartY + " " + cropEndX + " " + cropEndY);
+                // System.out.println("crop: " + cropStartX * invScale + " " + cropStartY * invScale + " " + cropEndX * invScale + " " + cropEndY * invScale);
+                
                 pic.setCrop((int)(cropStartX * invScale), (int)(cropStartY * invScale), (int)(cropEndX * invScale), (int)(cropEndY * invScale));
                 
-                System.out.println("width = " + width + "  source = " + pic.getSource().getText() + "  scale = " + pic.getScale());
+                // System.out.println("source = " + pic.getSource().getText());
                 
                 frame.addItem(pic);

trunk/src/org/expeditee/items/Picture.java

@@ -323 +323 @@
                 }
                 
-                int siw = (int) (iw * _scale);
-                int sih = (int) (ih * _scale);
-                
                 int dX1 = _source.getX();
                 int dY1 = _source.getY();
@@ -331 +328 @@
                 int dY2 = _source.getY() + getHeight();
                 
-                for(int x = dX1; x < dX2; x += siw) {
-                        for(int y = dY1; y < dY2; y += sih) {
-                                int endX = x + siw;
-                                if(endX > dX2) {
-                                        endX = dX2;
-                                }
-                                int endY = y + sih;
+                
+                int cropStartX = _start.x;
+                int cropEndX = _end.x;
+        if(cropEndX > iw) {
+                cropEndX = iw;
+        }
+                for(int x = dX1; x < dX2; ) {
+                        // end - start = (cropEnd - cropStart) * scale
+                        // => cropEnd = cropStart + (end - start) / scale
+                        int w = (int) ((cropEndX - cropStartX) * _scale);
+                        int endX = x + w;
+                        if(endX > dX2) {
+                                endX = dX2;
+                                cropEndX = cropStartX + (int) ((dX2 - x) / _scale);
+                        }
+                        
+                        int cropStartY = _start.y;
+                        int cropEndY = _end.y;
+                if(cropEndY > ih) {
+                        cropEndY = ih;
+                }
+                        for(int y = dY1; y < dY2; ) {
+                                int h = (int) ((cropEndY - cropStartY) * _scale);
+                                int endY = y + h;
                                 if(endY > dY2) {
                                         endY = dY2;
+                                        cropEndY = cropStartY + (int) ((dY2 - y) / _scale);
                                 }
-                                // TODO: handle partial tiling
-                                int cropEndX = _end.x;
-                                if(cropEndX > iw) {
-                                        cropEndX = iw;
-                                }
-                                int cropEndY = _end.y;
-                                if(cropEndY > ih) {
-                                        cropEndY = ih;
-                                }
-                                g.drawImage(_image, x, y, endX, endY, _start.x, _start.y, cropEndX, cropEndY, _imageObserver);
-                        }
+                                
+                                g.drawImage(_image, x, y, endX, endY, cropStartX, cropStartY, cropEndX, cropEndY, _imageObserver);
+                                
+                                cropStartY = 0;
+                                cropEndY = ih;
+                                
+                                y = endY;
+                        }
+                        
+                        cropStartX = 0;
+                        cropEndX = iw;
+                        
+                        x = endX;
                 }
         }
@@ -515 +532 @@
                 _start = new Point(startX, startY);
                 _end = new Point(endX, endY);
-                scaleCrop();
+                updateSource();
         }