Sailcut CAD

Revision: 538
          http://sailcut.svn.sourceforge.net/sailcut/?rev=538&view=rev
Author:   jeremy_laine
Date:     2008-10-22 16:03:09 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
use pkg-config to detect Qt

Modified Paths:
--------------
    trunk/sailcut/configure.in
    trunk/sailcut/src/Makefile.am

Modified: trunk/sailcut/configure.in
===================================================================
--- trunk/sailcut/configure.in	2008-10-22 15:45:43 UTC (rev 537)
+++ trunk/sailcut/configure.in	2008-10-22 16:03:09 UTC (rev 538)
@@ -33,17 +33,6 @@
 AC_CHECK_PROG(INKSCAPE, inkscape, inkscape)
 AC_CHECK_PROG(XSLTPROC, xsltproc, xsltproc)
 AC_CHECK_PROG(DBLATEX, dblatex, dblatex)
-
-dnl Make compiler verbose
-CXXFLAGS="$CXXFLAGS -W -Wall" 
-
-dnl Check Qt stuff
-JWB_CHECK_QT(,AC_MSG_ERROR([Qt was not found!]))
-JWB_CHECK_QT_MODULE(QtSvg,,AC_MSG_ERROR([QtSvg was not found!]))
-JWB_CHECK_QT_MODULE(QtXml,,AC_MSG_ERROR([QtXml was not found!]))
-
-dnl Check OpenGL support
-JWB_HAVE_QTOPENGL
 AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4])
 AC_CHECK_PROG(MOC, [moc], [moc])
 AC_CHECK_PROG(UIC, [uic-qt4], [uic-qt4])
@@ -51,6 +40,12 @@
 AC_CHECK_PROG(LRELEASE, [lrelease], [lrelease])
 AC_CHECK_PROG(LUPDATE, [lupdate], [lupdate])
 
+dnl Make compiler verbose
+CXXFLAGS="$CXXFLAGS -W -Wall" 
+
+dnl Check Qt stuff
+PKG_CHECK_MODULES(QT, QtCore QtGui QtSvg QtXml)
+
 dnl Check data and documentation directories
 JWB_CHECK_DATADIR(sailcut)
 JWB_CHECK_DOCDIR(sailcut)

Modified: trunk/sailcut/src/Makefile.am
===================================================================
--- trunk/sailcut/src/Makefile.am	2008-10-22 15:45:43 UTC (rev 537)
+++ trunk/sailcut/src/Makefile.am	2008-10-22 16:03:09 UTC (rev 538)
@@ -1,8 +1,7 @@
 SUBDIRS = geocpp sailcpp ts
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir) -I$(srcdir)/sailcpp \
-    $(QT_INCLUDES) $(X_INCLUDES) $(GLINC) \
+	-I$(top_srcdir) -I$(srcdir)/sailcpp $(QT_CFLAGS) \
 	-DSAILCUT_DOCDIR=\"$(pkgdocdir)\" -DSAILCUT_DATADIR=\"$(pkgdatadir)\"
 
 bin_PROGRAMS = sailcut
@@ -113,8 +112,7 @@
 	widgetprofilevert.cpp
 nodist_sailcut_SOURCES = $(BUILT_SOURCES)
 
-sailcut_LDFLAGS = $(QT_LDFLAGS) $(X_LDFLAGS) $(GL_LDFLAGS)
-sailcut_LDADD   = sailcpp/libsailcpp.a geocpp/libgeocpp.a $(LIB_QT) $(LIB_QTSVG) $(LIB_QTXML) $(LIB_QTOPENGL) $(GLLIB)
+sailcut_LDFLAGS = sailcpp/libsailcpp.a geocpp/libgeocpp.a $(QT_LIBS)
 
 # rules for Qt metasources
 ui_%.h: %.ui


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 541
          http://sailcut.svn.sourceforge.net/sailcut/?rev=541&view=rev
Author:   jeremy_laine
Date:     2008-10-23 07:13:52 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
touchup build process for win32

Modified Paths:
--------------
    trunk/sailcut/Makefile.win32

Modified: trunk/sailcut/Makefile.win32
===================================================================
--- trunk/sailcut/Makefile.win32	2008-10-23 06:05:22 UTC (rev 540)
+++ trunk/sailcut/Makefile.win32	2008-10-23 07:13:52 UTC (rev 541)
@@ -4,7 +4,10 @@
 UNIX2DOS = unix2dos
 MINGW = i586-mingw32msvc
 STRIP = $(MINGW)-strip
-QTDIR=/usr/$(MINGW)/share/qt4
+QTDIR = /usr/$(MINGW)/share/qt4
+QT_MODS = QtCore QtGui QtOpenGL QtSvg QtXml
+QT_CFLAGS = -I$(QTDIR)/include $(foreach mod,$(QT_MODS),-I$(QTDIR)/include/$(mod))
+QT_LIBS = -L$(QTDIR)/lib $(foreach mod,$(QT_MODS),-l$(mod)4) -lopengl32 -lglu32
 
 VERSION := $(shell cat configure.in | grep AC_INIT | sed -e 's/.*, \([0-9a-zA-Z\.]*\).*/\1/')
 BIN_DOCS = README COPYING ChangeLog
@@ -12,7 +15,7 @@
 win32_configure= ../configure
 win32_builddir = win32-build
 win32_distdir = sailcut-$(VERSION)-win32
-win32_qtlibs = mingwm10.dll QtCore4.dll QtGui4.dll QtOpenGL4.dll QtSvg4.dll QtXml4.dll
+win32_qtlibs = mingwm10.dll $(addsuffix 4.dll,$(QT_MODS))
 win32_nsi = sailcut.nsi
 
 win32-dist: win32-zip win32-installer win32-clean
@@ -22,10 +25,10 @@
 	cd $(win32_builddir) && \
 	  $(win32_configure) \
 	    --host=$(MINGW) \
-	    --with-qt-dir=$(QTDIR) \
 	    --with-datadir=data \
 	    --with-docdir=doc \
-	    --with-icondir=icons
+	    --with-icondir=icons \
+	    QT_CFLAGS="$(QT_CFLAGS)" QT_LIBS="$(QT_LIBS)"
 	make -C $(win32_builddir)
 	touch $@
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 543
          http://sailcut.svn.sourceforge.net/sailcut/?rev=543&view=rev
Author:   jeremy_laine
Date:     2008-10-23 08:33:52 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
cleanup distribution tarball

Modified Paths:
--------------
    trunk/sailcut/Makefile.am

Modified: trunk/sailcut/Makefile.am
===================================================================
--- trunk/sailcut/Makefile.am	2008-10-23 07:56:18 UTC (rev 542)
+++ trunk/sailcut/Makefile.am	2008-10-23 08:33:52 UTC (rev 543)
@@ -3,6 +3,4 @@
 lupdate:
 	$(MAKE) -C src/ts lupdate
 
-EXTRA_DIST = sailcut.kdevelop Makefile.common Makefile.mac Makefile.win32 \
-	autogen.sh admin/qt.m4.in admin/sailcut.m4.in admin/utils.m4.in
-MAINTAINERCLEANFILES = acinclude.m4
+EXTRA_DIST = autogen.sh sailcut.kdevelop Makefile.common Makefile.mac Makefile.win32


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 537
          http://sailcut.svn.sourceforge.net/sailcut/?rev=537&view=rev
Author:   jeremy_laine
Date:     2008-10-22 15:45:43 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
start trimming down qt4-m4.in

Modified Paths:
--------------
    trunk/sailcut/configure.in

Modified: trunk/sailcut/configure.in
===================================================================
--- trunk/sailcut/configure.in	2008-10-22 15:41:20 UTC (rev 536)
+++ trunk/sailcut/configure.in	2008-10-22 15:45:43 UTC (rev 537)
@@ -18,8 +18,8 @@
   ac_configure_args="$ac_configure_args --prefix $prefix"
 fi
 
-dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+dnl Generate the config header
+AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs
 AC_PROG_CXX
@@ -44,6 +44,12 @@
 
 dnl Check OpenGL support
 JWB_HAVE_QTOPENGL
+AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4])
+AC_CHECK_PROG(MOC, [moc], [moc])
+AC_CHECK_PROG(UIC, [uic-qt4], [uic-qt4])
+AC_CHECK_PROG(UIC, [uic], [uic])
+AC_CHECK_PROG(LRELEASE, [lrelease], [lrelease])
+AC_CHECK_PROG(LUPDATE, [lupdate], [lupdate])
 
 dnl Check data and documentation directories
 JWB_CHECK_DATADIR(sailcut)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 540
          http://sailcut.svn.sourceforge.net/sailcut/?rev=540&view=rev
Author:   jeremy_laine
Date:     2008-10-23 06:05:22 +0000 (Thu, 23 Oct 2008)

Log Message:
-----------
drop obsolete m4 files

Removed Paths:
-------------
    trunk/sailcut/admin/qt.m4.in
    trunk/sailcut/admin/utils.m4.in

Deleted: trunk/sailcut/admin/qt.m4.in
===================================================================
--- trunk/sailcut/admin/qt.m4.in	2008-10-23 06:03:18 UTC (rev 539)
+++ trunk/sailcut/admin/qt.m4.in	2008-10-23 06:05:22 UTC (rev 540)
@@ -1,494 +0,0 @@
-# qt.m4 - Qt detection functions. -*-Autoconf-*-
-dnl
-dnl Copyright (C) 2005 Jeremy Lainé <jeremy.laine@...>
-dnl See AUTHORS file for a full list of contributors.
-dnl 
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-dnl along with this program; if not, write to the Free Software
-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-dnl
-
-dnl ------------------------------------------------------------------------
-dnl Error messages
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_MOC_ERROR_MESSAGE],
-[
-    AC_MSG_ERROR([No Qt meta object compiler (moc) found!
-Please check whether you installed Qt correctly.
-You need to have a running moc binary.
-configure tried to run $ac_cv_path_moc and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable MOC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([JWB_UIC_ERROR_MESSAGE],
-[
-    AC_MSG_WARN([No Qt ui compiler (uic) found!
-Please check whether you installed Qt correctly.
-You need to have a running uic binary.
-configure tried to run $ac_cv_path_uic and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable UIC to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([JWB_LRELEASE_ERROR_MESSAGE],
-[
-    AC_MSG_ERROR([No Qt translation tool (lrelease) found!
-Please check whether you installed Qt correctly.
-You need to have a running lrelease binary.
-configure tried to run $ac_cv_path_lrelease and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable LRELEASE to the right one before running
-configure.
-])
-])
-
-
-AC_DEFUN([JWB_LUPDATE_ERROR_MESSAGE],
-[
-    AC_MSG_ERROR([No Qt translation tool (lupdate) found!
-Please check whether you installed Qt correctly.
-You need to have a running lupdate binary.
-configure tried to run $ac_cv_path_lupdate and the test didn't
-succeed. If configure shouldn't have tried this one, set
-the environment variable LUPDATE to the right one before running
-configure.
-])
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Qt variables initialisation
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_QT_INIT],
-[
-    AC_REQUIRE([JWB_PATH_MISC])
-
-    dnl Platform-specific initialisations
-    case "$host" in 
-      *-mingw32* )
-        dnl Convert backslashes to forward slashes
-        QTDIR=`echo $QTDIR | sed -e 's/\\\\/\\//g'`
-        
-	dnl Set Qt library suffix
-	jwb_qt_suffix_version="4"
-	jwb_qt_suffix_debug="d"
-	ac_qt_debug_default=no
-        ;;
-      * )
-	dnl Set Qt library suffix
-        jwb_qt_suffix_version=""
-	jwb_qt_suffix_debug="_debug"
-	ac_qt_debug_default=no
-        ;;
-    esac
-
-    dnl Define configure options
-    AC_ARG_ENABLE(qt-debug,
-        AC_HELP_STRING([--enable-qt-debug],[link to debug version of Qt ]),
-        ac_qt_debug=$enableval,
-	ac_qt_debug=$ac_qt_debug_default
-        )
-
-    AC_ARG_WITH(qt-dir,
-        AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
-        [  ac_qt_includes="$withval"/include
-           ac_qt_libraries="$withval"/lib
-           ac_qt_bindir="$withval"/bin
-        ])
-
-    AC_ARG_WITH(qt-includes,
-        AC_HELP_STRING([--with-qt-includes=DIR],[where the Qt includes are. ]),
-        [  ac_qt_includes="$withval"
-        ])
-
-    AC_ARG_WITH(qt-libraries,
-        AC_HELP_STRING([--with-qt-libraries=DIR],[where the Qt library is installed.]),
-        [  ac_qt_libraries="$withval"
-        ])
-
-
-    dnl Set Qt search directories
-    jwb_qt_dirs="$QTDIR /usr/lib/qt4 /usr/lib/qt /usr/share/qt4"
-
-    dnl Set the Qt libary suffix
-    AC_MSG_CHECKING([Qt library extension])
-    if test "$ac_qt_debug" = "yes"; then
-        jwb_qt_suffix=$jwb_qt_suffix_debug
-    else
-        jwb_qt_suffix=""
-    fi
-    jwb_qt_suffix=$jwb_qt_suffix${jwb_qt_suffix_version}
-    AC_MSG_RESULT($jwb_qt_suffix)
-    
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the Qt tools
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_PATH_QT_BIN],
-[
-    AC_REQUIRE([JWB_QT_INIT])
-    qt_bindirs=""
-    for dir in $jwb_qt_dirs; do
-        qt_bindirs="$qt_bindirs $dir/bin"
-    done
-    qt_bindirs="$qt_bindirs /usr/bin /usr/X11R6/bin /usr/local/qt/bin"
-    if test ! "$ac_qt_bindir" = "NO"; then
-        qt_bindirs="$ac_qt_bindir $qt_bindirs"
-    fi
-
-    KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [JWB_MOC_ERROR_MESSAGE])
-    AC_SUBST(MOC)
-    KDE_FIND_PATH(uic, UIC, [$qt_bindirs], [JWB_UIC_ERROR_MESSAGE])
-    AC_SUBST(UIC)
-    KDE_FIND_PATH(lrelease, LRELEASE, [$qt_bindirs], [JWB_LRELEASE_ERROR_MESSAGE])
-    AC_SUBST(LRELEASE)
-    KDE_FIND_PATH(lupdate, LUPDATE, [$qt_bindirs], [JWB_LUPDATE_ERROR_MESSAGE])
-    AC_SUBST(LUPDATE)
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the Qt includes directory
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_PATH_QT_INCLUDES],
-[
-    AC_MSG_CHECKING([for Qt4 headers])
-    qt_incdirs=""
-    for dir in $jwb_qt_dirs; do
-          qt_incdirs="$qt_incdirs $dir/include $dir"
-    done
-    qt_incdirs="$QTINC $qt_incdirs /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt"
-    if test ! "$ac_qt_includes" = "NO"; then
-         qt_incdirs="$ac_qt_includes $qt_incdirs"
-    fi
-
-    AC_FIND_FILE(QtCore/QCoreApplication, $qt_incdirs, qt_incdir)
-    if test "$qt_incdir" = "NO"; then
-      qt_incdir=""
-      AC_MSG_RESULT([not found])
-    else
-      ac_qt_includes="$qt_incdir"
-      AC_MSG_RESULT([$qt_incdir])
-    fi
-
-    if test -z "$qt_incdir"; then
-        AC_MSG_ERROR([could not find Qt4 headers])
-    fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the Qt libraries directory
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_PATH_QT_LIBRARIES],
-[
-    AC_MSG_CHECKING([for Qt4 libraries])
-   
-    qt_libdirs=""
-    for dir in $jwb_qt_dirs; do
-        qt_libdirs="$qt_libdirs $dir/lib $dir"
-    done
-    qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib"
-    
-    if test -n "$ac_qt_libraries"; then
-        qt_libdir=$ac_qt_libraries
-    else
-        qt_testlib="libQtCore"$jwb_qt_suffix
-        for qt_extension in la a so; do
-	    qt_testfile=$qt_testlib.$qt_extension
-            echo "configure: __oline__: looking for $qt_testfile" >&AC_FD_CC
-            AC_FIND_FILE($qt_testfile, $qt_libdirs, qt_libdir)
-            if test "$qt_libdir" = "NO"; then
-	        qt_libdir=""
-	    else
-	    	echo "configure: __oline__: found in $qt_libdir" >&AC_FD_CC
-                ac_qt_libraries="$qt_libdir"
-                break 2;
-	    fi
-        done
-    fi
-    
-    AC_MSG_RESULT([$qt_libdir])
-    if test -z "$qt_libdir"; then
-        AC_MSG_ERROR([could not find Qt4 libraries])
-    fi
-
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find a Qt module
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_PATH_QT_MODULE],
-[
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
-  
-  ac_cppflags_safe="$CPPFLAGS"
-  ac_cxxflags_safe="$CXXFLAGS"
-  ac_ldflags_safe="$LDFLAGS"
-  ac_libs_safe="$LIBS"
-
-  CPPFLAGS="$CPPFLAGS -I$qt_incdir"
-  LDFLAGS="$LDFLAGS -L$qt_libdir"
-  
-  have_module=no
-  AC_CHECK_HEADERS([$1/$1], [qt_have_module=yes], [qt_have_module=no])
- 
-  CPPFLAGS="$ac_cppflags_safe"
-  CXXFLAGS="$ac_cxxflags_safe"
-  LDFLAGS="$ac_ldflags_safe"
-  LIBS="$ac_libs_safe"
-
-  ac_have_qt_$1=$qt_have_module
-  if test "$qt_have_module" = "yes"; then
-      QT_INCLUDES="$QT_INCLUDES -I$qt_incdir/$1"
-      $2="-l$1"$jwb_qt_suffix
-      $3
-  else
-      $2=""
-      $4
-  fi
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Check a Qt module
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_CHECK_QT_MODULE],
-[
-  JWB_PATH_QT_MODULE($1,[LIB_]translit($1,'a-z','A-Z'),
-    [ac_have_qt_module=yes],
-    [ac_have_qt_module=no])
-  
-  AC_MSG_CHECKING([for $1])
-  if test "$ac_have_qt_module" = "yes"; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE([HAVE_]translit($1,'a-z','A-Z'), 1, [Defines if you have $1])
-    $2
-  else
-    AC_MSG_RESULT([no])
-    $3
-  fi
-  AC_SUBST([LIB_]translit($1,'a-z','A-Z'))
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Check whether the QtOpenGL module of Qt is available
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_HAVE_QTOPENGL],
-[
-  ac_have_qtopengl=no
-
-  dnl Check OpenGL support
-  AC_REQUIRE([JWB_HAVE_GL])
-  if test "$ac_cv_have_gl" = "yes"; then
-    JWB_PATH_QT_MODULE(QtOpenGL, LIB_QTOPENGL, [ac_have_qtopengl=yes])
-  fi
-
-  AC_MSG_CHECKING([for QtOpenGL])
-  if test "$ac_have_qtopengl" = "yes"; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE(HAVE_QTOPENGL, 1, [Defines if you have QtOpenGL])
-    $1
-  else
-    AC_MSG_RESULT([no])
-    $2
-  fi
-  
-  AC_SUBST(LIB_QTOPENGL)
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Find the Qt binaries, includes and libraries
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_CHECK_QT],
-[
-    AC_REQUIRE([JWB_QT_INIT])
-    AC_REQUIRE([JWB_PATH_QT_BIN])
-    
-    JWB_PATH_QT_INCLUDES
-    QT_INCLUDES="-I$qt_incdir -I$qt_incdir/Qt"
-    
-    JWB_PATH_QT_LIBRARIES
-    QT_LDFLAGS="-L$qt_libdir"
-  
-    dnl prerequisites
-    case "$host" in
-      *-apple-darwin* )
-        LIB_QT="-framework Carbon -liconv -lz -framework Cocoa"
-        ;;
-    esac
-
-    dnl compulsory modules
-    JWB_PATH_QT_MODULE(QtCore, LIB_QTCORE, [qt_have_core=yes], [qt_have_core=no])
-    JWB_PATH_QT_MODULE(QtGui, LIB_QTGUI, [qt_have_gui=yes], [qt_have_gui=no])
-   
-    AC_MSG_CHECKING([for Qt])
-    if test "$qt_have_core" = "yes" && test "$qt_have_gui" = "yes"; then
-      AC_MSG_RESULT([yes])
-      AC_DEFINE(HAVE_QT, 1, [Defines if you have Qt])
-      LIB_QT="$LIB_QT $LIB_QTCORE $LIB_QTGUI"
-      $1
-    else
-      AC_MSG_RESULT([no])
-      LIB_QT=""
-      $2
-    fi
-   
-    AC_SUBST(QT_INCLUDES)
-    AC_SUBST(QT_LDFLAGS)
-    AC_SUBST(LIB_QT)
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Check for various libraries
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_PATH_MISC],
-[
-    dnl Check various libraries
-    case "$host" in
-      *-apple-darwin* )
-        x_includes=""
-        x_libraries=""
-        ;;
-      *-mingw32* )
-        x_includes=""
-        x_libraries=""
-        ;;
-      *)
-        AC_PATH_X
-        AC_PATH_XTRA
-        ;;
-    esac
-
-    if test -z "$x_includes" || test "$x_includes" = NONE; then
-        X_INCLUDES=""
-    else
-        X_INCLUDES="-I$x_includes"
-    fi
-    if test -z "$x_libraries" || test "$x_libraries" = NONE; then
-        LIB_X11=""
-        X_LDFLAGS=""
-    else
-        LIB_X11="-lX11"
-        X_LDFLAGS="-L$x_libraries"
-    fi
-
-    AC_SUBST(LIB_X11) 
-    AC_SUBST(X_INCLUDES) 
-    AC_SUBST(X_LDFLAGS) 
-])
-
-
-dnl ------------------------------------------------------------------------
-dnl Check whether OpenGL is available (taken from KDE)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([JWB_HAVE_GL],
-[
-    AC_REQUIRE([JWB_PATH_MISC])
-    
-    jwb_gl_hprefix="GL"
-    case "$host" in 
-      *-apple-darwin* )
-        jwb_gl_libs="-framework OpenGL -framework AGL"
-        jwb_gl_hprefix="OpenGL"
-        ;;
-      *-mingw32* )
-        jwb_gl_libs="-lopengl32 -lglu32"
-        ;;
-      * )
-        jwb_gl_libs="-lGL -lGLU"
-        ;;
-    esac
-
-    test -z "$GL_LDFLAGS" && GL_LDFLAGS=
-    test -z "$GL_INCLUDE" && GL_INCLUDE=
-
-    AC_ARG_WITH(gl,AC_HELP_STRING([--without-gl],[disable 3D GL modes]),
-                gl_test=$withval, gl_test="yes")
-    if test "x$gl_test" = xno; then
-        ac_cv_have_gl=no
-    else
-        AC_MSG_CHECKING(for GL)
-        AC_CACHE_VAL(ac_cv_have_gl,
-        [
-            AC_LANG_SAVE
-            AC_LANG_CPLUSPLUS
-            ac_save_ldflags=$LDFLAGS
-            ac_save_cxxflags=$CXXFLAGS
-            ac_save_libs=$LIBS
-            LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
-            LIBS="$LIBS $jwb_gl_libs"
-            test -n "$LIB_X11" && LIBS="$LIBS $LIB_X11"
-            LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
-            CXXFLAGS="$CFLAGS $X_INCLUDES"
-            test -n "$GL_INCLUDE" && CFLAGS="-I$GL_INCLUDE $CFLAGS"
-            AC_TRY_LINK([#include <$jwb_gl_hprefix/gl.h>
-#include <$jwb_gl_hprefix/glu.h>
-], [], ac_cv_have_gl="yes", ac_cv_have_gl="no")
-            AC_LANG_RESTORE
-            LDFLAGS=$ac_save_ldflags
-            CXXFLAGS=$ac_save_cxxflags
-            LIBS=$ac_save_libs
-         ])dnl
-
-        if test "$ac_cv_have_gl" = "no"; then
-            AC_MSG_RESULT(no)
-            GL_LDFLAGS=""
-            GLINC=""
-            $2
-        else
-            AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
-            if test "$GL_LDFLAGS" = ""; then
-                GLLIB="$jwb_gl_libs "'$(LIB_X11)'
-            else
-                GLLIB="$GL_LDFLAGS $jwb_gl_libs "'$(LIB_X11)'
-            fi
-            if test "$GL_INCLUDE" = ""; then
-                GLINC=""
-            else
-                GLINC="-I$GL_INCLUDE"
-            fi
-            AC_MSG_RESULT($ac_cv_have_gl)
-            $1
-        fi
-    fi
-    AC_SUBST(GLINC)
-    AC_SUBST(GLLIB)
-])
-
-

