* Removing lvdemo.c. Only need to build the dll

* Much improved error handling, better and cleaner VI's and wrapper functionality
* Now uses IMAQ for image processing. Much more extensive library for machine vision.

Signed-off-By: Ryan Gordon <[email protected]>

Author: RyanGordon

wrappers/labview/CMakeLists.txt

@@ -2,7 +2,6 @@
 # C Labview Interface
 ######################################################################################
 set_source_files_properties(libfreenect_lv.c PROPERTIES LANGUAGE CXX)
-set_source_files_properties(lvdemo.c PROPERTIES LANGUAGE CXX)
 
 add_library (freenect_lv SHARED libfreenect_lv.c)
 set_target_properties (freenect_lv PROPERTIES
@@ -14,28 +13,4 @@ target_link_libraries (freenect_lv freenect freenect_sync)
 install (TARGETS freenect_lv
   DESTINATION "${PROJECT_LIBRARY_INSTALL_DIR}")
 install (FILES "libfreenect_lv.h"
-  DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
-
-  set(THREADS_USE_PTHREADS_WIN32 true)
-  find_package(Threads REQUIRED)
-
-  include_directories(${THREADS_PTHREADS_INCLUDE_DIR})
-
-  find_package(Threads REQUIRED)
-  find_package(OpenGL REQUIRED)
-  find_package(GLUT REQUIRED)
-
-  include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${USB_INCLUDE_DIRS})
-
-  if (WIN32)
-    set(MATH_LIB "")
-  else(WIN32)
-    set(MATH_LIB "m")
-  endif()
-
-add_executable(lvdemo lvdemo.c)
-
-target_link_libraries(lvdemo freenect freenect_sync freenect_lv ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
-
-install (TARGETS lvdemo
-  DESTINATION bin)
+  DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})

wrappers/labview/README

@@ -1,19 +1,19 @@
 General information:
-These drivers are still very very experimental and while they work, they are not stable. I guarantee there will be problems we haven't discovered yet. Please keep this in mind!
+These drivers are still very very experimental and while they work, they are not 100% stable. There will probably be problems we haven't discovered yet. Please keep this in mind!
 
 Needed first before this works: 
 1) Windows machine with a (preferably) new version of LabVIEW (8.6+). Older versions untested.
 2) inf files (driver files) Please see: http://openkinect.org/wiki/Getting_Started_Windows and follow the Driver Installation instructions. You don't need the dependencies or the other instructions unless you actually want to mess with and compile the code that makes up the dlls. 
 
 Known issues:
-1) RGB image in example.vi isn't being color-converted correctly but works enough to provide as an example. To be diagnosed
+1) Only 11Bit Depth Format and RGB Format work currently. Support for the others is being added soon.
 2) It is IMPORTANT to make sure the Kinect is turned off (either by pressing the the "stop" button in example.vi or running "stop.vi" or manually removing physical power from the Kinect before working on the code. It's been seen that LabView will close without warning or explanation if these steps are not taken. If LabView crashes when you try and run it, unplug your Kinect physically, wait a few seconds, and plug it back in. Restarting your computer or LabVIEW may also help. Save your work often.
 
 Information:
 - The depth frame image in example.vi uses an arbitrary gray-scale false-color rendering. The raw resultant array can be accessed from the vi "get depth frame.vi" included in libfreenect.lvlib. Please see: http://openkinect.org/wiki/Protocol_Documentation for more information
 - The RGB frame image in example.vi can be directly accessed from the raw resultant array in "get image frame.vi" included in libfreenect.lvlib. Please see: http://openkinect.org/wiki/Imaging_Information for more information
 - The dlls in this project are 32bit compiled with MSVC 2010
-- Only have tested 1 sychronous Kinect so far
+- Only has been tested with 1 Kinect
 - Timing is very important to frame rate speed. Please be considerate to cycles when developing algorithms on top of these drivers
 
 If you have problems, email me at [email protected] or find me on irc.freenode.net #openkinect under the RyanGordon alias.

wrappers/labview/libfreenect_lv.c

@@ -57,7 +57,6 @@ EXPORT char *freenect_lv_get_image_frame(int index, freenect_video_format fmt)
 	{
 	    return NULL;
 	}
-	
 	return rgb;
 }