Changeset 60:88826a8c5728

Timestamp:

04/13/08 09:21:03 (4 years ago)

Author:

Harri Kaimio <harri@…>

Tags:

tip

Message:

Finalized wrking version of scan area selection dialog

• Use the area selected in when doing real scans
  

• Show a small "magnifying glass" area in preview pane to help precise
  selection
  

• Fixes & test cases to FixedPointNumber?
  

• etc.
  

Z

Location:

src

Files:

• main/pcapp/org/freecine/sane/FixedPointNumber.java (modified) (1 diff)
• main/pcapp/org/freecine/sane/SaneDevice.java (modified) (5 diffs)
• main/pcapp/org/freecine/swingui/PreviewPane.form (modified) (1 diff)
• main/pcapp/org/freecine/swingui/PreviewPane.java (modified) (8 diffs)
• main/pcapp/org/freecine/swingui/ScanPreviewDlg.form (modified) (3 diffs)
• main/pcapp/org/freecine/swingui/ScanPreviewDlg.java (modified) (9 diffs)
• main/pcapp/org/freecine/swingui/ScanPreviewTask.java (modified) (6 diffs)
• main/pcapp/org/freecine/swingui/ScanProgressDlg.java (modified) (5 diffs)
• main/pcapp/org/freecine/swingui/ScanTask.java (modified) (7 diffs)
• main/pcapp/org/freecine/swingui/resources/ScanPreviewDlg.properties (modified) (1 diff)
• main/pcapp/org/freecine/swingui/resources/ScanTask.properties (modified) (1 diff)
• test/pcapp/org/freecine/sane/TestFixedPointNumber.java (added)

src/main/pcapp/org/freecine/sane/FixedPointNumber.java

@@ -27 +27 @@
 
 /**
- *
- * @author harri
+ Fixed point number used when setting parameters for Sane.
+ 
+ Sane uses 32 bit fixed point number (with 16 bit integer, 16 bit fractional 
+ part for many parameters. This class provides conversions and basic arithmetic 
+ operations for those.
+ 
  */
-public class FixedPointNumber {
+public class FixedPointNumber implements Comparable {
+    
+    final static int SANE_FIXED_SCALE_SHIFT = 16;
+ 
+    /**
+     Value of the number, shifted left SANE_FIXED_SCALE_SHIFT bits
+     */
     private int val;
+    
+    /**
+     Creates a new fixed point number from the SANE internal representation of it
+     @param fpval
+     */
     public FixedPointNumber( int fpval ) {
         val = fpval;
     }
     
+    /**
+     Get the representation that Sane uses for this number
+     @return
+     */
     public int getVal() {
         return val;
     }
     
+    /**
+     Test for equality
+     @param o The object to test with
+     @return true if this object and o are equal, false otherwise
+     */
+    @Override
+    public boolean equals( Object o ) {
+        if ( o == this ) {
+            return true;
+        }
+        if ( !(o instanceof FixedPointNumber) ) {
+            return false;
+        }
+        FixedPointNumber f = (FixedPointNumber) o;
+        return f.val == val;
+    }
+
+    /**
+     Calculate hash code for this object
+     @return
+     */
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 67 * hash + this.val;
+        return hash;
+    }
+    
+    /**
+     Compare with another FixedPointNumber
+     @param o
+     @return
+     */
+    public int compareTo( Object o ) {
+        FixedPointNumber f = (FixedPointNumber) o;
+        if ( val > f.val ) {
+            return 1;
+        }
+        if ( val < f.val ) {
+            return -1;
+        }
+        return 0;
+    }
+    
+    /**
+     Add two fixed point numbers
+     @param f The number to add to this.
+     @return FixedPointNumber with value this+f
+     */     
+    public FixedPointNumber add( FixedPointNumber f ) {
+        return new FixedPointNumber( this.val + f.val );
+    }
+    
+    /**
+     Subtract two fixed point numbers
+     @param f The number to subtract from this.
+     @return FixedPointNumber with value this-f
+     */     
+    public FixedPointNumber subtract( FixedPointNumber f ) {
+        return new FixedPointNumber( this.val - f.val );
+    }
+    
+    /**
+     Convert this fixed point nubmer to double
+     @return double with value that is as close as possible to value of this.
+     */
+    public double toDouble() {
+        return (double)val / (double)( 1 << SANE_FIXED_SCALE_SHIFT );
+    }
+    
+    /**
+     Convert the number to string
+     @return
+     */
+    @Override
+    public String toString() {
+        int intPart = val >> SANE_FIXED_SCALE_SHIFT;
+        int fracPart = val & ( (1 << SANE_FIXED_SCALE_SHIFT) -1);
+        String str = "" + intPart;
+        if ( fracPart != 0 ) {
+            str += " " + fracPart + "/" + (1 << SANE_FIXED_SCALE_SHIFT );
+        }
+        return str;
+    }
+    
+    /**
+     Create a new fixed point number whose value is close to given double 
+     precision number
+     @param v
+     @return
+     */
+    public static FixedPointNumber valueOf( double v ) {
+        double v2 = v * (double)(1<<SANE_FIXED_SCALE_SHIFT);
+        return new FixedPointNumber( (int)v2 );        
+    }
 }