Deleted: trunk/sailcut/admin/utils.m4.in
===================================================================
--- trunk/sailcut/admin/utils.m4.in	2008-10-23 06:03:18 UTC (rev 539)
+++ trunk/sailcut/admin/utils.m4.in	2008-10-23 06:05:22 UTC (rev 540)
@@ -1,116 +0,0 @@
-##   -*- autoconf -*-
-
-dnl    This file is part of the KDE libraries/packages
-dnl    Copyright (C) 1997 Janos Farkas (chexum@...)
-dnl              (C) 1997,98,99 Stephan Kulow (coolo@...)
-
-dnl    This file is free software; you can redistribute it and/or
-dnl    modify it under the terms of the GNU Library General Public
-dnl    License as published by the Free Software Foundation; either
-dnl    version 2 of the License, or (at your option) any later version.
-
-dnl    This library is distributed in the hope that it will be useful,
-dnl    but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-dnl    Library General Public License for more details.
-
-dnl    You should have received a copy of the GNU Library General Public License
-dnl    along with this library; see the file COPYING.LIB.  If not, write to
-dnl    the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
-dnl    Boston, MA 02110-1301, USA.
-
-dnl IMPORTANT NOTE:
-dnl Please do not modify this file unless you expect your modifications to be
-dnl carried into every other module in the repository. 
-dnl
-dnl Single-module modifications are best placed in configure.in for kdelibs
-dnl and kdebase or configure.in.in if present.
-
-dnl ------------------------------------------------------------------------
-dnl Find a file (or one of more files in a list of dirs)
-dnl ------------------------------------------------------------------------
-dnl
-AC_DEFUN([AC_FIND_FILE],
-[
-$3=NO
-for i in $2;
-do
-  for j in $1;
-  do
-    echo "configure: __oline__: $i/$j" >&AC_FD_CC
-    if test -r "$i/$j"; then
-      echo "taking that" >&AC_FD_CC
-      $3=$i
-      break 2
-    fi
-  done
-done
-])
-
-
-dnl KDE_FIND_PATH(program-name, variable-name, list-of-dirs,
-dnl	if-not-found, test-parameter, prepend-path)
-dnl
-dnl Look for program-name in list-of-dirs+$PATH.
-dnl If prepend-path is set, look in $PATH+list-of-dirs instead.
-dnl If found, $variable-name is set. If not, if-not-found is evaluated.
-dnl test-parameter: if set, the program is executed with this arg,
-dnl                 and only a successful exit code is required.
-AC_DEFUN([KDE_FIND_PATH],
-[
-   AC_MSG_CHECKING([for $1])
-   if test -n "$$2"; then
-        kde_cv_path="$$2";
-   else
-        kde_cache=`echo $1 | sed 'y%./+-%__p_%'`
-
-        AC_CACHE_VAL(kde_cv_path_$kde_cache,
-        [
-        kde_cv_path="NONE"
-	kde_save_IFS=$IFS
-	IFS=':'
-	dirs=""
-	for dir in $PATH; do
-	  dirs="$dirs $dir"
-	done
-	if test -z "$6"; then  dnl Append dirs in PATH (default)
-	  dirs="$3 $dirs"
-        else  dnl Prepend dirs in PATH (if 6th arg is set)
-	  dirs="$dirs $3"
-	fi
-	IFS=$kde_save_IFS
-
-        for dir in $dirs; do
-	  if test -x "$dir/$1"; then
-	    if test -n "$5"
-	    then
-              evalstr="$dir/$1 $5 2>&1 "
-	      if eval $evalstr; then
-                kde_cv_path="$dir/$1"
-                break
-	      fi
-            else
-		kde_cv_path="$dir/$1"
-                break
-	    fi
-          fi
-        done
-
-        eval "kde_cv_path_$kde_cache=$kde_cv_path"
-
-        ])
-
-      eval "kde_cv_path=\"`echo '$kde_cv_path_'$kde_cache`\""
-
-   fi
-
-   if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
-      AC_MSG_RESULT(not found)
-      $4
-   else
-      AC_MSG_RESULT($kde_cv_path)
-      $2=$kde_cv_path
-
-   fi
-])
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 536
          http://sailcut.svn.sourceforge.net/sailcut/?rev=536&view=rev
