potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Continued Android samples renaming

Browse Source
This commit is contained in:
Andrey Kamaev
2011-07-15 16:29:10 +00:00
parent b1ed277110
commit 8288cc108d
29 changed files with 44 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/tutorial-2-opencvcamera/.project
+3 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Sample 3 Native Camera</name>
<name>Tutorial 1 Basic - 2. Use OpenCV Camera</name>
<comment></comment>
<projects>
</projects>
@@ -32,9 +32,9 @@
</natures>
<linkedResources>
<link>
<name>opencv2.3.1_src</name>
<name>OpenCV-2.3.1_src</name>
<type>2</type>
<locationURI>_android_opencv2_3_1_d2471b5d/src</locationURI>
<locationURI>_android_OpenCV_2_3_1_df28900a/src</locationURI>
</link>
</linkedResources>
</projectDescription>
samples/android/tutorial-2-opencvcamera/AndroidManifest.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.opencv.samples.s3"
package="org.opencv.samples.tutorial2"
android:versionCode="1"
android:versionName="1.0">
@@ -11,7 +11,7 @@
android:anyDensity="true" />
<application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="Sample3NativeCamera"
<activity android:name="Sample2NativeCamera"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:configChanges="keyboardHidden|orientation">
samples/android/tutorial-2-opencvcamera/res/values/strings.xml
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Sample 3: Native Camera</string>
<string name="app_name">Tutorial 1 Basic - 2. Use OpenCV Camera</string>
</resources>
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3NativeCamera.java → samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2NativeCamera.java
+4 -4
View File
@@ -1,4 +1,4 @@
package org.opencv.samples.s3;
package org.opencv.samples.tutorial2;
import android.app.Activity;
import android.os.Bundle;
@@ -7,7 +7,7 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.Window;
public class Sample3NativeCamera extends Activity {
public class Sample2NativeCamera extends Activity {
private static final String TAG = "Sample::Activity";
public static final int VIEW_MODE_RGBA = 0;
@@ -24,7 +24,7 @@ public class Sample3NativeCamera extends Activity {
public static int viewMode = VIEW_MODE_RGBA;
public Sample3NativeCamera() {
public Sample2NativeCamera() {
Log.i(TAG, "Instantiated new " + this.getClass());
}
@@ -34,7 +34,7 @@ public class Sample3NativeCamera extends Activity {
Log.i(TAG, "onCreate");
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(new Sample3View(this));
setContentView(new Sample2View(this));
}
@Override
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/Sample3View.java → samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
+9 -9
View File
@@ -1,4 +1,4 @@
package org.opencv.samples.s3;
package org.opencv.samples.tutorial2;
import org.opencv.*;
@@ -6,12 +6,12 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.view.SurfaceHolder;
class Sample3View extends SampleViewBase {
class Sample2View extends SampleViewBase {
private Mat mRgba;
private Mat mGray;
private Mat mIntermediateMat;
public Sample3View(Context context) {
public Sample2View(Context context) {
super(context);
}
@@ -29,27 +29,27 @@ class Sample3View extends SampleViewBase {
@Override
protected Bitmap processFrame(VideoCapture capture) {
switch (Sample3NativeCamera.viewMode) {
case Sample3NativeCamera.VIEW_MODE_GRAY:
switch (Sample2NativeCamera.viewMode) {
case Sample2NativeCamera.VIEW_MODE_GRAY:
capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME);
imgproc.cvtColor(mGray, mRgba, imgproc.CV_GRAY2RGBA, 4);
break;
case Sample3NativeCamera.VIEW_MODE_RGBA:
case Sample2NativeCamera.VIEW_MODE_RGBA:
capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
core.putText(mRgba, "OpenCV + Android", new Point(10, 100), 3/* CV_FONT_HERSHEY_COMPLEX */, 2, new Scalar(255, 0, 0, 255), 3);
break;
case Sample3NativeCamera.VIEW_MODE_CANNY:
case Sample2NativeCamera.VIEW_MODE_CANNY:
capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME);
imgproc.Canny(mGray, mIntermediateMat, 80, 100);
imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4);
break;
case Sample3NativeCamera.VIEW_MODE_SOBEL:
case Sample2NativeCamera.VIEW_MODE_SOBEL:
capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME);
imgproc.Sobel(mGray, mIntermediateMat, CvType.CV_8U, 1, 1);
core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 8);
imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4);
break;
case Sample3NativeCamera.VIEW_MODE_BLUR:
case Sample2NativeCamera.VIEW_MODE_BLUR:
capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
imgproc.blur(mRgba, mRgba, new Size(15, 15));
break;
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/s3/SampleViewBase.java → samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/SampleViewBase.java
+1 -1
View File
@@ -1,4 +1,4 @@
package org.opencv.samples.s3;
package org.opencv.samples.tutorial2;
import java.util.List;