From d067dc5a0517892cedd8afe3fe5e76a3ab114842 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 11 Feb 2013 11:36:12 +0400 Subject: [PATCH] Code review notes fixed. --- .../tutorial-1-camerapreview/AndroidManifest.xml | 2 +- .../tutorial-1-camerapreview/res/values/strings.xml | 2 +- .../{Sample1Java.java => Tutorial1Activity.java} | 4 ++-- .../tutorial-2-mixedprocessing/AndroidManifest.xml | 2 +- .../android/tutorial-2-mixedprocessing/CMakeLists.txt | 2 +- .../tutorial-2-mixedprocessing/jni/jni_part.cpp | 4 ++-- ...ple2MixedProcessing.java => Tutorial2Activity.java} | 4 ++-- .../tutorial-3-cameracontrol/AndroidManifest.xml | 2 +- .../res/layout/tutorial3_surface_view.xml | 2 +- ...ample3CameraControl.java => Tutorial3Activity.java} | 10 +++++----- .../{SampleJavaCameraView.java => Tutorial3View.java} | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) rename samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/{Sample1Java.java => Tutorial1Activity.java} (97%) rename samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/{Sample2MixedProcessing.java => Tutorial2Activity.java} (97%) rename samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/{Sample3CameraControl.java => Tutorial3Activity.java} (93%) rename samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/{SampleJavaCameraView.java => Tutorial3View.java} (91%) diff --git a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml index 7732f282c8..47d45ed374 100644 --- a/samples/android/tutorial-1-camerapreview/AndroidManifest.xml +++ b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-1-camerapreview/res/values/strings.xml b/samples/android/tutorial-1-camerapreview/res/values/strings.xml index fa803da041..b7bea7d517 100644 --- a/samples/android/tutorial-1-camerapreview/res/values/strings.xml +++ b/samples/android/tutorial-1-camerapreview/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T1 Camera Preview + OCV T1 Preview diff --git a/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java similarity index 97% rename from samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java rename to samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java index 9e84ef71bb..cbac1649bc 100644 --- a/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Tutorial1Activity.java @@ -17,7 +17,7 @@ import android.view.SurfaceView; import android.view.WindowManager; import android.widget.Toast; -public class Sample1Java extends Activity implements CvCameraViewListener2 { +public class Tutorial1Activity extends Activity implements CvCameraViewListener2 { private static final String TAG = "OCVSample::Activity"; private CameraBridgeViewBase mOpenCvCameraView; @@ -41,7 +41,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { } }; - public Sample1Java() { + public Tutorial1Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } diff --git a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml index 5c6e487359..795dd204b0 100644 --- a/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml +++ b/samples/android/tutorial-2-mixedprocessing/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt index bf62514d92..e8771ede1a 100644 --- a/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt +++ b/samples/android/tutorial-2-mixedprocessing/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-2-nativeprocessing) +set(sample example-tutorial-2-mixedprocessing) if(BUILD_FAT_JAVA_LIB) set(native_deps opencv_java) diff --git a/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp index d5d4e239c5..e7ed75d213 100644 --- a/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp +++ b/samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp @@ -8,9 +8,9 @@ using namespace std; using namespace cv; extern "C" { -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Sample2NativeProcessing_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tuturial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba); -JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Sample2NativeProcessing_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) +JNIEXPORT void JNICALL Java_org_opencv_samples_tutorial2_Tutorial2Activity_FindFeatures(JNIEnv*, jobject, jlong addrGray, jlong addrRgba) { Mat& mGr = *(Mat*)addrGray; Mat& mRgb = *(Mat*)addrRgba; diff --git a/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java similarity index 97% rename from samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java rename to samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java index c56fa87e38..eb84a1ec61 100644 --- a/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Sample2MixedProcessing.java +++ b/samples/android/tutorial-2-mixedprocessing/src/org/opencv/samples/tutorial2/Tutorial2Activity.java @@ -17,7 +17,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.WindowManager; -public class Sample2MixedProcessing extends Activity implements CvCameraViewListener2 { +public class Tutorial2Activity extends Activity implements CvCameraViewListener2 { private static final String TAG = "OCVSample::Activity"; private static final int VIEW_MODE_RGBA = 0; @@ -58,7 +58,7 @@ public class Sample2MixedProcessing extends Activity implements CvCameraViewList } }; - public Sample2MixedProcessing() { + public Tutorial2Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } diff --git a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml index fe7335449b..da90f95d86 100644 --- a/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml +++ b/samples/android/tutorial-3-cameracontrol/AndroidManifest.xml @@ -9,7 +9,7 @@ android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar.Fullscreen" > - diff --git a/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml index dde812543d..79fef4eae4 100644 --- a/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml +++ b/samples/android/tutorial-3-cameracontrol/res/layout/tutorial3_surface_view.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - mResolutionList; private MenuItem[] mEffectMenuItems; private SubMenu mColorEffectsMenu; @@ -46,7 +46,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen { Log.i(TAG, "OpenCV loaded successfully"); mOpenCvCameraView.enableView(); - mOpenCvCameraView.setOnTouchListener(Sample3CameraControl.this); + mOpenCvCameraView.setOnTouchListener(Tutorial3Activity.this); } break; default: { @@ -56,7 +56,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen } }; - public Sample3CameraControl() { + public Tutorial3Activity() { Log.i(TAG, "Instantiated new " + this.getClass()); } @@ -69,7 +69,7 @@ public class Sample3CameraControl extends Activity implements CvCameraViewListen setContentView(R.layout.tutorial3_surface_view); - mOpenCvCameraView = (SampleJavaCameraView) findViewById(R.id.tutorial3_activity_java_surface_view); + mOpenCvCameraView = (Tutorial3View) findViewById(R.id.tutorial3_activity_java_surface_view); mOpenCvCameraView.setVisibility(SurfaceView.VISIBLE); diff --git a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java similarity index 91% rename from samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java rename to samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java index 38328a204d..04c163ff88 100644 --- a/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/SampleJavaCameraView.java +++ b/samples/android/tutorial-3-cameracontrol/src/org/opencv/samples/tutorial3/Tutorial3View.java @@ -14,11 +14,11 @@ import android.hardware.Camera.Size; import android.util.AttributeSet; import android.util.Log; -public class SampleJavaCameraView extends JavaCameraView { +public class Tutorial3View extends JavaCameraView { - private static final String TAG = "Sample::SampleJavaCameraView"; + private static final String TAG = "Sample::Tutorial3View"; - public SampleJavaCameraView(Context context, AttributeSet attrs) { + public Tutorial3View(Context context, AttributeSet attrs) { super(context, attrs); }