Author:   jeremy_laine
Date:     2008-10-22 15:41:20 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
fix warning

Modified Paths:
--------------
    trunk/sailcut/src/formprint.h

Modified: trunk/sailcut/src/formprint.h
===================================================================
--- trunk/sailcut/src/formprint.h	2008-10-22 15:31:30 UTC (rev 535)
+++ trunk/sailcut/src/formprint.h	2008-10-22 15:41:20 UTC (rev 536)
@@ -37,7 +37,7 @@
 public:
     CPrintLabel(CFormPrint *form);
     /** Get the current page. */
-    const int getPage()
+    int getPage()
     {
         return page;
     };


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 535
          http://sailcut.svn.sourceforge.net/sailcut/?rev=535&view=rev
Author:   jeremy_laine
Date:     2008-10-22 15:31:30 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
fix autogen.sh to run on MacOS/X

Modified Paths:
--------------
    trunk/sailcut/autogen.sh

Modified: trunk/sailcut/autogen.sh
===================================================================
--- trunk/sailcut/autogen.sh	2008-10-22 15:26:49 UTC (rev 534)
+++ trunk/sailcut/autogen.sh	2008-10-22 15:31:30 UTC (rev 535)
@@ -1,10 +1,17 @@
 #! /bin/sh
-# $Id: autogen.sh,v 1.2 2005/09/03 14:28:58 jeremy_laine Exp $
+if test -n "`which glibtoolize`"; then
+  LIBTOOLIZE=glibtoolize
+else
+  LIBTOOLIZE=libtoolize
+fi
+if test -d /opt/local/share/aclocal; then
+  ACLOCAL_FLAGS=-I/opt/local/share/aclocal
+fi
 
 cat admin/utils.m4.in admin/qt.m4.in admin/sailcut.m4.in > acinclude.m4
 
-aclocal \
-  && libtoolize --force --copy \
+aclocal $ACLOCAL_FLAGS \
+  && $LIBTOOLIZE --force --copy \
   && autoheader \
   && automake --add-missing --foreign --copy \
   && autoconf


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 534
          http://sailcut.svn.sourceforge.net/sailcut/?rev=534&view=rev
Author:   jeremy_laine
Date:     2008-10-22 15:26:49 +0000 (Wed, 22 Oct 2008)

Log Message:
-----------
add XPM files to avoid compile errors

Added Paths:
-----------
    trunk/sailcut/icons/panel.xpm
    trunk/sailcut/icons/panelgroup.xpm
    trunk/sailcut/icons/point.xpm
    trunk/sailcut/icons/sailcut.xpm

Added: trunk/sailcut/icons/panel.xpm
===================================================================
--- trunk/sailcut/icons/panel.xpm	                        (rev 0)
+++ trunk/sailcut/icons/panel.xpm	2008-10-22 15:26:49 UTC (rev 534)
@@ -0,0 +1,83 @@
+/* XPM */
+static const char *panel_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 44 1",
+/* colors */
+"  c #000000",
+". c #00002B",
+"X c #0000C0",
+"o c #000042",
+"O c #0000AF",
+"+ c #000045",
+"@ c #0000DA",
+"# c #00009B",
+"$ c #00001D",
+"% c #00009E",
+"& c #000076",
+"* c #000037",
+"= c #000023",
+"- c #00004E",
+"; c #000079",
+": c #0000CF",
+"> c #0000AD",
+", c #00002F",
+"< c #00005D",
+"1 c #000088",
+"2 c #000049",
+"3 c #000035",
+"4 c #0000CD",
+"5 c #000010",
+"6 c #0000E7",
+"7 c #000013",
+"8 c #00003E",
+"9 c #0000FE",
+"0 c #000016",
+"q c #000041",
+"w c #000044",
+"e c #0000DC",
+"r c #FFFFFF",
+"t c #000089",
+"y c #00004A",
+"u c #00008C",
+"i c #000078",
+"p c #000025",
+"a c #000050",
+"s c #00003C",
+"d c #0000BD",
+"f c #0000E8",
+"g c #0000FF",
+"h c None",
+/* pixels */
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"h$i111111111111111111<hhhhhhhhhh",
+"hh-6ggggggggggggggggg9;hhhhhhhhh",
+"hhh2@...",
+"hhhhw4gggggggggggggggggg%hhhhhhh",
+"hhhhhhdggggggggggggggggggOhhhhhh",
+"hhhhhhh>ggggggggggggggggggXhhhhh",
+"hhhhhhhh#gggggggggggggggggg:+hhh",
+"hhhhhhhhhtgggggggggggggggggge2hh",
+"hhhhhhhhhh&9gggggggggggggggggfah",
+"hhhhhhhhhhh+yyyyyyyyyyyyyyyyyywh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh",
+"hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh"
+};

Added: trunk/sailcut/icons/panelgroup.xpm
===================================================================
--- trunk/sailcut/icons/panelgroup.xpm	                        (rev 0)
+++ trunk/sailcut/icons/panelgroup.xpm	2008-10-22 15:26:49 UTC (rev 534)
@@ -0,0 +1,127 @@
+/* XPM */
+static const char *panelgroup_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 88 1",
+/* colors */
+"  c #000000",
+". c #006687",
+"X c #00002B",
+"o c #003445",
+"O c #000017",
+"+ c #000042",
+"@ c #00006D",
+"# c #0000EE",
+"$ c #009CCF",
+"% c #002F3E",
+"& c #00161D",
+"* c #003141",
+"= c #000034",
+"- c #00005F",
+"; c #003A4E",
+": c #003344",
+"> c #0003D6",
+", c #001A23",
+"< c #00000C",
+"1 c #0000CC",
+"2 c #006789",
+"3 c #0000F7",
+"4 c #0082AD",
+"5 c #00698C",
+"6 c #00255E",
+"7 c #00AFE8",
+"8 c #005B78",
+"9 c #008FBD",
+"0 c #00006B",
+"q c #006688",
+"w c #009ACD",
+"e c #002D3C",
+"r c #001992",
+"t c #000046",
+"y c #0000DB",
+"u c #00AEE7",
+"i c #000032",
+"p c #002835",
+"a c #00005D",
+"s c #000088",
+"d c #00759B",
+"f c #00212B",
+"g c #003142",
+"h c #00009F",
+"j c #000035",
+"k c #00779E",
+"l c #00004C",
+"z c #000C10",
+"x c #00007A",
+"c c #005976",
+"v c #00003B",
+"b c #0000FB",
+"n c #00A6DC",
+"m c #000E13",
+"M c #0000E7",
+"N c #00007D",
+"B c #0000FE",
+"V c #005A9A",
+"C c #002937",
+"Z c #00002A",
+"A c #000055",
+"S c #001897",
+"D c #00002D",
+"F c #000A86",
+"G c #0000F0",
+"H c #00384A",
+"J c #00001C",
+"K c #FFFFFF",
+"L c #00C0FF",
+"P c #00004A",
+"I c #0090C0",
+"U c #0000F6",
+"Y c #003C50",
+"T c #00008C",
+"R c #00232F",
+"E c #000039",
+"W c #00A4DA",
+"Q c #00008F",
+"! c #000185",
+"~ c #003749",
+"^ c #0000E5",
+"/ c #000011",
+"( c #0084AF",
+") c #00BFFE",
+"_ c #0000FC",
+"` c #000053",
+"' c #0000FF",
+"] c None",
+/* pixels */
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]DPPPPPPPPPPPPPPPPPPP]]]]]]]]]]]",
+"]]h''''''''''''''''''1+]]]]]]]]]",
+"]]]T''''''''''''''''''yt]]]]]]]]",
+"]]]]xB'''''''''''''''''Ml]]]]]]]",
+"]]]]]0b'''''''''''''''''GA]]]]]]",
+"]]]]]]aU'''''''''''''''''3-]]]]]",
+"]]]]]]]`#'''''''''''''''''_@]]]]",
+"]]]]]]]]P^''''''''''''''''''N]]]",
+"]&8qqqqq.6>''''''''''''''''''Q]]",
+"]];uLLLLLLVrSSSSSSSSSSF!ssssss=]",
+"]]]~WLLLLLLLLLLLLLLLLLL5]]]]]]]]",
+"]]]]:wLLLLLLLLLLLLLLLLLLk]]]]]]]",
+"]]]]]]9LLLLLLLLLLLLLLLLLL(]]]]]]",
+"]]]]]]]4LLLLLLLLLLLLLLLLLLI]]]]]",
+"]]]]]]]]dLLLLLLLLLLLLLLLLLL$o]]]",
+"]]]]]]]]]2LLLLLLLLLLLLLLLLLLn~]]",
+"]]]]]]]]]]c)LLLLLLLLLLLLLLLLL7Y]",
+"]]]]]]]]]]]oHHHHHHHHHHHHHHHHHH:]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",
+"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+};

Added: trunk/sailcut/icons/point.xpm
===================================================================
--- trunk/sailcut/icons/point.xpm	                        (rev 0)
+++ trunk/sailcut/icons/point.xpm	2008-10-22 15:26:49 UTC (rev 534)
@@ -0,0 +1,76 @@
+/* XPM */
+static const char *point_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 37 1",
+/* colors */
+"  c #000000",
+". c #00BAF7",
+"X c #001217",
+"o c #001017",
+"O c #000D10",
+"+ c #001F2A",
+"@ c #0085B1",
+"# c #00B9F6",
+"$ c #001116",
+"% c #002C3A",
+"& c #000C0F",
+"* c #002936",
+"= c #00090B",
+"- c #001F28",
+"; c #001D28",
+": c #0085B2",
+"> c #00080A",
+", c #002A38",
+"< c #001117",
+"1 c #00B2ED",
+"2 c #0087B5",
+"3 c #000A0D",
+"4 c #007297",
+"5 c #00749A",
+"6 c #00202A",
+"7 c #001016",
+"8 c #00090C",
+"9 c #00ACE5",
+"0 c #00141C",
+"q c #FFFFFF",
+"w c #000608",
+"e c #00C0FF",
+"r c #000F15",
+"t c #00506A",
+"y c #00749B",
+"u c #00070A",
+"i c None",
+/* pixels */
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiii iiiiiiiiiiiiiii iiiiiiii",
+"iiiiiiii iiiiiiiiiiiii iiiiiiiii",
+"iiiiiiiii iiiiiiiiiii iiiiiiiiii",
+"iiiiiiiiii iiiiiiiii iiiiiiiiiii",
+"iiiiiiiiiii iii-<ii iiiiiiiiiiii",
+"iiiiiiiiiiii >,#:$ iiiiiiiiiiiii",
+"iiiiiiiiiiiii*#ee@...",
+"iiiiiiiiiiii%.eeee2<iiiiiiiiiiii",
+"iiiiiiiiiii>9eeeeeet8iiiiiiiiiii",
+"iiiiiiiiiiii61eeeeyXiiiiiiiiiiii",
+"iiiiiiiiiiiii;1ee4riiiiiiiiiiiii",
+"iiiiiiiiiiii i+15o iiiiiiiiiiiii",
+"iiiiiiiiiii iii0$ii iiiiiiiiiiii",
+"iiiiiiiiii iiiiiiiii iiiiiiiiiii",
+"iiiiiiiii iiiiiiiiiii iiiiiiiiii",
+"iiiiiiii iiiiiiiiiiiii iiiiiiiii",
+"iiiiiii iiiiiiiiiiiiiii iiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"
+};

