Olena-patches August 2010

olena-patches@lrde.epita.fr

6 participants
204 discussions

last-svn-commit-245-g7a0f783 Fix bug in Qt interface.

by Arthur Crepin-Leblond

* scribo/demo/viewer/key_widget.cc * scribo/demo/viewer/viewer.cc --- scribo/ChangeLog | 7 +++++++ scribo/demo/viewer/key_widget.cc | 8 ++++---- scribo/demo/viewer/viewer.cc | 8 +++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b7737d3..46a6255 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2010-08-04 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> + + Fix bug in Qt interface. + + * scribo/demo/viewer/key_widget.cc + * scribo/demo/viewer/viewer.cc + 2010-07-21 Arthur Crepin-Leblond <crepin(a)ptaouchnok.lrde.epita.fr> Fix Segfault bug in Qt interface. diff --git a/scribo/demo/viewer/key_widget.cc b/scribo/demo/viewer/key_widget.cc index 44839c5..228ad67 100644 --- a/scribo/demo/viewer/key_widget.cc +++ b/scribo/demo/viewer/key_widget.cc @@ -90,16 +90,16 @@ KeyWidget::change_mode(bool b) if (b) { - text_->child(id_region)->setCheckState(0, Qt::Checked); + //text_->child(id_region)->setCheckState(0, Qt::Checked); text_->child(id_region)->setHidden(false); - text_->child(id_line)->setCheckState(0, Qt::Checked); + // text_->child(id_line)->setCheckState(0, Qt::Checked); text_->child(id_line)->setHidden(false); } else { - text_->child(id_region)->setCheckState(0, Qt::Unchecked); + //text_->child(id_region)->setCheckState(0, Qt::Unchecked); text_->child(id_region)->setHidden(true); - text_->child(id_line)->setCheckState(0, Qt::Unchecked); + // text_->child(id_line)->setCheckState(0, Qt::Unchecked); text_->child(id_line)->setHidden(true); } } diff --git a/scribo/demo/viewer/viewer.cc b/scribo/demo/viewer/viewer.cc index 36b8d82..38ca8b1 100644 --- a/scribo/demo/viewer/viewer.cc +++ b/scribo/demo/viewer/viewer.cc @@ -441,7 +441,7 @@ Viewer::load_xml(QString filename) } } - if (extended_mode_ && + if ((extended_mode_ || text_) && region.toElement().tagName().contains("text_region")) { QDomNode para = region.firstChild(); @@ -450,7 +450,8 @@ Viewer::load_xml(QString filename) if (!para.isNull()) { - add_region(para, attr_id); + if (extended_mode_) + add_region(para, attr_id); QDomNode line = para.firstChild(); while (!line.isNull() && !line.toElement().tagName().contains("line")) @@ -458,7 +459,8 @@ Viewer::load_xml(QString filename) if (!line.isNull()) { - add_region(line, attr_id); + if (extended_mode_) + add_region(line, attr_id); add_text(line, region); } } -- 1.5.6.5

13 years, 8 months

branch next updated: last-svn-commit-181-g565a8ac

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 565a8acd20101cf22d58b674d4d1695d8e9926c6 (commit) from 7671c7df2acc25243c83131813db612be8a654b2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 7 +++++++ scribo/src/Makefile.am | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 8 months

last-svn-commit-422-g9fffc80 configure.ac: Improve configure's outputs for external library checks.

by Guillaume Lazzara

--- ChangeLog | 5 +++++ configure.ac | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index c16a450..ec948cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Improve configure's outputs for external library + checks. + +2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Handle libMagick++ dependency with pkg-config. * configure.ac: Use PKG_* macros to find Magick++ path and diff --git a/configure.ac b/configure.ac index efe48d6..d5cdca0 100644 --- a/configure.ac +++ b/configure.ac @@ -193,10 +193,20 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) # Prepare calls to pkg-config PKG_PROG_PKG_CONFIG + +AC_MSG_RESULT([]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([Checking external libraries]) +AC_MSG_RESULT([------------------------------------------------------------]) + + ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) # CFITSIO library. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libcfitsio]) +AC_MSG_RESULT([------------]) OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) @@ -245,23 +255,41 @@ AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') # TIFF library. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libtiff]) +AC_MSG_RESULT([---------]) OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) # Grassroots DiCoM (GDCM). +AC_MSG_RESULT([]) +AC_MSG_RESULT([* libgdcm]) +AC_MSG_RESULT([---------]) OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm], [GDCM], [-lgdcmzlib]) # Tesseract. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* Tesseract]) +AC_MSG_RESULT([-----------]) OLN_WITH_LIB([TESSERACT], [tesseract/baseapi.h], [tesseract_full], [tesseract], [TESSERACT]) # Qt. +AC_MSG_RESULT([]) +AC_MSG_RESULT([* Qt]) +AC_MSG_RESULT([----]) AT_WITH_QT([+xml], [], [], AC_DEFINE([HAVE_QT], 0, [Define to 1 if we can use Qt]), AC_DEFINE([HAVE_QT], 1)) AM_CONDITIONAL([HAVE_QT], [test x$QT_PATH != x]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([------------------------------------------------------------]) +AC_MSG_RESULT([]) +AC_MSG_RESULT([]) + + ## ---------------------------- ## ## (Bundled) trimesh2 library. ## ## ---------------------------- ## -- 1.5.6.5

