Skip to content

E
Ear recognition
Commit 58ba81e7 authored by Josejulio Martínez Magaña's avatar Josejulio Martínez Magaña
Browse files
Options

Refactors the code a bit to remove unused code. 

Adds the keystore.
parent 5ec8178a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 409 additions and 620 deletions
app/app.iml
View file @ 58ba81e7
......@@ -92,6 +92,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
<orderEntry type="module" module-name="openCVLibrary2411" exported="" />
</component>
......
app/build.gradle
View file @ 58ba81e7
......@@ -23,4 +23,5 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:22.0.0'
compile project(':openCVLibrary2411')
compile 'com.parse.bolts:bolts-android:1.2.1'
}
app/src/main/AndroidManifest.xml
View file @ 58ba81e7
......@@ -21,7 +21,7 @@
</intent-filter>
</activity> -->
<activity
android:name=".CameraActivity"
android:name=".MainActivity"
android:label="@string/app_name"
android:screenOrientation="portrait">
<intent-filter>
......
app/src/main/java/com/aluxoft/test/TestConstants.java 0 → 100644
View file @ 58ba81e7
/**
* Created by josejuliomartinez on 24/09/15.
*/
package com.aluxoft.test;
public class TestConstants {
// ----- For testing purposes ----------------------------------------
static final String image1 = "/storage/emulated/0/DCIM/Camera/000_down_ear.jpg";
static final String image2 = "/storage/emulated/0/DCIM/Camera/001_front_ear.jpg";
static final String image3 = "/storage/emulated/0/DCIM/Camera/000_front_ear.jpg";
static final String image4 = "/storage/emulated/0/DCIM/Camera/test_1.png";
static final String image5 = "/storage/emulated/0/DCIM/Camera/test_3.png";
static final String image6 = "/storage/emulated/0/DCIM/Camera/test_2.png";
static final String image_patty_01 = "/storage/emulated/0/DCIM/Camera/PATTY_01.jpg";
static final String image_patty_02 = "/storage/emulated/0/DCIM/Camera/PATTY_02.jpg";
static final String image_elena_01 = "/storage/emulated/0/DCIM/Camera/ELENA_01.jpg";
static final String image_elena_02 = "/storage/emulated/0/DCIM/Camera/ELENA_02.jpg";
// ---------------------------------------------------------------------
}
app/src/main/res/layout/activity_camera.xml deleted 100644 → 0
View file @ 5ec8178a
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="wrap_content" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
android:id="@+id/MainActivity">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Capture First ear"
android:id="@+id/button"
android:layout_marginTop="47dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignRight="@+id/button2"
android:layout_alignEnd="@+id/button2" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Capture Second ear"
android:id="@+id/button2"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/imageView"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Capture ear to identify"
android:id="@+id/toidentify"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/imageView2"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView"
android:layout_below="@+id/button"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignRight="@+id/button"
android:layout_alignEnd="@+id/button"
android:maxHeight="150dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView2"
android:layout_below="@+id/button2"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignRight="@+id/button2"
android:layout_alignEnd="@+id/button2"
android:maxHeight="150dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView3"
android:layout_below="@+id/toidentify"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignRight="@+id/button2"
android:layout_alignEnd="@+id/button2"
android:maxHeight="150dp" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Identify"
android:id="@+id/button3"
android:layout_below="@+id/imageView3"
android:layout_alignParentLeft="true" />
</RelativeLayout>
</ScrollView>
\ No newline at end of file
app/src/main/res/layout/activity_main.xml
View file @ 58ba81e7
......@@ -13,7 +13,7 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cargar primera imagen"
android:text="Capture First ear"
android:id="@+id/button"
android:layout_marginTop="47dp"
android:layout_alignParentTop="true"
......@@ -25,13 +25,23 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cargar segunda imagen"
android:text="Capture Second ear"
android:id="@+id/button2"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/imageView"/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Capture ear to identify"
android:id="@+id/toidentify"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/imageView2"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -54,12 +64,23 @@
android:layout_alignEnd="@+id/button2"
android:maxHeight="150dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView3"
android:layout_below="@+id/toidentify"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignRight="@+id/button2"
android:layout_alignEnd="@+id/button2"
android:maxHeight="150dp" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Procesar"
android:text="Identify"
android:id="@+id/button3"
android:layout_below="@+id/imageView2"
android:layout_below="@+id/imageView3"
android:layout_alignParentLeft="true" />
......
keystore.jks 0 → 100644
View file @ 58ba81e7
File added
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment