From 33502c86acec0ad955a419d5f053a5bda5020872 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 4 Feb 2013 17:26:43 +0400 Subject: [PATCH] Tutorial 1 renamed --- samples/android/CMakeLists.txt | 2 +- .../.classpath | 0 .../.project | 0 .../.settings/org.eclipse.jdt.core.prefs | 0 .../AndroidManifest.xml | 0 .../CMakeLists.txt | 2 +- .../res/drawable/icon.png | Bin .../res/layout/tutorial1_surface_view.xml | 0 .../res/values/strings.xml | 2 +- .../org/opencv/samples/tutorial1/Sample1Java.java | 2 +- 10 files changed, 4 insertions(+), 4 deletions(-) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/.classpath (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/.project (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/.settings/org.eclipse.jdt.core.prefs (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/AndroidManifest.xml (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/CMakeLists.txt (82%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/res/drawable/icon.png (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/res/layout/tutorial1_surface_view.xml (100%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/res/values/strings.xml (52%) rename samples/android/{tutorial-1-addopencv => tutorial-1-camerapreview}/src/org/opencv/samples/tutorial1/Sample1Java.java (98%) diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt index b1cb628338..3829419d24 100644 --- a/samples/android/CMakeLists.txt +++ b/samples/android/CMakeLists.txt @@ -11,7 +11,7 @@ add_subdirectory(face-detection) add_subdirectory(image-manipulations) add_subdirectory(color-blob-detection) -add_subdirectory(tutorial-1-addopencv) +add_subdirectory(tutorial-1-camerapreview) add_subdirectory(tutorial-2-opencvcamera) add_subdirectory(tutorial-3-native) add_subdirectory(tutorial-4-mixed) diff --git a/samples/android/tutorial-1-addopencv/.classpath b/samples/android/tutorial-1-camerapreview/.classpath similarity index 100% rename from samples/android/tutorial-1-addopencv/.classpath rename to samples/android/tutorial-1-camerapreview/.classpath diff --git a/samples/android/tutorial-1-addopencv/.project b/samples/android/tutorial-1-camerapreview/.project similarity index 100% rename from samples/android/tutorial-1-addopencv/.project rename to samples/android/tutorial-1-camerapreview/.project diff --git a/samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs b/samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs similarity index 100% rename from samples/android/tutorial-1-addopencv/.settings/org.eclipse.jdt.core.prefs rename to samples/android/tutorial-1-camerapreview/.settings/org.eclipse.jdt.core.prefs diff --git a/samples/android/tutorial-1-addopencv/AndroidManifest.xml b/samples/android/tutorial-1-camerapreview/AndroidManifest.xml similarity index 100% rename from samples/android/tutorial-1-addopencv/AndroidManifest.xml rename to samples/android/tutorial-1-camerapreview/AndroidManifest.xml diff --git a/samples/android/tutorial-1-addopencv/CMakeLists.txt b/samples/android/tutorial-1-camerapreview/CMakeLists.txt similarity index 82% rename from samples/android/tutorial-1-addopencv/CMakeLists.txt rename to samples/android/tutorial-1-camerapreview/CMakeLists.txt index eb5bc79826..77ed5bce8f 100644 --- a/samples/android/tutorial-1-addopencv/CMakeLists.txt +++ b/samples/android/tutorial-1-camerapreview/CMakeLists.txt @@ -1,4 +1,4 @@ -set(sample example-tutorial-1-addopencv) +set(sample example-tutorial-1-camerapreview) add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET}) if(TARGET ${sample}) diff --git a/samples/android/tutorial-1-addopencv/res/drawable/icon.png b/samples/android/tutorial-1-camerapreview/res/drawable/icon.png similarity index 100% rename from samples/android/tutorial-1-addopencv/res/drawable/icon.png rename to samples/android/tutorial-1-camerapreview/res/drawable/icon.png diff --git a/samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml b/samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml similarity index 100% rename from samples/android/tutorial-1-addopencv/res/layout/tutorial1_surface_view.xml rename to samples/android/tutorial-1-camerapreview/res/layout/tutorial1_surface_view.xml diff --git a/samples/android/tutorial-1-addopencv/res/values/strings.xml b/samples/android/tutorial-1-camerapreview/res/values/strings.xml similarity index 52% rename from samples/android/tutorial-1-addopencv/res/values/strings.xml rename to samples/android/tutorial-1-camerapreview/res/values/strings.xml index c5e8998839..fa803da041 100644 --- a/samples/android/tutorial-1-addopencv/res/values/strings.xml +++ b/samples/android/tutorial-1-camerapreview/res/values/strings.xml @@ -1,4 +1,4 @@ - OCV T1 Add OpenCV + OCV T1 Camera Preview diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java similarity index 98% rename from samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java rename to samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java index 1fbac34fef..9e84ef71bb 100644 --- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1Java.java +++ b/samples/android/tutorial-1-camerapreview/src/org/opencv/samples/tutorial1/Sample1Java.java @@ -88,7 +88,7 @@ public class Sample1Java extends Activity implements CvCameraViewListener2 { @Override public boolean onCreateOptionsMenu(Menu menu) { Log.i(TAG, "called onCreateOptionsMenu"); - mItemSwitchCamera = menu.add("Switch camera"); + mItemSwitchCamera = menu.add("Toggle Native/Java camera"); return true; }