13 years, 8 months

last-svn-commit-421-gaa19b0a Handle libMagick++ dependency with pkg-config.

by Guillaume Lazzara

* configure.ac: Use PKG_* macros to find Magick++ path and libraries. * m4/pkg.m4: New macros to use pkg-config. --- ChangeLog | 9 +++ configure.ac | 49 +++++++++++++++++-- m4/pkg.m4 | 155 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+), 4 deletions(-) create mode 100644 m4/pkg.m4 diff --git a/ChangeLog b/ChangeLog index b41d019..c16a450 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-08-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle libMagick++ dependency with pkg-config. + + * configure.ac: Use PKG_* macros to find Magick++ path and + libraries. + + * m4/pkg.m4: New macros to use pkg-config. + 2010-07-01 Guillaume Lazzara <z(a)lrde.epita.fr> * m4/autotroll.m4: Fix invalid configuration when Qt is missing. diff --git a/configure.ac b/configure.ac index 46dc531..efe48d6 100644 --- a/configure.ac +++ b/configure.ac @@ -191,17 +191,58 @@ AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) ## External libraries. ## ## -------------------- ## +# Prepare calls to pkg-config +PKG_PROG_PKG_CONFIG ### Support for FreeImagePlus has been disabled for Olena 1.0. ## OLN_WITH_LIB([FreeImagePlus], [FreeImagePlus.h], [freeimageplus]) # CFITSIO library. OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) + +#------------------------------------------------------------ # Magick++. -# FIXME: We should handle Magick++ using pkgconfig (and/or -# Magick++-config?) instead of OLN_WITH_LIB. See how other projects -# handle this. -OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) + +# FIXME: We should handle Magick++ both with Magick++-config and +# pkg-config? instead of OLN_WITH_LIB. See how other projects handle +# this. +#OLN_WITH_LIB([Magick++], [Magick++.h], [Magick++], [magickxx], [MAGICKXX]) + +AC_ARG_WITH([magickxx], + [AC_HELP_STRING([--with-magickxx], + [enable magickxx support (default)])], + [with_magickxx=$withval], + [with_magickxx='yes']) + +if test "x$with_magickxx" != 'xyes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-magickxx=$with_magickxx " +fi + +have_magickxx='no' +MAGICKXX_CFLAGS="" +MAGICKXX_LIBS="" +MAGICKXX_PKG="" +if test "x$with_magickxx" = 'xyes'; then + AC_MSG_RESULT([]) + AC_MSG_RESULT([* libMagick++]) + AC_MSG_RESULT([---------------]) + PKG_CHECK_MODULES(MAGICKXX,[ImageMagick++], have_magickxx=yes, have_magickxx=no) + AC_MSG_RESULT([]) +fi + +if test "$have_magickxx" = 'yes'; then + AC_DEFINE([HAVE_MAGICKXX], 1, [Define to 1 if we can use libMagick++]) + # Use standard variable names. + MAGICKXX_CPPFLAGS="$MAGICKXX_CFLAGS" + MAGICKXX_LDFLAGS="$MAGICKXX_LIBS" + AC_SUBST(MAGICKXX_CPPFLAGS) + AC_SUBST(MAGICKXX_LDFLAGS) +fi + +AM_CONDITIONAL(HAVE_MAGICKXX, test "x$have_magickxx" = 'xyes') + +#------------------------------------------------------------ + # TIFF library. OLN_WITH_LIB([TIFF], [tiff.h], [tiff]) diff --git a/m4/pkg.m4 b/m4/pkg.m4 new file mode 100644 index 0000000..cc47557 --- /dev/null +++ b/m4/pkg.m4 @@ -0,0 +1,155 @@ +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott(a)netsplit.com>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program 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 +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $2]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [AC_MSG_RESULT([no]) + $4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES -- 1.5.6.5

13 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches August 2010