Changeset 1469

Timestamp:

11/15/08 08:45:38 (7 weeks ago)

Author:

czue

Message:

Adding an image sniffer that polls the contents of a directory and updates the chooser.

Location:

branches/dev/j2merosa/org.javarosa.media.image/src/org/javarosa/media/image

Files:

• activity/ImageCaptureActivity.java (modified) (7 diffs)
• activity/ImageChooserActivity.java (modified) (5 diffs)
• utilities/FileUtility.java (modified) (1 diff)
• utilities/ImageSniffer.java (added)

branches/dev/j2merosa/org.javarosa.media.image/src/org/javarosa/media/image/activity/ImageCaptureActivity.java

@@ -55 +55 @@
         private int width;
         private int height;
+        private String fullName;
         
         public ImageCaptureActivity(IShell shell) {
@@ -60 +61 @@
                 display = JavaRosaServiceProvider.instance().getDisplay();
                 dataModel = new FileRMSUtility("image_store");
-                width = 640;
-                height = 480;
+                width = 960;
+                height = 720;
         }
 
@@ -131 +132 @@
                 // stick the picture in here. 
                 Hashtable table = new Hashtable();
-                BasicDataPointer p = new BasicDataPointer("Image", imageData);
+                FileDataPointer p = new FileDataPointer(fullName);
+                //BasicDataPointer p = new BasicDataPointer("Image", imageData);
                 table.put(IMAGE_KEY, p);
                 return table;
@@ -197 +199 @@
                         imageData = mVideoControl.getSnapshot("encoding=jpeg&quality=100&width=" + width + "&height=" + height);
                         //image = Image.createImage(jpg, 0, jpg.length);
+                        // Save to file no longer
+                        String fileName = "test" + System.currentTimeMillis();
+                        fullName = saveFile(fileName + ".jpg", imageData);
                         doFinish();
-                        // Save to file no longer
-                        //String fileName = "test" + System.currentTimeMillis();
-                        //boolean saved = saveFile(fileName + ".jpg", jpg);
+                        
                 } catch (Exception me) {
                         handleException(me);
@@ -221 +224 @@
                         jpg = mVideoControl.getSnapshot("encoding=jpeg&quality=100&width=" + width + "&height=" + height);
                         String fileName = "test" + System.currentTimeMillis();
-                        boolean saved = saveFile(fileName + ".jpg", jpg);
+                        boolean saved = saveFile(fileName + ".jpg", jpg) == "";
                         if (saved) {
                                 text += "Success!";
@@ -247 +250 @@
         }
         
-        private boolean saveFile(String filename, byte[] image) {
+        private String saveFile(String filename, byte[] image) {
                 // TODO 
                 String rootName = FileUtility.getDefaultRoot();
@@ -253 +256 @@
                 FileUtility.createDirectory(restorepath);
                 String fullName = restorepath + "/" + filename;
-                System.out.println("Image saved.");
-                return FileUtility.createFile(fullName, image);
-                // not sure why this was being done twice
+                if (FileUtility.createFile(fullName, image)) {
+                        System.out.println("Image saved.");     
+                        return fullName;        
+                } else {
+                        return "";
+                }
+                
         }
 

branches/dev/j2merosa/org.javarosa.media.image/src/org/javarosa/media/image/activity/ImageChooserActivity.java

@@ -20 +20 @@
 import org.javarosa.media.image.model.FileDataPointer;
 import org.javarosa.media.image.storage.FileRMSUtility;
+import org.javarosa.media.image.utilities.ImageSniffer;
 import org.javarosa.media.image.utilities.ImageUtility;
 
@@ -48 +49 @@
         private Command markCommand;
         private String currentKey;
+        private Thread snifferThread;
+        private ImageSniffer sniffer;
 
         public ImageChooserActivity(IShell shell) {
@@ -67 +70 @@
 
         public void destroy() {
-                // TODO Auto-generated method stub
-
+                sniffer.quit();
         }
 
@@ -83 +85 @@
                 Object o = globalContext.getElement(currentKey);
                 IDataPointer pointer = (IDataPointer) o;
+                addImageToUI(pointer);
+                updateView();
+        }
+
+        
+        private void updateView() {
+                display.setView(DisplayViewFactory.createView(mainForm));
+        }
+
+        public void setShell(IShell shell) {
+                this.shell = shell;
+
+        }
+
+        public void start(Context context) {
+                this.context = context;
+                mainForm = new Form("Image Chooser");
+                mainForm.addCommand(cancelCommand);
+                mainForm.addCommand(cameraCommand);
+                mainForm.addCommand(browseCommand);
+                mainForm.addCommand(returnCommand);
+                mainForm.addCommand(viewCommand);
+                mainForm.addCommand(markCommand);
+                mainForm.setCommandListener(this);
+
+                mainForm.append("Use the menu options to take pictures or browse.");
+              
+                // also create the sniffer
+                sniffer = new ImageSniffer("file://localhost/root1/photos/", this);
+                snifferThread = new Thread(sniffer);
+                snifferThread.start();
+                updateView();
+        }
+        
+        public synchronized void addImageToUI(IDataPointer pointer) {
                 try {
                         if (pointer != null) { 
@@ -95 +132 @@
                         
                 }
-                display.setView(DisplayViewFactory.createView(mainForm));
-        }
-
-        public void setShell(IShell shell) {
-                this.shell = shell;
-
-        }
-
-        public void start(Context context) {
-                this.context = context;
-                mainForm = new Form("Image Chooser");
-                mainForm.addCommand(cancelCommand);
-                mainForm.addCommand(cameraCommand);
-                mainForm.addCommand(browseCommand);
-                mainForm.addCommand(returnCommand);
-                mainForm.addCommand(viewCommand);
-                mainForm.addCommand(markCommand);
-                mainForm.setCommandListener(this);
-
-                display.setView(DisplayViewFactory.createView(mainForm));
-
-        }
+        }
+
 
         private FileDataPointer captureNewImage() {

branches/dev/j2merosa/org.javarosa.media.image/src/org/javarosa/media/image/utilities/FileUtility.java

@@ -69 +69 @@
         public static Enumeration listDirectory(String directoryPath) {
                 FileConnection dir = null;
+                System.out.println("Listing the contents of: " + directoryPath);
                 try {
                         dir = (FileConnection) Connector.open(directoryPath);