Added: trunk/sailcut/icons/sailcut.xpm
===================================================================
--- trunk/sailcut/icons/sailcut.xpm	                        (rev 0)
+++ trunk/sailcut/icons/sailcut.xpm	2008-10-22 15:26:49 UTC (rev 534)
@@ -0,0 +1,408 @@
+/* XPM */
+static const char *sailcut_xpm[] = {
+/* width height ncolors chars_per_pixel */
+"32 32 369 2",
+/* colors */
+"   c #000000",
+" . c #7E7EAA",
+" X c #DFDFE8",
+" o c #ADADAD",
+" O c #8A8AB9",
+" + c #383883",
+" @ c #9D9DC5",
+" # c #B8B8C5",
+" $ c #7B7B9D",
+" % c #8888B7",
+" & c #8B8BB0",
+" * c #9B9BC3",
+" = c #9E9EBC",
+" - c #AEAECF",
+" ; c #4C4C86",
+" : c #7474A0",
+" > c #9C9CBA",
+" , c #4A4A84",
+" < c #A5A5A5",
+" 1 c #B0B0BD",
+" 2 c #40408E",
+" 3 c #6B6BA1",
+" 4 c #59598C",
+" 5 c #CCCCDF",
+" 6 c #7A7AA9",
+" 7 c #0D0D73",
+" 8 c #4D4D94",
+" 9 c #F2F2F7",
+" 0 c #9090AE",
+" q c #6B6B8D",
+" w c #7878A7",
+" e c #ABABAE",
+" r c #363684",
+" t c #B1B1CB",
+" y c #B4B4C4",
+" u c #43438A",
+" i c #2E2E7C",
+" p c #9393BE",
+" a c #6E6E9D",
+" s c #2C2C7A",
+" d c #7C7CAE",
+" f c #8F8FBA",
+" g c #525292",
+" h c #9292B3",
+" j c #55558B",
+" k c #C8C8DE",
+" l c #474791",
+" z c #B5B5BE",
+" x c #EAEAF2",
+" c c #ADADCA",
+" v c #73739B",
+" b c #5B5B94",
+" n c #ACACBF",
+" m c #5A5A89",
+" M c #6767A3",
+" N c #F7F7F8",
+" B c #A5A5C2",
+" V c #63639F",
+" C c #7E7E9F",
+" Z c #7676AB",
+" A c #9E9EC5",
+" S c #5F5F9B",
+" D c #8686AA",
+" F c #71719C",
+" G c #E4E4EF",
+" H c #BDBDCC",
+" J c #2B2B75",
+" K c #ABABB7",
+" L c #7979A7",
+" P c #6161A0",
+" I c #9797A0",
+" U c #4C4C92",
+" Y c #DFDFE0",
+" T c #A8A8AA",
+" R c #333380",
+" E c #5B5B9A",
+" W c #B6B6BB",
+" Q c #595998",
+" ! c #D9D9DA",
+" ~ c #C1C1D3",
+" ^ c #7F7FB0",
+" / c #D2D2DD",
+" ( c #707094",
+" ) c #7D7DAE",
+" _ c #404086",
+" ` c #D0D0DB",
+" ' c #B8B8D4",
+" ] c #3C3C82",
+" [ c #272774",
+" { c #6A6A8E",
+" } c #62629A",
+" | c #7575A6",
+".  c #202077",
+".. c #EDEDF4",
+".X c #333383",
+".o c #CBCBCC",
+".O c #7373A4",
+".+ c #B3B3C5",
+".@ c #5E5E96",
+".# c #9999BC",
+".$ c #FEFEFE",
+".% c #C1C1D6",
+".& c #ACACC8",
+".* c #FCFCFC",
+".= c #FAFAFA",
+".- c #8080AA",
+".; c #535395",
+".: c #F8F8F8",
+".> c #7B7BAF",
+"., c #F6F6F6",
+".< c #828298",
+".1 c #F4F4F4",
+".2 c #9F9FC5",
+".3 c #DFDFE6",
+".4 c #9595A4",
+".5 c #8D8DB0",
+".6 c #F2F2F2",
+".7 c #B8B8C3",
+".8 c #3B3B7A",
+".9 c #36367F",
+".0 c #D6D6E7",
+".q c #D9D9E0",
+".w c #9C9CB8",
+".e c #ECECEC",
+".r c #EAEAEA",
+".t c #484880",
+".y c #8080AD",
+".u c #E8E8E8",
+".i c #E6E6E6",
+".p c #E4E4E4",
+".a c #B7B7CF",
+".s c #E2E2E2",
+".d c #7878A5",
+".f c #F0F0F3",
+".g c #A9A9AA",
+".h c #DEDEDE",
+".j c #9999C2",
+".k c #DCDCDC",
+".l c #6F6FA6",
+".z c #9797C0",
+".x c #DADADA",
+".c c #D8D8D8",
+".v c #ABABC3",
+".b c #BBBBD6",
+".n c #9696B5",
+".m c #59598D",
+".M c #44447F",
+".N c #D4D4D4",
+".B c #6A6A97",
+".V c #CFCFD9",
+".C c #525290",
+".Z c #D2D2D2",
+".A c #CACADE",
+".S c #D0D0D0",
+".D c #CECECE",
+".F c #8989B2",
+".G c #C9C9D3",
+".H c #CCCCCC",
+".J c #47478F",
+".K c #C7C7D1",
+".L c #6F6FA9",
+".P c #CACACA",
+".I c #B5B5BC",
+".U c #C8C8C8",
+".Y c #C6C6C6",
+".T c #6E6E9E",
+".R c #565697",
+".E c #7E7EB1",
+".W c #C4C4C4",
+".Q c #545495",
+".! c #9494B6",
+".~ c #7C7CAF",
+".^ c #C2C2C2",
+"./ c #A5A5C0",
+".( c #C0C0C0",
+".) c #D0D0D3",
+"._ c #63639D",
+".` c #9E9EC3",
+".' c #BCBCBC",
+".] c #BABABA",
+".[ c #626292",
+".{ c #35357D",
+".} c #454590",
+".| c #B8B8B8",
+"X  c #484889",
+"X. c #7070A3",
+"XX c #C4C4C7",
+"Xo c #6F6F98",
+"XO c #B2B2B2",
+"X+ c #D2D2D8",
+"X@ c #B0B0B0",
+"X# c #AEAEAE",
+"X$ c #646497",
+"X% c #8F8FAA",
+"X& c #AAAAAA",
+"X* c #9F9FBD",
+"X= c #A8A8A8",
+"X- c #9D9DBB",
+"X; c #48488C",
+"X: c #ADADCE",
+"X> c #31317C",
+"X, c #A2A2A2",
+"X< c #B2B2B5",
+"X1 c #9A9AAE",
+"X2 c #2D2D78",
+"X3 c #A3A3C4",
+"X4 c #7E7EA3",
+"X5 c #292974",
+"X6 c #393987",
+"X7 c #4C4C93",
+"X8 c #0A0A70",
+"X9 c #7272AB",
+"X0 c #5D5D9D",
+"Xq c #DDDDDF",
+"Xw c #5B5B9B",
+"Xe c #1C1C71",
+"Xr c #8181B3",
+"Xt c #7F7FB1",
+"Xy c #5A5A90",
+"Xu c #BFBFD2",
+"Xi c #D5D5D7",
+"Xp c #000066",
+"Xa c #404087",
+"Xs c #73738E",
+"Xd c #C0C0C9",
+"Xf c #B9B9CC",
+"Xg c #4F4F8F",
+"Xh c #4A4A94",
+"Xj c #656594",
+"Xk c #A5A5B5",
+"Xl c #DADAE9",
+"Xz c #7878A0",
+"Xx c #0E0E63",
+"Xc c #7373A5",
+"Xv c #9999BD",
+"Xb c #57579A",
+"Xn c #000069",
+"Xm c #9B9BAB",
+"XM c #29297A",
+"XN c #F6F6F7",
+"XB c #F4F4F5",
+"XV c #000055",
+"XC c #7878A3",
+"XZ c #000080",
+"XA c #7C7C93",
+"XS c #EEEEEF",
+"XD c #B4B4C0",
+"XF c #C1C1DA",
+"XG c #454588",
+"XH c #00006C",
+"XJ c #9898B5",
+"XK c #BBBBD4",
+"XL c #6666A5",
+"XP c #9999AC",
+"XI c #A6A6C6",
+"XU c #9191B8",
+"XY c #6C6C97",
+"XT c #545490",
+"XR c #27277B",
+"XE c #4F4F95",
+"XW c #8F8FB6",
+"XQ c #E2E2E3",
+"X! c #50508C",
+"X~ c #9090AD",
+"X^ c #9E9EBE",
+"X/ c #C4C4D6",
+"X( c #5A5A99",
+"X) c #9595BF",
+"X_ c #585897",
+"X` c #6E6E9C",
+"X' c #B1B1B6",
+"X] c #9191BB",
+"X[ c #D2D2D3",
+"X{ c #DDDDEB",
+"X} c #B8B8CA",
+"X| c #8B8BB5",
+"o  c #CECECF",
+"o. c #DCDCE0",
+"oX c #626290",
+"oo c #5A5A9C",
+"oO c #FFFFFF",
+"o+ c #FDFDFD",
+"o@ c #6B6BA6",
+"o# c #FBFBFB",
+"o$ c #F9F9F9",
+"o% c #F7F7F7",
+"o& c #7A7AAE",
+"o* c #7D7DA7",
+"o= c #686899",
+"o- c #F5F5F5",
+"o; c #515189",
+"o: c #9191AA",
+"o> c #61619C",
+"o, c #F1F1F1",
+"o< c #8F8FA8",
+"o1 c #373780",
+"o2 c #EFEFEF",
+"o3 c #8D8DA6",
+"o4 c #787898",
+"o5 c #202070",
+"o6 c #EDEDED",
+"o7 c #33337C",
+"o8 c #EBEBEB",
+"o9 c #9696BC",
+"o0 c #595994",
+"oq c #E9E9E9",
+"ow c #E7E7E7",
+"oe c #6A6A9E",
+"or c #525297",
+"ot c #E5E5E5",
+"oy c #E3E3E3",
+"ou c #A6A6BB",
+"oi c #E1E1E1",
+"op c #242477",
+"oa c #0F0F69",
+"os c #5F5F9D",
+"od c #DFDFDF",
+"of c #BABABE",
+"og c #DDDDDD",
+"oh c #DBDBDB",
+"oj c #D9D9D9",
+"ok c #8181B1",
+"ol c #5F5F89",
+"oz c #9494BD",
+"ox c #171774",
+"oc c #D7D7D7",
+"ov c #A7A7C9",
+"ob c #2D2D79",
+"on c #D5D5D5",
+"om c #D0D0DA",
+"oM c #696996",
+"oN c #848496",
+"oB c #A4A4BC",
+"oV c #F1F1F7",
+"oC c #CFCFCF",
+"oZ c #626299",
+"oA c #CACAD4",
+"oS c #CDCDCD",
+"oD c #7575A5",
+"oF c #5D5D9E",
+"oG c #484890",
+"oH c #CBCBCB",
+"oJ c #8E8EA3",
+"oK c #C9C9C9",
+"oL c #8181B4",
+"oP c #C7C7C7",
+"oI c #8A8A9F",
+"oU c #E7E7ED",
+"oY c #C5C5C5",
+"oT c #C0C0CA",
+"oR c #7B7BAE",
+"oE c #C1C1C1",
+"oW c #7C7CA5",
+"oQ c #BFBFBF",
+"o! c #4F4F90",
+"o~ c #7D7D9C",
+"o^ c #BDBDBD",
+"o/ c #B0B0CE",
+"o( c #4C4C83",
+"o) c #B7B7B7",
+"o_ c #D4D4E4",
+"o` c #D7D7DD",
+"o' c #B5B5B5",
+"o] c #555599",
+"o[ c #B3B3B3",
+"o{ c #6E6E97",
+"o} c #16166F",
+"o| c #BBBBD2",
+"O  c None",
+/* pixels */
+"O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O O O O .0O O O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O O O .zoO.2O O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O O O X{oOX:O O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O O  *oOoO 'O O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O O  GoOoO.bO O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O  AoOoOoOX)O O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O O  xoOoO..orO O O O O O O O O O O O O ",
+"O O O O O O O O O O O O O .`o#.$ 9.>.jO  GO O O O O O O O O O O ",
+"O O O O O O O O O O O O O oU.:.AO  ^oV 8oOo_O O O O O O O O O O ",
+"O O O O O O O O O O O O o9 cO O .~ 9oOXb.$oOovO O O O O O O O O ",
+"O O O O O O O O O O O O O O O o/ N.*oOoFo$o+ @o@... O O O O O O O ",
+"O O O O O O O O O O O O Xv.aXS.1o%o$ 5O .1.fO  k -O O O O O O O ",
+"O O O O O O O O O O O X^oq.eo2o,.1o%Xtoro2 f )o#oO pO O O O O O ",
+"O O O O O O O O O O .OXQowoq.eo2o,.%o& Z.FO .3.,.=.2.}O O O O O ",
+"O O O O O O O O O O  Hoi.powoq.eX/O XKokO .qo6o,o-O XFO O O O O ",
+"O O O O O O O O O  &.k.hoi.pow BO  t.6X].!.p.u.eo|O XNXlO O O O ",
+"O O O O O O O O O .)oj.koAX-O O  ~o6o2X| >odoy `O XI.1.: OO O O ",
+"O O O O O O O O  DXJ.5 LO O X*o.ow.rXuO  y.x.vO .yo8o2 XO  %O O ",
+"O O O O O O O O O O o* h.+ogod.sotomO  uXd.-O  =.s.i.rX3O XBXrO ",
+"O O O O O O O X$.7oC.Z.Noc.xogodXq 3.#X;O  aoTojogoi.VO .&.6ozO ",
+"O O O O O O O  z.P.HoC.Z.Noc.xX+ |O o`O XzoH.S.N.c.KO XWoq /O O ",
+"O O O O O O o:.WoP.P.HoC.Z.N.wO oD.GXfO .I.YoHoC nO  . Y.pXUO O ",
+"O O O O O XYoQ.^.WoP.P.oou.TO .n !og./O o^oEXkX`O XJocohX}O O O ",
+"O O O O O X'.'oQofX%X4O O oW #on.cXi wo~XmoMO X`XD.D.ZoBO O O O ",
+"O O O O .m $XoO O O  FX~XXoS.S.ZX[.dO  ;O .BXPoEoYoK 0O O O O O ",
+"O O O O O O o{ Co< W.^oY.U.PoSo XCO O O .4o[o).'X1o=O O O O O O ",
+"O O O  ( eXOo'.|.]o^.(.^oY.U 1 :O O O .<X&X#oJ.[O O O O O O O O ",
+"O O  m.g oX@...^.( KXzO O O O O oN {O O O O O O O O O O O ",
+"O O  IX=X& oX@... vO O O O O O O O O O O O O O O O O O O O ",
+"O XAX, <X= ToIo4oXO O O O O O O O O O O O O O O O O O O O O O O ",
+".8Xs qolO O O O O O O O O O O O O O O O O O O O O O O O O O O O "
+};


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 533
          http://sailcut.svn.sourceforge.net/sailcut/?rev=533&view=rev
