Merge branch 'ipe-basler'

Conflicts:
	src/CMakeLists.txt

3 files changed, 120 insertions, 2 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4f3bdc8..4686b84 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -16,6 +16,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/control.glade ${CMAKE_CURRENT_BINARY_
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/run.py ${CMAKE_CURRENT_BINARY_DIR})
 
 # --- Build targets -----------------------------------------------------------
+
 include_directories(
     ${GLIB2_INCLUDE_DIRS}
     ${GOBJECT2_INCLUDE_DIRS}
@@ -25,6 +26,19 @@ include_directories(
 
 message("${CMAKE_CURRENT_SOURCE_DIR}")
 
+if (HAVE_PYLON_CAMERA)
+  set(GENICAM_ROOT $ENV{PYLON_ROOT}/genicam)
+  # check for 32/64 bit
+  if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(PYLON_LIB_DIRS $ENV{PYLON_ROOT}/lib64 $ENV{PYLON_ROOT}/bin ${GENICAM_ROOT}/bin/Linux64_x64
+      ${GENICAM_ROOT}/bin/Linux64_x64/GenApi/Generic)
+  else()
+    set(PYLON_LIB_DIRS $ENV{PYLON_ROOT}/lib64 $ENV{PYLON_ROOT}/bin ${GENICAM_ROOT}/bin/Linux32_i86
+      ${GENICAM_ROOT}/bin/Linux32_i86/GenApi/Generic)
+  endif()
+  link_directories(${PYLON_LIB_DIRS} ${LIBPYLONCAM_LIBDIR})
+endif()
+
 add_executable(grab grab.c)
 add_executable(grab-async grab-async.c)
 add_executable(benchmark benchmark.c)
@@ -33,7 +47,14 @@ target_link_libraries(benchmark uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 target_link_libraries(grab uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 target_link_libraries(grab-async uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
 
-if (GTK2_FOUND)
+add_executable(grab_pylon grab_pylon.c)
+target_link_libraries(grab_pylon uca ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES})
+
+if (NOT DEFINED WITH_CONTROL_GUI)
+  set(WITH_CONTROL_GUI TRUE)
+endif()
+
+if (GTK2_FOUND AND WITH_CONTROL_GUI)
     include_directories(${GTK2_INCLUDE_DIRS})
 
     add_executable(control 
diff --git a/test/grab.c b/test/grab.c
index a4d4aa3..41e6d88 100644
--- a/test/grab.c
+++ b/test/grab.c
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
         uca_camera_start_recording(camera, &error);
         g_assert_no_error(error);
 
-        while (counter < 2) {
+        while (counter < 5) {
             g_print(" grab frame ... ");
             g_timer_start(timer);
             uca_camera_grab(camera, &buffer, &error);
@@ -131,6 +131,7 @@ int main(int argc, char *argv[])
             FILE *fp = fopen(filename, "wb");
             fwrite(buffer, roi_width * roi_height, pixel_size, fp);
             fclose(fp);
+            g_usleep(2 * G_USEC_PER_SEC);
         }
 
         g_print("Stop recording\n");
diff --git a/test/grab_pylon.c b/test/grab_pylon.c
new file mode 100644
index 0000000..2f9b5a0
--- /dev/null
+++ b/test/grab_pylon.c
@@ -0,0 +1,96 @@
+/* Copyright (C) 2011, 2012 Matthias Vogelgesang <matthias.vogelgesang@kit.edu>
+   (Karlsruhe Institute of Technology)
+
+   This library is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published by the
+   Free Software Foundation; either version 2.1 of the License, or (at your
+   option) any later version.
+
+   This library is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+   FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+   details.
+
+   You should have received a copy of the GNU Lesser General Public License along
+   with this library; if not, write to the Free Software Foundation, Inc., 51
+   Franklin St, Fifth Floor, Boston, MA 02110, USA */
+
+#include <glib-object.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "uca-camera.h"
+
+#define handle_error(errno) {if ((errno) != UCA_NO_ERROR) printf("error at <%s:%i>\n", \
+    __FILE__, __LINE__);}
+
+static UcaCamera *camera = NULL;
+
+void sigint_handler(int signal)
+{
+    printf("Closing down libuca\n");
+    uca_camera_stop_recording(camera, NULL);
+    g_object_unref(camera);
+    exit(signal);
+}
+
+int main(int argc, char *argv[])
+{
+    GError *error = NULL;
+    (void) signal(SIGINT, sigint_handler);
+
+    g_type_init();
+    camera = uca_camera_new("pylon", &error);
+
+    if (camera == NULL) {
+        g_print("Couldn't initialize camera\n");
+        return 1;
+    }
+
+    guint width, height, bits;
+    g_object_get(G_OBJECT(camera),
+            "sensor-width", &width,
+            "sensor-height", &height,
+            "sensor-bitdepth", &bits,
+            NULL);
+
+    const int pixel_size = bits == 8 ? 1 : 2;
+    g_print("allocate buffer %u, %u, %d\n", width, height, pixel_size);
+    gpointer buffer = g_malloc0(width * height * pixel_size);
+
+    gchar filename[FILENAME_MAX];
+
+    for (int i = 0; i < 2; i++) {
+        gint counter = 0;
+        g_print("Start recording\n");
+        uca_camera_start_recording(camera, &error);
+        g_assert_no_error(error);
+
+        while (counter < 10) {
+            g_print(" grab frame ... ");
+            uca_camera_grab(camera, &buffer, &error);
+            if (error != NULL) {
+                g_print("\nError: %s\n", error->message);
+                goto cleanup;
+            }
+            g_print("done\n");
+
+            snprintf(filename, FILENAME_MAX, "frame-%08i.raw", counter++);
+            FILE *fp = fopen(filename, "wb");
+            fwrite(buffer, width*height, pixel_size, fp);
+            fclose(fp);
+            //g_usleep(2 * G_USEC_PER_SEC);
+        }
+
+        g_print("Stop recording\n");
+        uca_camera_stop_recording(camera, &error);
+        g_assert_no_error(error);
+    }
+
+cleanup:
+    uca_camera_stop_recording(camera, NULL);
+    g_object_unref(camera);
+    g_free(buffer);
+
+    return error != NULL ? 1 : 0;
+}