GNOME.org
 

[aravis] build: merge arv-control and arv-show-devices into arv-tool.

commit 1d36cc5586be9ae8af18ecaaa4e098fe77773cae
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Tue Jun 21 10:54:55 2011 +0200

    build: merge arv-control and arv-show-devices into arv-tool.

 src/.gitignore       |    3 +-
 src/Makefile.am      |   10 +--
 src/arvcontrol.c     |  160 --------------------------------
 src/arvshowdevices.c |   84 -----------------
 src/arvtool.c        |  251 ++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 255 insertions(+), 253 deletions(-)
---
diff --git a/src/.gitignore b/src/.gitignore
index b6bd6df..18b5f86 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,6 +1,5 @@
 arv-fake-gv-camera-*.*
-arv-show-devices-*.*
-arv-control-*.*
+arv-tool-*.*
 arvenumtypes.c
 arvenumtypes.h
 arvconfig.h
diff --git a/src/Makefile.am b/src/Makefile.am
index a9ec313..65be556 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,17 +129,13 @@ arvenumtypes.c: arvenumtypes.c.template $(ARAVIS_HDRS) $(ARAVIS_HDRS_NO_INTRO) $
 
 bin_PROGRAMS =						\
 	arv-fake-gv-camera- ARAVIS_API_VERSION@		\
-       	arv-show-devices- ARAVIS_API_VERSION@		\
-	arv-control- ARAVIS_API_VERSION@
+	arv-tool- ARAVIS_API_VERSION@
 
 arv_fake_gv_camera_ ARAVIS_API_VERSION@_SOURCES = arvfakegvcamera.c
 arv_fake_gv_camera_ ARAVIS_API_VERSION@_LDADD = $(ARAVIS_LIBS) libaravis- ARAVIS_API_VERSION@.la
 
