[hkl] 01/03: Imported Upstream version 4.99.99.1914
Frédéric-Emmanuel Picca
picca at moszumanska.debian.org
Mon Mar 9 08:49:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch experimental
in repository hkl.
commit c97e64e98d14c9914de8babd41553f32a2cc41eb
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Mon Mar 9 09:33:00 2015 +0100
Imported Upstream version 4.99.99.1914
---
ChangeLog | 10 ++++++++++
Documentation/hkl.html | 10 +++++-----
configure | 22 +++++++++++-----------
gui/hkl-gui-macros.h | 5 ++++-
gui/hkl-gui.c | 6 +++---
5 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d5f2b92..9d06918 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
# Generated by Makefile. Do not edit.
+commit 0d6317eaad135a726cd30005bf64a8182349f06f
+Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
+Date: Mon Mar 9 09:07:32 2015 +0100
+
+ [hkl] fix the 3d model access when installed
+
+ gui/hkl-gui-macros.h | 5 ++++-
+ gui/hkl-gui.c | 6 +++---
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
commit 4672c5bae937371ce3d6088a64571ec6d8c38b1b
Author: Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>
Date: Thu Mar 5 10:03:38 2015 +0100
diff --git a/Documentation/hkl.html b/Documentation/hkl.html
index 3cd7d38..6c88a67 100644
--- a/Documentation/hkl.html
+++ b/Documentation/hkl.html
@@ -2,8 +2,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<title>Welcome to hkl's 4.99.99.1913 documentation!</title>
-<!-- 2015-03-05 jeu. 10:14 -->
+<title>Welcome to hkl's 4.99.99.1914 documentation!</title>
+<!-- 2015-03-09 lun. 09:27 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
<meta name="author" content="Picca Frédéric-Emmanuel"/>
@@ -175,7 +175,7 @@ for the JavaScript code in this tag.
</head>
<body>
<div id="content">
-<h1 class="title">Welcome to hkl's 4.99.99.1913 documentation!</h1>
+<h1 class="title">Welcome to hkl's 4.99.99.1914 documentation!</h1>
<div id="table-of-contents">
<h2>Table of Contents</h2>
<div id="text-table-of-contents">
@@ -3833,7 +3833,7 @@ You can find the bug tracker here
<li>Other OS
<p>
-You just need to send an <a href="mailto:submit at bugs.debian.org?subject=%20My%20problem%20with%20hkl...&body=Package:%20hkl%0AVersion:%204.99.99.1913%0A%0AI%20found%20this%20problem%20in%20hkl">email</a>
+You just need to send an <a href="mailto:submit at bugs.debian.org?subject=%20My%20problem%20with%20hkl...&body=Package:%20hkl%0AVersion:%204.99.99.1914%0A%0AI%20found%20this%20problem%20in%20hkl">email</a>
</p>
</li>
</ul>
@@ -4563,7 +4563,7 @@ pseudo axes and the mode parameters.
</div></div>
<div id="postamble" class="status">
<p class="author">Author: Picca Frédéric-Emmanuel</p>
-<p class="date">Created: 2015-03-05 jeu. 10:14</p>
+<p class="date">Created: 2015-03-09 lun. 09:27</p>
<p class="creator"><a href="http://www.gnu.org/software/emacs/">Emacs</a> 23.4.1 (<a href="http://orgmode.org">Org</a> mode 8.0.7)</p>
<p class="xhtml-validation"><a href="http://validator.w3.org/check?uri=referer">Validate XHTML 1.0</a></p>
</div>
diff --git a/configure b/configure
index 4b0a1a2..1c7557e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for hkl 4.99.99.1913.
+# Generated by GNU Autoconf 2.69 for hkl 4.99.99.1914.
#
# Report bugs to <picca at synchrotron-soleil.fr>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='hkl'
PACKAGE_TARNAME='hkl'
-PACKAGE_VERSION='4.99.99.1913'
-PACKAGE_STRING='hkl 4.99.99.1913'
+PACKAGE_VERSION='4.99.99.1914'
+PACKAGE_STRING='hkl 4.99.99.1914'
PACKAGE_BUGREPORT='picca at synchrotron-soleil.fr'
PACKAGE_URL=''
@@ -1421,7 +1421,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hkl 4.99.99.1913 to adapt to many kinds of systems.
+\`configure' configures hkl 4.99.99.1914 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1491,7 +1491,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hkl 4.99.99.1913:";;
+ short | recursive ) echo "Configuration of hkl 4.99.99.1914:";;
esac
cat <<\_ACEOF
@@ -1638,7 +1638,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-hkl configure 4.99.99.1913
+hkl configure 4.99.99.1914
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2312,7 +2312,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hkl $as_me 4.99.99.1913, which was
+It was created by hkl $as_me 4.99.99.1914, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3171,7 +3171,7 @@ fi
# Define the identity of the package.
PACKAGE='hkl'
- VERSION='4.99.99.1913'
+ VERSION='4.99.99.1914'
cat >>confdefs.h <<_ACEOF
@@ -15754,7 +15754,7 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
-#define VREV 1913
+#define VREV 1914
_ACEOF
version_info="103:99:99"
@@ -19173,7 +19173,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by hkl $as_me 4.99.99.1913, which was
+This file was extended by hkl $as_me 4.99.99.1914, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19239,7 +19239,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-hkl config.status 4.99.99.1913
+hkl config.status 4.99.99.1914
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/gui/hkl-gui-macros.h b/gui/hkl-gui-macros.h
index f141c66..3594531 100644
--- a/gui/hkl-gui-macros.h
+++ b/gui/hkl-gui-macros.h
@@ -36,7 +36,10 @@
fprintf(stdout, "%s is NULL ???", #name); \
}while(0);
-
+#define get_model(filename) \
+ (0 == access(filename, R_OK)) ? filename : \
+ ((0 == access("../data/" filename, R_OK)) ? "../data/" filename : \
+ ((0 == access(PKGDATA "hkl3d" filename, R_OK)) ? PKGDATA "hkl3d" filename : NULL))
static void get_ui(GtkBuilder *builder, const char *filename)
{
diff --git a/gui/hkl-gui.c b/gui/hkl-gui.c
index b896d5e..066f8be 100644
--- a/gui/hkl-gui.c
+++ b/gui/hkl-gui.c
@@ -997,13 +997,13 @@ set_up_3D (HklGuiWindow* self)
#if HKL3D
HklGuiWindowPrivate *priv = HKL_GUI_WINDOW_GET_PRIVATE(self);
- const char *filename = NULL;
+ char *filename = NULL;
const char *name = hkl_factory_name_get(priv->diffractometer->factory);
if(!strcmp("K6C", name))
- filename = "../data/diffabs.yaml";
+ filename = get_model("diffabs.yaml");
else if (!strcmp("K4CV", name))
- filename = "../data/cristal4C.yaml";
+ filename = get_model("cristal4C.yaml");
if(priv->frame3d){
gtk_widget_destroy(GTK_WIDGET(hkl_gui_3d_frame_get(priv->frame3d)));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/hkl.git
More information about the debian-science-commits
mailing list