Author:   sailcuter
Date:     2008-10-21 20:37:39 +0000 (Tue, 21 Oct 2008)

Log Message:
-----------
changed spinbox xyz to allow negative displacement

Modified Paths:
--------------
    trunk/sailcut/src/boatdef-panel.cpp

Modified: trunk/sailcut/src/boatdef-panel.cpp
===================================================================
--- trunk/sailcut/src/boatdef-panel.cpp	2008-10-18 20:14:07 UTC (rev 532)
+++ trunk/sailcut/src/boatdef-panel.cpp	2008-10-21 20:37:39 UTC (rev 533)
@@ -42,7 +42,7 @@
     for (int i = 0; i < 3; i++)
     {
         QSpinBox *spin = new QSpinBox(this);
-        spin->setRange(0, 10000);
+        spin->setRange(-10000, 10000);
         spin->setSingleStep(10);
         spinBox.push_back(spin);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 531
          http://sailcut.svn.sourceforge.net/sailcut/?rev=531&view=rev
Author:   sailcuter
Date:     2008-10-14 20:49:22 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
replaced addHems by add6Hems in layout0

Modified Paths:
--------------
    trunk/sailcut/src/sailcpp/sailworker.cpp

Modified: trunk/sailcut/src/sailcpp/sailworker.cpp
===================================================================
--- trunk/sailcut/src/sailcpp/sailworker.cpp	2008-10-14 20:47:43 UTC (rev 530)
+++ trunk/sailcut/src/sailcpp/sailworker.cpp	2008-10-14 20:49:22 UTC (rev 531)
@@ -201,7 +201,7 @@
     unsigned int j = 0, k = 0, cnt = 0;
     bool flag = false;  // to check if top of sail is reached
 
-    /* create arrays t1 and t2 of type of intersection
+    /* create arrays t1 and t2 of type of intersection of upper seam
     *  respectively at points p1 on luff side and p2 on leech side
     *  t=1 seam intersect foot at point p1
     *  t=2 seam intersect luff
@@ -309,9 +309,9 @@
                 // move all top points of top panel to gaff curve
                 for (k = 1 ; k < npb -1 ; k++)
                     lay[npanel -1].top[k] = EdgeIntersect( GAFF_EDGE, lay[npanel-1].top[k], CVector3d (head.y()-peak.y(),peak.x()-head.x(),0));
-                ////// end peak panel /////
+                // end peak panel //
             }
-            else   // normal panel  ///////////////////////////
+            else   // normal panel below peak //////
             {
                 /* find position of luff/seam intersection relative to tack and head */
                 if ( seamL.intersect(luffLine).getdim() == 0 )
@@ -324,7 +324,7 @@
                         p1[npanel] = seamL.intersect(footLine).getp();
                     else throw CException("CSailDef::Layout0 -2 : intersection of seam and foot is not a point!");
 
-                    t1[npanel] =1;  // 1=foot type of intersection
+                    t1[npanel] =1;  // type1=1 = foot type of intersection
 
                     if ( npanel == 1 )
                     {   // set lower edge to start at same point p1
@@ -338,12 +338,12 @@
                         p1[npanel] = seamL.intersect(gaffLine).getp();
                     else throw CException("CSailDef::Layout0 -3 : intersection of seam and foot is not a point!");
 
-                    t1[npanel] = 3;  // 3=gaff type of intersection
+                    t1[npanel] = 3;  // 3 = gaff type of intersection
                 }
                 else
                 {   // seam intersects luff
                     p1[npanel] = ip;
-                    t1[npanel] = 2;  // luff
+                    t1[npanel] = 2;  // 2 = luff
                     if ( npanel == 1 )
                     {   // force seam 0 to start at the tack
                         p1[0] = tack;
@@ -417,7 +417,6 @@
                         lay[0].bottom[k] = EdgeIntersect( FOOT_EDGE, lay[0].bottom[k], CVector3d(0,-1,0));
                     }
                 }
-
 #ifdef DEBUG
                 if ( npanel == 1 )
                 {
@@ -443,12 +442,10 @@
 #endif
 
             /** Develop the current panel */
-            if ( npanel == 1 )
-            {
+            if ( npanel == 1 ) {
                 dev[npanel-1] = lay[npanel-1].develop(ALIGN_TOP);
             }
-            else
-            {
+            else {
                 dev[npanel-1] = lay[npanel-1].develop(ALIGN_BOTTOM);
                 // add deviation of previous panel top edge to bottom edge
                 for (k = 1; k < npb-1; k ++)
@@ -459,8 +456,7 @@
             *   the developed panel and straighten this top edge
             *   except if this is the top panel
             */
-            if ( flag == false )
-            {
+            if ( flag == false ) {
                 vb= CMatrix::rot3d(2,PI/2) * CVector3d(dev[npanel-1].top[npb-1] - dev[npanel-1].top[0]).unit();
                 for (k = 1 ; k < npb -1 ; k ++)
                 {
@@ -472,13 +468,18 @@
             }
 
             /** Add the seam and hems allowance */
-            if ( npanel == 1 )
-                dev[npanel-1].addHems(hemsW, seamW, leechHemW, footHemW);
-            else if ( flag == true )
-                dev[npanel-1].addHems(hemsW, hemsW, leechHemW, 0);
-            else
-                dev[npanel-1].addHems(hemsW, seamW, leechHemW, 0);
-
+            if ( npanel == 1 ) {
+                dev[npanel-1].add6Hems(hemsW, hemsW, seamW, leechHemW, leechHemW, footHemW);
+            }        
+            else if ( flag == true ) {
+                dev[npanel-1].add6Hems(hemsW, hemsW, hemsW, leechHemW, leechHemW, 0);
+            }
+            else {
+                if ( t1[npanel-1] == 1 && t1[npanel] == 2 )
+                    dev[npanel-1].add6Hems(footHemW, hemsW, seamW, leechHemW, leechHemW, footHemW);
+                else 
+                    dev[npanel-1].add6Hems(hemsW, hemsW, seamW, leechHemW, leechHemW, footHemW);
+            }
             /* Check the width of developed panel and store the excess */
             exc = dev[npanel-1].boundingRect().height() - clothW;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 530
          http://sailcut.svn.sourceforge.net/sailcut/?rev=530&view=rev
Author:   sailcuter
Date:     2008-10-14 20:47:43 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
editorial

Modified Paths:
--------------
    trunk/sailcut/src/sailcpp/saildef.cpp

Modified: trunk/sailcut/src/sailcpp/saildef.cpp
===================================================================
--- trunk/sailcut/src/sailcpp/saildef.cpp	2008-10-14 20:47:09 UTC (rev 529)
+++ trunk/sailcut/src/sailcpp/saildef.cpp	2008-10-14 20:47:43 UTC (rev 530)
@@ -62,7 +62,7 @@
     seamW = 13;         // in millimetre
     leechHemW = 40;  // in millimetre
     footHemW = 30;
-    hemsW = 20;        // in millimetre
+    hemsW = 10;        // in millimetre
 
     twistDeg = 18;      // in degree
     sheetDeg = 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 529
          http://sailcut.svn.sourceforge.net/sailcut/?rev=529&view=rev
Author:   sailcuter
Date:     2008-10-14 20:47:09 +0000 (Tue, 14 Oct 2008)

Log Message:
-----------
editorial

Modified Paths:
--------------
    trunk/sailcut/src/sailcpp/panel.cpp

Modified: trunk/sailcut/src/sailcpp/panel.cpp
===================================================================
--- trunk/sailcut/src/sailcpp/panel.cpp	2008-10-12 18:01:43 UTC (rev 528)
+++ trunk/sailcut/src/sailcpp/panel.cpp	2008-10-14 20:47:09 UTC (rev 529)
@@ -437,10 +437,10 @@
 
 /** Add the cloth for stitching to the 6 edges of the panel.
  *  This create the panel to be cut (outside the basic panel)
- *   lolw, hilw = width to be added on left side
- *   topw = width to be added on top side
- *   lorw, hirw = width to be added on right side
- *   botw = width to be added on bottom side
+ *   lolW, hilW = width to be added on lo-hi left side
+ *   topW = width to be added on top side
+ *   lorW, hirW = width to be added on lo-hi right side
+ *   botW = width to be added on bottom side
  *
  * @author Robert Laine alias Sailcuter
  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.