src/main/pcapp/org/freecine/sane/SaneDevice.java

@@ -101 +101 @@
             if ( desc.getType() == OptionType.SANE_TYPE_STRING ) {
                 if ( desc.size >= value.length() ) {
-                    int status = sane.sane_control_option(deviceHandle, id, 1, value, null );
+                    IntByReference info = new IntByReference();
+                    int status = sane.sane_control_option(deviceHandle, id, 1, value, info );
                     if ( status != 0 ) {
                         throw new SaneException( "Error setting option " + option + " to " + value );
+                    }
+                    // Check if options need to be reloaded
+                    if ( ( info.getValue() & 2 ) != 0 ) {
+                        initOptions();
                     }
                 } else {
@@ -126 +131 @@
             if ( desc.getType() == OptionType.SANE_TYPE_INT ) {
                 if ( desc.size == value.length * 4 ) {
-                    int status = sane.sane_control_option(deviceHandle, id, 1, value, null );
+                    IntByReference info = new IntByReference();
+                    int status = sane.sane_control_option(deviceHandle, id, 1, value, info );
                     if ( status != 0 ) {
                         throw new SaneException( "Error setting option " + option );
+                    }
+                    // Check if options need to be reloaded
+                    if ( ( info.getValue() & 2 ) != 0 ) {
+                        initOptions();
                     }
                 } else {
@@ -147 +157 @@
     }
     
-    public void setOption( String option, FixedPointNumber[] value ) throws SaneException {
+    public FixedPointNumber[] setOption( String option, FixedPointNumber[] value ) throws SaneException {
         if ( optionIds == null ) {
             initOptions();
         }
+        FixedPointNumber[] newValue = value;
         int id = -1;
         if ( optionIds.containsKey(option ) ) {
@@ -161 +172 @@
                 }
                 if ( desc.size == value.length * 4 ) {
-                    int status = sane.sane_control_option(deviceHandle, id, 1, v, null );
+                    IntByReference info = new IntByReference();
+                    int status = sane.sane_control_option(deviceHandle, id, 1, v, info );
                     if ( status != 0 ) {
                         throw new SaneException( "Error setting option " + option );
+                    }
+                    // Check if options need to be reloaded
+                    if ( ( info.getValue() & 2 ) != 0 ) {
+                        initOptions();
+                    }
+                    if ( ( info.getValue() & 1 ) != 0 ) {
+                        System.err.println( "Value modified :" );
+                        newValue = new FixedPointNumber[value.length];
+                        for ( int n = 0 ; n < v.length ; n++  ) {
+                            newValue[n] = new FixedPointNumber( v[n] );
+                        }
                     }
                 } else {
@@ -174 +197 @@
             throw new SaneException( "No option named " + option );
         }
-        
-    }
-    
-    public void setOption( String option, FixedPointNumber value ) throws SaneException {
+        return newValue;
+    }
+    
+    public FixedPointNumber setOption( String option, FixedPointNumber value ) throws SaneException {
         FixedPointNumber[] a = {value};
-        setOption( option, a );
+        return setOption( option, a )[0];
     }    
+
     
     public void startScan() throws SaneException {

src/main/pcapp/org/freecine/swingui/PreviewPane.form

@@ -9 +9 @@
     <EventHandler event="mouseReleased" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="formMouseReleased"/>
     <EventHandler event="mouseDragged" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="formMouseDragged"/>
+    <EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="formMouseMoved"/>
   </Events>
   <AuxValues>

src/main/pcapp/org/freecine/swingui/PreviewPane.java

@@ -56 +56 @@
     BufferedImage scaledImage;
     
+    int magnWidth = 100;
+    
     public void setPreviewImage( BufferedImage img ) {
         BufferedImage oldPreview = previewImage;
@@ -121 +123 @@
             }
             ((Graphics2D) g).drawRenderedImage( scaledImage, null );
-        }
-        
-        if ( selection != null ) {
+            
+            // Draw the magnification window
+            int imageX = (int)((double)lastMouseX / scale) - magnWidth / 2;
+            int imageY = (int)((double)lastMouseY / scale) - magnWidth / 2;
+            
+            imageX = Math.max( 0, imageX );
+            imageX = Math.min( previewImage.getWidth()-magnWidth, imageX );
+            imageY = Math.max( 0, imageY );
+            imageY = Math.min( previewImage.getHeight() - magnWidth, imageY );
+            BufferedImage magnImage = previewImage.getSubimage( imageX, imageY, magnWidth, magnWidth );
+            ((Graphics2D) g).drawImage( magnImage, null, 0, getHeight() - magnWidth );
+            
+        }
+        
+        if ( selection != null && scaledImage != null ) {
             // Calculate device space coordinates for the selection rectangle
-            double w = getWidth();
-            double h = getHeight();
+            double w = scaledImage.getWidth();
+            double h = scaledImage.getHeight();
             double tlx = w * (( selection.getMinX()-previewArea.getMinX() ) / previewArea.getWidth());
             double tly = h * (( selection.getMinY()-previewArea.getMinY() ) / previewArea.getHeight());
@@ -147 +161 @@
     }
     
-    /**
-     Calculate scaledIamge from previewImage so that it fits in the control
+    double scale = 1.0;
+    
+    /**
+     Calculate scaledIamge from previewImage so that it fits in the control. The
+     scale of scaledImage is stored in scale member.
      */
     private void scaleImage() {
@@ -158 +175 @@
         double xscale = (double)compWidth / (double) iw;
         double yscale = (double)compHeight / (double) ih;
-        double scale = Math.min( xscale, yscale );
+        scale = Math.min( xscale, yscale );
         AffineTransform xform = AffineTransform.getScaleInstance( scale, scale );
         AffineTransformOp xformOp = new AffineTransformOp( xform, null );
@@ -186 +203 @@
             public void mouseDragged(java.awt.event.MouseEvent evt) {
                 formMouseDragged(evt);
+            }
+            public void mouseMoved(java.awt.event.MouseEvent evt) {
+                formMouseMoved(evt);
             }
         });
@@ -217 +237 @@
     private void formMouseDragged(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseDragged
         log.entering("PreviewPane", "formMouseDragged");
+
+        lastMouseX = evt.getX();
+        lastMouseY = evt.getY();
+        
+        if ( scaledImage == null ) {
+            return;
+        }
         Point2D p1 = screenToDev( dragStartX, dragStartY );
         Point2D p2 = screenToDev( evt.getX(), evt.getY() );
@@ -227 +254 @@
     private void formMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseReleased
         log.entering( "PreviewPane", "formMouseReleased" );
+        if ( scaledImage == null ) {
+            return;
+        }
         Point2D p1 = screenToDev( dragStartX, dragStartY );
         Point2D p2 = screenToDev( evt.getX(), evt.getY() );
@@ -232 +262 @@
         s.add( p2 );
         setSelection( s );
+        log.severe( "new area " + s );
         log.exiting("PreviewPane", "formMouseDragged");
     }//GEN-LAST:event_formMouseReleased
-    
-    /**
-     Convert position from screen coordinates to scanner device coordinates
+
+    int lastMouseX = 0;
+    int lastMouseY = 0;
+    
+    private void formMouseMoved(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_formMouseMoved
+        lastMouseX = evt.getX();
+        lastMouseY = evt.getY();
+        repaint();
+    }//GEN-LAST:event_formMouseMoved
+    
+    /**
+     Convert position from screen coordinates to scanner device coordinates.
+     To call this function, the scaledImage must exist as it defines the mapping 
+     screen space coordinate system
      @param x
      @param y
      @return
      */
-    Point2D screenToDev( int x, int y ) {
-        double w = getWidth();
-        double h = getHeight();
+    private Point2D screenToDev( int x, int y ) {
+        double w = scaledImage.getWidth();
+        double h = scaledImage.getHeight();
         double devx = previewArea.getMinX() + previewArea.getWidth() * (x/w);
         double devy = previewArea.getMinY() + previewArea.getHeight() * (y/h);

src/main/pcapp/org/freecine/swingui/ScanPreviewDlg.form

@@ -26 +26 @@
               <EmptySpace max="-2" attributes="0"/>
               <Component id="previewPane" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="75" max="32767" attributes="0"/>
-              <Component id="startPreviewScanBtn" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="32767" attributes="0"/>
+              <Group type="103" groupAlignment="1" attributes="0">
+                  <Component id="startPreviewScanBtn" min="-2" max="-2" attributes="0"/>
+                  <Component id="okBtn" alignment="1" min="-2" max="-2" attributes="0"/>
+              </Group>
               <EmptySpace max="-2" attributes="0"/>
           </Group>
@@ -37 +40 @@
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="startPreviewScanBtn" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Group type="102" alignment="0" attributes="0">
+                      <Component id="startPreviewScanBtn" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="okBtn" min="-2" max="-2" attributes="0"/>
+                  </Group>
                   <Component id="previewPane" alignment="0" max="32767" attributes="0"/>
               </Group>
@@ -80 +87 @@
       </Properties>
     </Component>
+    <Component class="javax.swing.JButton" name="okBtn">
+      <Properties>
+        <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
+          <action class="org.freecine.swingui.ScanPreviewDlg" id="ok" methodName="ok"/>
+        </Property>
+        <Property name="name" type="java.lang.String" value="okBtn" noResource="true"/>
+      </Properties>
+    </Component>
   </SubComponents>
 </Form>

src/main/pcapp/org/freecine/swingui/ScanPreviewDlg.java

@@ -26 +26 @@
 package org.freecine.swingui;
 
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.concurrent.ExecutionException;
@@ -56 +57 @@
         initComponents();
     }
-
     /**
      The scanner used
@@ -79 +79 @@
         firePropertyChange( "scanner", oldScanner, s );
     }
+        
+    /**
+     Scan area
+     */
+    Rectangle2D scanArea;
+    
+    /**
+     Get the currently set scan area.
+     @return Rectangle describing currently selected scan area, in device 
+     coordinate units. The units are the same used by Sane back end for this type
+     of scanner (e.g. millimeters, not pixels)
+     */
+    public Rectangle2D getScanArea() {
+        return scanArea;
+    }
+    
+    /**
+     Set the scan area displayed in the dialog.
+     @param newArea New area, in device coordinate units (see getScanArea() for
+     more information.
+     */
+    public void setScanArea( Rectangle2D newArea ) {
+        Rectangle2D oldVal = scanArea;
+        scanArea = newArea;
+        ((PreviewPane)previewPane).setSelection( newArea );
+        firePropertyChange( "scanArea", oldVal, newArea );
+    }
+    
 
     /** This method is called from within the constructor to
@@ -90 +118 @@
         previewPane = new PreviewPane();
         startPreviewScanBtn = new javax.swing.JButton();
+        okBtn = new javax.swing.JButton();
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
@@ -111 +140 @@
         startPreviewScanBtn.setAction(actionMap.get("scanPreviewImage")); // NOI18N
         startPreviewScanBtn.setName("startPreviewScanBtn"); // NOI18N
+
+        okBtn.setAction(actionMap.get("ok")); // NOI18N
+        okBtn.setName("okBtn"); // NOI18N
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
@@ -119 +151 @@
                 .addContainerGap()
                 .addComponent(previewPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 75, Short.MAX_VALUE)
-                .addComponent(startPreviewScanBtn)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(startPreviewScanBtn)
+                    .addComponent(okBtn))
                 .addContainerGap())
         );
@@ -128 +162 @@
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-                    .addComponent(startPreviewScanBtn)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(startPreviewScanBtn)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(okBtn))
                     .addComponent(previewPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addContainerGap())
@@ -168 +205 @@
                 try {
                     ((PreviewPane) previewPane).setPreviewImage( t.get() );
+                    
+                    ((PreviewPane) previewPane).setPreviewArea( t.getPreviewArea() );
                 } catch ( InterruptedException ex ) {
                     log.log( Level.SEVERE, null, ex );
@@ -179 +218 @@
     }
 
+    /**
+     The OK button was pressed
+     */
+    @Action
+    public void ok() {
+        Rectangle2D oldArea = scanArea;
+        scanArea = ((PreviewPane)previewPane).getSelection();
+        setVisible( false );
+        firePropertyChange( "scanArea", oldArea, scanArea );
+    }
+
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton okBtn;
     private javax.swing.JPanel previewPane;
     private javax.swing.JButton startPreviewScanBtn;

src/main/pcapp/org/freecine/swingui/ScanPreviewTask.java

@@ -27 +27 @@
 
 import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorModel;
@@ -57 +59 @@
     private int TILE_WIDTH;
     
+    /**
+     Create a new preview task
+     @param app Application this task is associated with
+     @param dev ScanDevice to use
+     */
     public ScanPreviewTask( Application app, SaneDevice dev ) {
         super( app );
@@ -62 +69 @@
         log.setLevel(Level.FINE);
     }
-
+    
+    /**
+     Area of the preview scan, in device coordinates.
+     */
+    Rectangle2D previewArea = null;
+    
+    /**
+     Get the area of preview scan
+     @return Preview area, in device coordinates.
+     */
+    public Rectangle2D getPreviewArea() {
+        return previewArea;
+    }
+
+    /**
+     Do the actual scanning in background thread.
+     @return The scanned preview image.
+     @throws java.lang.Exception
+     */
     @Override
     protected BufferedImage doInBackground() throws Exception {
@@ -78 +103 @@
         dev.setOption( "mode", "Color" );
         dev.setOption( "depth", 16 );
-        dev.setOption( "resolution", 100 );
+        dev.setOption( "resolution", 200 );
         dev.setOption( "source", "Transparency Unit" );
         
         // Find out the maximum scanning area
-        int minX = -1;
-        int maxX = -1;
-        int minY = -1;
-        int maxY = -1;
+        FixedPointNumber minX = null;
+        FixedPointNumber maxX = null;
+        FixedPointNumber minY = null;
+        FixedPointNumber maxY = null;
         SaneOptionDescriptor xdesc = dev.getOptionDesc( "tl-x" );        
         switch ( xdesc.getConstraintType() ) {
             case SANE_CONSTRAINT_RANGE:
                 SaneRange r = (SaneRange) xdesc.getConstraints();
-                minX = r.min;
-                maxX = r.max;
+                minX = new FixedPointNumber( r.min );
+                maxX = new FixedPointNumber( r.max );
                 break;
             case SANE_CONSTRAINT_WORD_LIST:
                 int[] values = (int[]) xdesc.getConstraints();
-                minX = values[0];
-                maxX = values[values.length-1];
+                minX = new FixedPointNumber( values[0] );
+                maxX = new FixedPointNumber( values[values.length-1] );
                 break;
             default:
@@ -105 +130 @@
             case SANE_CONSTRAINT_RANGE:
                 SaneRange r = (SaneRange) ydesc.getConstraints();
-                minY = r.min;
-                maxY = r.max;
+                minY = new FixedPointNumber( r.min );
+                maxY = new FixedPointNumber( r.max );                
                 break;
             case SANE_CONSTRAINT_WORD_LIST:
                 int[] values = (int[]) ydesc.getConstraints();
-                minY = values[0];
-                maxY = values[values.length-1];
+                minY = new FixedPointNumber( values[0] );
+                maxY = new FixedPointNumber( values[values.length-1] );
                 break;
             default:
                 throw new SaneException( "Cannod determinen scan glass area" );
         }
-        dev.setOption( "tl-x", new FixedPointNumber( minX ) );
-        dev.setOption( "tl-y", new FixedPointNumber( minY ) );
-        dev.setOption( "br-x", new FixedPointNumber( maxX ) );
-        dev.setOption( "br-y", new FixedPointNumber( maxY ) );
-
+//        if ( maxX.toDouble() > 8 * 25.4 ) {
+//            maxX = FixedPointNumber.valueOf( 8 * 25.4 );
+//        }
+//        if ( maxY.toDouble() > 10 * 25.4 ) {
+//            maxY = FixedPointNumber.valueOf( 10 * 25.4 );
+//        }
+        minX = dev.setOption( "tl-x", minX );
+        minY = dev.setOption( "tl-y", minY );
+        maxX = dev.setOption( "br-x", maxX );
+        maxY = dev.setOption( "br-y", maxY );
+        previewArea = new Rectangle2D.Double( minX.toDouble(), minY.toDouble(), 
+                maxX.subtract(minX).toDouble(), maxY.subtract(minY).toDouble() );
+        
+        ScanParameter param = dev.getScanParameter();
+        System.out.println( "Scan parameters: " + param.getPixelsPerLine() + " x " + param.getLines() );
+        
         // Set gamma correction
         dev.setOption( "gamma-correction", "User defined" );
@@ -177 +213 @@
         }
 
+        dev.close();
         return image;
         

src/main/pcapp/org/freecine/swingui/ScanProgressDlg.java

@@ -36 +36 @@
 import org.freecine.sane.SaneException;
 import java.awt.Graphics;
+import java.awt.geom.Rectangle2D;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -247 +248 @@
 
         }
-        scanTask = new ScanTask( dev, filmMover, null, prj );
+        scanTask = new ScanTask( dev, filmMover, scanArea, prj );
         scanTask.addPropertyChangeListener( new PropertyChangeListener() {
 
@@ -350 +351 @@
      */
     public boolean isFilmMoverReady() {
-        return filmMover != null;
+        // return filmMover != null;
+        return true;
     }
     
@@ -372 +374 @@
     }
 
+    Rectangle2D scanArea = null;
+    
     /**
      Show the scan preview dialog
      */
-    @Action
+    @Action ( block=Task.BlockingScope.ACTION )
     public void adjustScanArea() {
         SaneDeviceDescriptor d = (SaneDeviceDescriptor) scannerCombo.getSelectedItem();
@@ -382 +386 @@
             ScanPreviewDlg dlg = new ScanPreviewDlg( this, false );
             dlg.setScanner( dev );
+            dlg.setScanArea( new Rectangle2D.Double( 30.0, 48.0, 160.0, 7.0 ) );
+            dlg.addPropertyChangeListener("scanArea", new PropertyChangeListener() {
+
+                public void propertyChange( PropertyChangeEvent ev ) {
+                    scanArea = (Rectangle2D) ev.getNewValue();
+                }
+            });
             dlg.setVisible( true );
+            
         } catch ( SaneException e ) {
             return;

src/main/pcapp/org/freecine/swingui/ScanTask.java

@@ -36 +36 @@
 import org.freecine.sane.ScanParameter;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.RenderingHints;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.ColorModel;
 import java.awt.image.DataBuffer;
@@ -44 +44 @@
 import java.awt.image.RenderedImage;
 import java.awt.image.SampleModel;
+import java.io.File;
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.logging.Logger;
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.stream.ImageOutputStream;
 import javax.media.jai.ImageLayout;
 import javax.media.jai.JAI;
@@ -60 +68 @@
 public class ScanTask extends Task<Void, Void> implements ScanAnalysisListener {
 
+    private static Logger log = Logger.getLogger(ScanTask.class.getName() );
     private SaneDevice dev;
-    private Rectangle scanArea;
+    private Rectangle2D scanArea;
     private Project prj;
     private FilmMover filmMover;
@@ -71 +80 @@
      @param prj the project in which scanned frames are added
      */
-    public ScanTask( SaneDevice dev, FilmMover mover, Rectangle scanArea, Project prj ) {
+    public ScanTask( SaneDevice dev, FilmMover mover, Rectangle2D scanArea, Project prj ) {
         super( Application.getInstance() );
         this.dev = dev;
@@ -106 +115 @@
         while ( true ) {
             PlanarImage img = scan();
+            saveImage(img, new File( "/tmp/testimg.tif" ) );
             img = TransposeDescriptor.create( img, TransposeDescriptor.ROTATE_90, null );
             if ( isCancelled() ) {
@@ -146 +156 @@
         dev.setOption( "mode", "Color" );
         dev.setOption( "depth", 16 );
-        dev.setOption( "tl-x", new FixedPointNumber( 30 << 16 ) );
-        dev.setOption( "tl-y", new FixedPointNumber( 48 << 16 ) );
-        dev.setOption( "br-x", new FixedPointNumber( 190 << 16 ) );
-        dev.setOption( "br-y", new FixedPointNumber( 55 << 16 ) );
+        FixedPointNumber top = FixedPointNumber.valueOf( scanArea.getMinY() );
+        FixedPointNumber left = FixedPointNumber.valueOf( scanArea.getMinX() );
+        FixedPointNumber bot = FixedPointNumber.valueOf( scanArea.getMaxY() );
+        FixedPointNumber right = FixedPointNumber.valueOf( scanArea.getMaxX() );
+        
+//        top = new FixedPointNumber( 48 << 16 );
+//        left = new FixedPointNumber( 30 << 16 );
+//        bot = new FixedPointNumber( 55 << 16 );
+//        right = new FixedPointNumber( 190 << 16 );
+
+        dev.setOption( "tl-x", left );
+        dev.setOption( "tl-y", top );
+        dev.setOption( "br-x", right );
+        dev.setOption( "br-y", bot );
         dev.setOption( "resolution", 4800 );
         dev.setOption( "source", "Transparency Unit" );
@@ -227 +247 @@
         
     }
-
+    private void saveImage( RenderedImage img, File file ) {
+        // Find a writer for that file extensions
+        // Try to determine the file type based on extension
+        String ftype = "jpg";
+        String imageFname = file.getName();
+        int extIndex = imageFname.lastIndexOf( "." ) + 1;
+        if ( extIndex > 0 ) {
+            ftype = imageFname.substring( extIndex );
+        }
+
+        ImageWriter writer = null;
+        Iterator iter = ImageIO.getImageWritersBySuffix( ftype );
+        writer = (ImageWriter) iter.next();
+
+        if ( writer != null ) {
+            ImageOutputStream ios = null;
+            try {
+                // Prepare output file
+                ios = ImageIO.createImageOutputStream( file );
+                writer.setOutput( ios );
+                // Set some parameters
+                ImageWriteParam param = writer.getDefaultWriteParam();
+                writer.write( null, new IIOImage( img, null, null ), param );
+
+                // Cleanup
+                ios.flush();
+
+            } catch ( IOException ex ) {
+                log.severe( "Error saving image " + file.getAbsolutePath() + ": " 
+                        + ex.getMessage() );
+            } finally {
+                if ( ios != null ) {
+                    try {
+                        ios.close();
+                    } catch ( IOException e ) {
+                        log.severe( "Error closing output stream: " + e.getMessage() );
+                    }
+                }
+                writer.dispose();
+            }
+        }
+    }
     /**
      Callback that is called by {@link ScanStrip} to inforrm about progress

src/main/pcapp/org/freecine/swingui/resources/ScanPreviewDlg.properties

@@ -3 +3 @@
 scanPreviewImage.Action.text=Scan Preview
 scanPreviewImage.Action.shortDescription=Scan a new preview image
+okBtn.text=jButton1
+ok.Action.shortDescription=Set the can area
+ok.Action.text=OK

src/main/pcapp/org/freecine/swingui/resources/ScanTask.properties

@@ -4 +4 @@
 initMessage = Initializing scanner
 scanProgressMessage = Strip %1$d: Scanning, %2$d of %3$d lines scanned...
-analysisProgressMessage = Strip %1$d: Analyzing image, %1$d of %2$d lines ready...
+analysisProgressMessage = Strip %1$d: Analyzing image, %2$d of %3$d lines ready...
 analysisCompleteMessage = Strip %1$d: Analysis complete, %2$d perforations found
 movingFilmMsg = Moving film...