Skip to content
This repository was archived by the owner on Jul 22, 2020. It is now read-only.

House keeping #1

Open
muff1nman wants to merge 1 commit into
base: master
Choose a base branch
from
Open

House keeping #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
.project
.settings/
.lib/
target
Binary file removed interfacesdk-0.0.5-jar-with-dependencies.jar
View file
Open in desktop
Binary file not shown.
36 changes: 22 additions & 14 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,26 @@
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>processing</groupId>
<artifactId>core</artifactId>
<version>1.5.1</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.OpenNI</groupId>
<artifactId>OpenNI</artifactId>
<version>1.5.4.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</dependency>
<dependency>
<groupId>edu.mines.acmX.exhibit</groupId>
<artifactId>interfacesdk</artifactId>
<version>0.1.1</version>
<scope>compile</scope>
</dependency>

</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
22 changes: 12 additions & 10 deletions src/main/java/edu/mines/aashah/modules/SimpleModule/SimpleModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
import java.util.Map;
import java.util.Set;

import processing.core.PApplet;
import processing.core.PConstants;
import processing.core.PImage;
import edu.mines.acmX.exhibit.input_services.events.HandReceiver;
import edu.mines.acmX.exhibit.input_services.hardware.BadFunctionalityRequestException;
import edu.mines.acmX.exhibit.input_services.hardware.DeviceConnectionException;
import edu.mines.acmX.exhibit.input_services.hardware.HardwareManager;
import edu.mines.acmX.exhibit.input_services.hardware.HardwareManagerManifestException;
import edu.mines.acmX.exhibit.input_services.hardware.UnknownDriverRequest;
import edu.mines.acmX.exhibit.input_services.hardware.devicedata.HandTrackerInterface;
import edu.mines.acmX.exhibit.input_services.hardware.devicedata.RGBImageInterface;
import edu.mines.acmX.exhibit.input_services.hardware.drivers.InvalidConfigurationFileException;
import edu.mines.acmX.exhibit.module_management.modules.ProcessingModule;
import edu.mines.acmX.exhibit.stdlib.graphics.Coordinate3D;
import edu.mines.acmX.exhibit.stdlib.graphics.HandPosition;
import edu.mines.acmX.exhibit.stdlib.input_processing.imaging.RGBImageUtilities;
import edu.mines.acmX.exhibit.stdlib.input_processing.receivers.HandReceiver;

/**
* A simple module example to demonstrate communicating with the
Expand Down Expand Up @@ -59,11 +59,7 @@ public void setup() {
} catch (HardwareManagerManifestException e) {
System.out.println("Error in the HardwareManager manifest file.");
e.printStackTrace();
} catch (DeviceConnectionException e) {
System.out.println( "No devices are currently connected to " +
"retrieve data from.");
e.printStackTrace();
}
}

/*
* To actually retrieve the driver, such that we can receive
Expand All @@ -80,6 +76,12 @@ public void setup() {
} catch (BadFunctionalityRequestException e) {
System.out.println("Functionality unknown (may not be supported)");
e.printStackTrace();
} catch (UnknownDriverRequest e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (InvalidConfigurationFileException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}

/*
Expand Down Expand Up @@ -183,11 +185,11 @@ public MyHandReceiver() {
}

public void handCreated(HandPosition handPos) {
handPositions.put(handPos.id, handPos.position);
handPositions.put(handPos.getId(), handPos.getPosition());
}

public void handUpdated(HandPosition handPos) {
handPositions.put(handPos.id, handPos.position);
handPositions.put(handPos.getId(), handPos.getPosition());
}

public void handDestroyed(int id) {
Expand Down
Binary file added src/main/resources/images/icon.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/main/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest
package="edu.mines.aashah.modules.SimpleModule"
class="SimpleModule"
icon="icon.jpg"
title="Simple Module"
author="Aakash Shah"
version="0.0.1" >
<uses-sdk
minSdkVersion="0"
targetSdkVersion="0" />

<inputs>
<input input-type="handtracking" />
<input input-type="rgbimage" />
</inputs>
<requires-module>

</requires-module>
</manifest>