タッチフォーカスの制御。

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/operation/OlympusPenAutoFocusControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/operation/OlympusPenAutoFocusControl.java
index e823b39..975d56f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/operation/OlympusPenAutoFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/operation/OlympusPenAutoFocusControl.java
@@ -68,8 +68,8 @@ public class OlympusPenAutoFocusControl
                     {
                         showFocusFrame(preFocusFrameRect, IAutoFocusFrameDisplay.FocusFrameStatus.Running, 0.0);
 
-                        int posX = (int) (Math.floor(point.x * 1000.0 * scaleX));
-                        int posY = (int) (Math.floor(point.y * 1000.0) * scaleY);
+                        int posX = (int) (Math.floor((point.x * scaleX)));
+                        int posY = (int) (Math.floor((point.y * scaleY)));
                         Log.v(TAG, "AF (" + posX + ", " + posY + ")");
                         String sendUrl = String.format(Locale.US, "%s%s&point=%04dx%04d", COMMUNICATION_URL, AF_FRAME_COMMAND, posX, posY);
                         String reply =  SimpleHttpClient.httpGetWithHeader(sendUrl, headerMap, null, TIMEOUT_MS);
@@ -78,7 +78,7 @@ public class OlympusPenAutoFocusControl
                             Log.v(TAG, "setTouchAFPosition() reply is null.");
                         }
 
-                        if (findTouchAFPositionResult(reply))
+                        if (findTouchAFPositionResult(reply, " [" + posX + "x" + posY +"]"))
                         {
                             // AF FOCUSED
                             Log.v(TAG, "lockAutoFocus() : FOCUSED");
@@ -90,7 +90,7 @@ public class OlympusPenAutoFocusControl
                             Log.v(TAG, "lockAutoFocus() : ERROR");
                             showFocusFrame(preFocusFrameRect, IAutoFocusFrameDisplay.FocusFrameStatus.Failed, 1.0);
                         }
-                        showFocusFrame(preFocusFrameRect, IAutoFocusFrameDisplay.FocusFrameStatus.Errored, 1.0);
+                        //showFocusFrame(preFocusFrameRect, IAutoFocusFrameDisplay.FocusFrameStatus.Errored, 1.0);
                     }
                     catch (Exception e)
                     {
@@ -120,41 +120,8 @@ public class OlympusPenAutoFocusControl
      */
     public void halfPressShutter(final boolean isPressed)
     {
-        Log.v(TAG, "halfPressShutter() : " + isPressed);
-        try
-        {
-            Thread thread = new Thread(new Runnable()
-            {
-                @Override
-                public void run()
-                {
-                    try
-                    {
-                        String status = (isPressed) ? "on" : "off";
-/*
-                        String reply = SimpleHttpClient.httpGet(camera.getCmdUrl() + "cam.cgi?mode=camctrl&type=touch&value=500/500&value2=" + status, TIMEOUT_MS);
-                        if (!reply.contains("ok"))
-                        {
-                            Log.v(TAG, "CENTER FOCUS (" + status + ") FAIL...");
-                        }
-                        else
-                        {
-                            indicator.onAfLockUpdate(isPressed);
-                        }
-*/
-                    }
-                    catch (Exception e)
-                    {
-                        e.printStackTrace();
-                    }
-                }
-            });
-            thread.start();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
+        // フォーカスのボタンを押したときは、AFを UNLOCKする。
+        unlockAutoFocus();
     }
 
     /**
@@ -243,10 +210,11 @@ public class OlympusPenAutoFocusControl
      *
      *
      */
-    private static boolean findTouchAFPositionResult(String replyXml)
+    private static boolean findTouchAFPositionResult(String replyXml, String position)
     {
         try
         {
+            Log.v(TAG, " REPLY : " + replyXml + " " + position);
             if (replyXml.contains("ok"))
             {
                 return (true);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenFocusControl.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenFocusControl.java
index 09a984f..9bffe44 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenFocusControl.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/OlympusPenFocusControl.java
@@ -17,7 +17,7 @@ public class OlympusPenFocusControl implements IFocusingControl
     private final OlympusPenAutoFocusControl afControl;
     private final IAutoFocusFrameDisplay frameDisplay;
 
-    public OlympusPenFocusControl(@NonNull final IAutoFocusFrameDisplay frameDisplayer, @NonNull final IIndicatorControl indicator)
+    OlympusPenFocusControl(@NonNull final IAutoFocusFrameDisplay frameDisplayer, @NonNull final IIndicatorControl indicator)
     {
         this.frameDisplay = frameDisplayer;
         afControl = new OlympusPenAutoFocusControl(frameDisplayer, indicator);

diff --git a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java
index 8409493..f3ab933 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java
+++ b/app/src/main/java/net/osdn/gokigen/a01d/camera/olympuspen/wrapper/status/OlympusPenCameraStatusWatcher.java
@@ -24,6 +24,7 @@ public class OlympusPenCameraStatusWatcher implements ICameraStatusWatcher, ICam
     private int focusingStatus = 0;
     private static final int ID_FRAME_SIZE = 1;
     private static final int ID_AF_FRAME_INFO = 2;
+    private static final int ID_ZOOM_LENS_INFO = 18;
 
 
     public OlympusPenCameraStatusWatcher()
@@ -111,6 +112,8 @@ public class OlympusPenCameraStatusWatcher implements ICameraStatusWatcher, ICam
                         checkFocused(buffer, position, length);
                         break;
 
+                    case ID_ZOOM_LENS_INFO:
+                        // レンズのズーム情報
                     case ID_FRAME_SIZE:
                     default:
                         // Log.v(TAG, " ID : " + id + "  LENGTH : " + length);
@@ -137,6 +140,7 @@ public class OlympusPenCameraStatusWatcher implements ICameraStatusWatcher, ICam
         {
             boolean focus = (status == 1);
             boolean isError = (status == 2);
+            //Log.v(TAG, "FOCUS : " + focus + "(" + isError + ") " + status);
             notifier.updateFocusedStatus(focus, isError);
             focusingStatus = status;
         }