-arv_show_devices_ ARAVIS_API_VERSION@_SOURCES = arvshowdevices.c
-arv_show_devices_ ARAVIS_API_VERSION@_LDADD = $(ARAVIS_LIBS) libaravis- ARAVIS_API_VERSION@.la
-
-arv_control_ ARAVIS_API_VERSION@_SOURCES = arvcontrol.c
-arv_control_ ARAVIS_API_VERSION@_LDADD = $(ARAVIS_LIBS) libaravis- ARAVIS_API_VERSION@.la
+arv_tool_ ARAVIS_API_VERSION@_SOURCES = arvtool.c
+arv_tool_ ARAVIS_API_VERSION@_LDADD = $(ARAVIS_LIBS) libaravis- ARAVIS_API_VERSION@.la
 
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/src/arvtool.c b/src/arvtool.c
new file mode 100644
index 0000000..f1bf329
--- /dev/null
+++ b/src/arvtool.c
@@ -0,0 +1,251 @@
+#include <arv.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+static char *arv_option_device_name = NULL;
+static char *arv_option_debug_domains = NULL;
+
+static const GOptionEntry arv_option_entries[] =
+{
+	{ "name",		'n', 0, G_OPTION_ARG_STRING,
+		&arv_option_device_name,	NULL, "device_name"},
+	{ "debug", 		'd', 0, G_OPTION_ARG_STRING,
+		&arv_option_debug_domains, 	NULL, "category[:level][,...]" },
+	{ NULL }
+};
+
+void
+arv_tool_show_devices (void)
+{
+	unsigned int n_devices;
+
+	arv_update_device_list ();
+	n_devices = arv_get_n_devices ();
+
+	if (n_devices < 1)
+		printf ("No device found\n");
+	else {
+		unsigned int i;
+
+		for (i = 0; i < n_devices; i++) {
+			const char *device_id;
+
+			device_id = arv_get_device_id (i);
+			if (device_id != NULL)
+				printf ("%s\n",  device_id);
+		}
+	}
+}
+
+static void
+arv_tool_list_features (ArvGc *genicam, const char *feature, gboolean show_description, int level)
+{
+	ArvGcNode *node;
+
+	node = arv_gc_get_node (genicam, feature);
+	if (ARV_IS_GC_NODE (node)) {
+		int i;
+
+		for (i = 0; i < level; i++)
+			printf ("    ");
+
+		printf ("%s: '%s'\n", arv_gc_node_get_node_name (node), feature);
+
+		if (show_description) {
+			const char *description;
+
+			description = arv_gc_node_get_description (node);
+			if (description)
+				printf ("%s\n", description);
+		}
+
+		if (ARV_IS_GC_CATEGORY (node)) {
+			const GSList *features;
+			const GSList *iter;
+
+			features = arv_gc_category_get_features (ARV_GC_CATEGORY (node));
+
+			for (iter = features; iter != NULL; iter = iter->next)
+				arv_tool_list_features (genicam, iter->data, show_description, level + 1);
+		} else if (ARV_IS_GC_ENUMERATION (node)) {
+			const GSList *childs;
+			const GSList *iter;
+
+			childs = arv_gc_node_get_childs (node);
+			for (iter = childs; iter != NULL; iter = iter->next) {
+				for (i = 0; i < level + 1; i++)
+					printf ("    ");
+
+				printf ("%s: '%s'\n",
+					arv_gc_node_get_node_name (iter->data),
+					arv_gc_node_get_name (iter->data));
+			}
+		}
+	}
+}
+
+static const char
+description_content[] =
+"Command may be one of the following possibilities:\n"
+"\n"
+"  genicam:                          dump the content of the Genicam xml data\n"
+"  features:                         list all availale features\n"
+"  description  [<feature>] ...:     show the full feature description\n"
+"  control <feature>[=<value>] ...:  read/write device features\n"
+"\n"
+"If no command is given, this utility will list all the available devices\n"
+"For the control command, direct access to device registers is provided using a R[address] syntax"
+" in place of a feature name \n"
+"\n"
+"Examples:\n"
+"\n"
+"arv-tool-" ARAVIS_API_VERSION " control Width=128 Height=128 Gain R[0x10000]=0x10\n"
+"arv-tool-" ARAVIS_API_VERSION " features\n"
+"arv-tool-" ARAVIS_API_VERSION " description Width Height\n"
+"arv-tool-" ARAVIS_API_VERSION " -n Basler-210ab4 genicam\n";
+
+int
+main (int argc, char **argv)
+{
+	GOptionContext *context;
+	GError *error = NULL;
+
+	g_thread_init (NULL);
+	g_type_init ();
+
+	context = g_option_context_new (" command <parameters>");
+	g_option_context_set_summary (context, "Small utility for basic control of a Genicam device.");
+	g_option_context_set_description (context, description_content);
+	g_option_context_add_main_entries (context, arv_option_entries, NULL);
+
+	if (!g_option_context_parse (context, &argc, &argv, &error)) {
+		g_option_context_free (context);
+		g_print ("Option parsing failed: %s\n", error->message);
+		g_error_free (error);
+		return EXIT_FAILURE;
+	}
+
+	g_option_context_free (context);
+
+	arv_debug_enable (arv_option_debug_domains);
+
+	if (argc < 2) {
+		if (arv_option_device_name != NULL) {
+			ArvDevice *device;
+
+			device = arv_open_device (arv_option_device_name);
+			if (!ARV_IS_DEVICE (device)) {
+				printf ("Device '%s' not found\n", arv_option_device_name);
+
+				arv_shutdown ();
+
+				return EXIT_FAILURE;
+			}
+			printf ("%s found\n", arv_option_device_name);
+
+			g_object_unref (device);
+		} else
+			arv_tool_show_devices ();
+	} else {
+		ArvDevice *device;
+		ArvGc *genicam;
+		const char *command = argv[1];
+
+		device = arv_open_device (arv_option_device_name);
+		if (!ARV_IS_DEVICE (device)) {
+			if (arv_option_device_name != NULL)
+				printf ("Device '%s' not found\n", arv_option_device_name);
+			else
+				printf ("No device found\n");
+
+			arv_shutdown ();
+
+			return EXIT_FAILURE;
+		}
+		genicam = arv_device_get_genicam (device);
+
+		if (g_strcmp0 (command, "genicam") == 0) {
+			const char *xml;
+			size_t size;
+
+			xml = arv_device_get_genicam_xml (device, &size);
+			if (xml != NULL)
+				printf ("%*s\n", (int) size, xml);
+		} else if (g_strcmp0 (command, "features") == 0) {
+			arv_tool_list_features (genicam, "Root", FALSE, 0);
+		} else if (g_strcmp0 (command, "description") == 0) {
+			if (argc < 3)
+				arv_tool_list_features (genicam, "Root", TRUE, 0);
+			else {
+				int i;
+
+				for (i = 2; i < argc; i++) {
+					ArvGcNode *node;
+
+					node = arv_gc_get_node (genicam, argv[i]);
+					if (ARV_IS_GC_NODE (node)) {
+						const char *description;
+
+						printf ("%s: '%s'\n", arv_gc_node_get_node_name (node), argv[i]);
+
+						description = arv_gc_node_get_description (node);
+						if (description)
+							printf ("%s\n", description);
+					}
+				}
+			}
+		} else if (g_strcmp0 (command, "control") == 0) {
+			int i;
+
+			for (i = 2; i < argc; i++) {
+				ArvGcNode *feature;
+				char **tokens;
+
+				tokens = g_strsplit (argv[i], "=", 2);
+				feature = arv_device_get_feature (device, tokens[0]);
+				if (!ARV_IS_GC_NODE (feature))
+					if (g_strrstr (tokens[0], "R[") == tokens[0]) {
+						guint32 value;
+						guint32 address;
+
+						address = g_ascii_strtoll(&tokens[0][2], NULL, 0);
+
+						if (tokens[1] != NULL) {
+							arv_device_write_register (device,
+										   address,
+										   g_ascii_strtoll (tokens[1],
+												    NULL, 0));
+						}
+
+						arv_device_read_register (device, address, &value);
+
+						printf ("R[0x%08x] = 0x%08x\n",
+							address, value);
+					} else
+						printf ("Feature '%s' not found\n", tokens[0]);
+					else {
+						if (ARV_IS_GC_COMMAND (feature)) {
+							arv_gc_command_execute (ARV_GC_COMMAND (feature));
+							printf ("%s executed\n", tokens[0]);
+						} else {
+							if (tokens[1] != NULL)
+								arv_gc_node_set_value_from_string (feature, tokens[1]);
+
+							printf ("%s = %s\n", tokens[0],
+								arv_gc_node_get_value_as_string (feature));
+						}
+					}
+				g_strfreev (tokens);
+			}
+		} else {
+			printf ("Unkown command\n");
+			arv_shutdown ();
+			return EXIT_FAILURE;
+		}
+	}
+
+	arv_shutdown ();
+
+	return EXIT_SUCCESS;
+}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]