code cleanup

Author: hollaus

app/src/main/java/at/ac/tuwien/caa/docscan/CameraActivity.java

@@ -1,90 +1,51 @@
+/*********************************************************************************
+ *  DocScan is a Android app for document scanning.
+ *
+ *  Author:         Fabian Hollaus, Florian Kleber, Markus Diem
+ *  Organization:   TU Wien, Computer Vision Lab
+ *  Date created:   19. October 2016
+ *
+ *  This file is part of DocScan.
+ *
+ *  DocScan is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  DocScan is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with DocScan.  If not, see <http://www.gnu.org/licenses/>.
+ *********************************************************************************/
+
 package at.ac.tuwien.caa.docscan;
 
-import android.hardware.Camera;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 /**
- * Created by fabian on 19.10.2016.
+ * Class holding the paint view and the camera preview.
  */
 public class CameraPaintFragment extends Fragment {
 
-    private Camera mCamera;
-    private Camera.CameraInfo mInfo;
-
-    @Override
+   @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
-//        TempCallback c = (TempCallback) getActivity();
-//
-//        Camera camera = getCameraInstance(0);
-//        Camera.CameraInfo info = new Camera.CameraInfo();
-//        Camera.getCameraInfo(0, info);
-//
-//        // Get the rotation of the screen to adjust the preview image accordingly.
-//        int displayRotation = getActivity().getWindowManager().getDefaultDisplay().getRotation();
-//
-//        c.onCameraLoaded(camera, info, displayRotation);
-//
-//        mCamera = camera;
-//        mInfo = info;
-//
-//
-//        // retain this fragment
-//        setRetainInstance(true);
-    }
-
-    private Camera getCameraInstance(int cameraId) {
-        Camera c = null;
-        try {
-            c = Camera.open(cameraId); // attempt to get a Camera instance
-        } catch (Exception e) {
-//            // Camera is not available (in use or does not exist)
-//            Toast.makeText(this, "Camera " + cameraId + " is not available: " + e.getMessage(),
-//                    Toast.LENGTH_SHORT).show();
-        }
-        return c; // returns null if camera is unavailable
-    }
-
-
+   }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
 
-        // retain this fragment
-//        setRetainInstance(true);
-
         View view = inflater.inflate(R.layout.camera_paint_view, container, false);
 
-//        CameraPreview cameraPreview = (CameraPreview) view.findViewById(R.id.camera_view);
-//        int displayRotation = getActivity().getWindowManager().getDefaultDisplay().getRotation();
-//        cameraPreview.setCamera(mCamera, mInfo, displayRotation);
-
-//        Camera camera = getCameraInstance(0);
-//        Camera.CameraInfo info = new Camera.CameraInfo();
-//        Camera.getCameraInfo(0, info);
-//        cameraPreview.setCamera(camera, info, displayRotation);
-
-
-
-        // Inflate the layout for this fragment
         return view;
     }
 
-
-
-
-
-//    public interface TempCallback {
-//
-//        void onCameraLoaded(Camera camera, Camera.CameraInfo info, int displayRotation);
-//
-//    }
-
-
 }

app/src/main/java/at/ac/tuwien/caa/docscan/CameraPaintFragment.java

@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.view.View;
 import android.widget.FrameLayout;
 
 /**
@@ -62,14 +61,14 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
         }
 
-        final int count = getChildCount();
-        for (int i = 0; i < count; i++) {
-            final View v = getChildAt(i);
-
-            v.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(),
-                    MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(
-                    getMeasuredHeight(), MeasureSpec.EXACTLY));
-        }
+//        final int count = getChildCount();
+//        for (int i = 0; i < count; i++) {
+//            final View v = getChildAt(i);
+//
+//            v.measure(MeasureSpec.makeMeasureSpec(getMeasuredWidth(),
+//                    MeasureSpec.EXACTLY), MeasureSpec.makeMeasureSpec(
+//                    getMeasuredHeight(), MeasureSpec.EXACTLY));
+//        }
 
         mCameraPreviewCallback.onMeasuredDimensionChange(getMeasuredWidth(), getMeasuredHeight());