Skip to content
Permalink
Browse files

Use Qt::NoPen and Qt::NoBrush for features not contained in a graduat…

…ed symbol item. Before this commit, the pen and brush of the last feature was used

git-svn-id: http://svn.osgeo.org/qgis/trunk@6098 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent
mhugent committed Nov 16, 2006
1 parent 6803162 commit b63dd1aa2b29ad7d95ab9e0fa0e5b315a178a00c
Showing with 99 additions and 66 deletions.
  1. +72 −56 resources/context_help/Makefile
  2. +24 −8 resources/context_help/Makefile.in
  3. +3 −2 src/gui/qgsgraduatedsymbolrenderer.cpp
@@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.8.5 from Makefile.am.
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# resources/context_help/Makefile. Generated from Makefile.in by configure.

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -46,6 +46,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu
subdir = resources/context_help
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -59,26 +60,32 @@ CONFIG_HEADER = $(top_builddir)/qgsconfig.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(contexthelpdir)"
contexthelpDATA_INSTALL = $(INSTALL_DATA)
DATA = $(contexthelp_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = ${SHELL} /home/gsherman/development/qgis_switch_test/missing --run aclocal-1.8
ACLOCAL = ${SHELL} /home/humarco/src/qgis/missing --run aclocal-1.9
AMDEP_FALSE = #
AMDEP_TRUE =
AMTAR = ${SHELL} /home/gsherman/development/qgis_switch_test/missing --run tar
AMTAR = ${SHELL} /home/humarco/src/qgis/missing --run tar
AR = ar
AUTOCONF = ${SHELL} /home/gsherman/development/qgis_switch_test/missing --run autoconf
AUTOHEADER = ${SHELL} /home/gsherman/development/qgis_switch_test/missing --run autoheader
AUTOMAKE = ${SHELL} /home/gsherman/development/qgis_switch_test/missing --run automake-1.8
AUTOCONF = ${SHELL} /home/humarco/src/qgis/missing --run autoconf
AUTOHEADER = ${SHELL} /home/humarco/src/qgis/missing --run autoheader
AUTOMAKE = ${SHELL} /home/humarco/src/qgis/missing --run automake-1.9
AWK = mawk
CC = ccache gcc
CC = gcc
CCDEPMODE = depmode=gcc3
CFLAGS = -O0 -g
CPP = ccache gcc -E
CFLAGS = -g -O2
CPP = gcc -E
CPPFLAGS =
CXX = ccache g++
CXXCPP = ccache g++ -E
CXX = g++
CXXCPP = g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -O0 -g
CYGPATH_W = echo
@@ -89,23 +96,24 @@ ECHO = echo
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = grep -E
EGREP = /bin/grep -E
EXEEXT =
EXTRA_VERSION = 0
F77 =
FFLAGS =
GDAL_CFLAGS = -I/usr/local/include
GDAL_CONFIG = /usr/local/bin/gdal-config
GDAL_LDADD = -L/usr/local/lib -lgdal
GEOS_CFLAGS = -O0 -g -I/usr/local/include
GEOS_CONFIG = /usr/local/bin/geos-config
GEOS_LDADD = -L/usr/local/lib -lgeos
GRASS_BASE = /usr/local/grass-6.1.cvs
GRASS_INC = /usr/local/grass-6.1.cvs/include/
GRASS_LIB = -L/usr/local/grass-6.1.cvs/lib -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj -lutil
GSL_CFLAGS = -I/usr/local/include
GSL_CONFIG = /usr/local/bin/gsl-config
GSL_LIBS = -L/usr/local/lib -lgsl -lgslcblas -lm
GDAL_CFLAGS = -I/usr/include
GDAL_CONFIG = /usr/bin/gdal-config
GDAL_LDADD = -L/usr/lib -lgdal
GEOS_CFLAGS = -I/usr/include
GEOS_CONFIG = /usr/bin/geos-config
GEOS_LDADD = -L/usr/lib -lgeos
GRASS_BASE = /usr/lib/grass
GRASS_INC = /usr/lib/grass/include/
GRASS_LIB = -L/usr/lib/grass/lib -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj -lutil
GREP = /bin/grep
GSL_CFLAGS = -I/usr/include
GSL_CONFIG = /usr/bin/gsl-config
GSL_LIBS = -L/usr/lib -lgsl -lgslcblas -lm
HAVE_EXPAT_FALSE = #
HAVE_EXPAT_TRUE =
HAVE_GRASS = 1
@@ -125,8 +133,8 @@ HAVE_QTMAC_TRUE = #
HAVE_SPIT_FALSE = #
HAVE_SPIT_TRUE =
HAVE_SVNVERSION = yes
HAVE_WFS_FALSE =
HAVE_WFS_TRUE = #
HAVE_WFS_FALSE = #
HAVE_WFS_TRUE =
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
@@ -142,10 +150,10 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool
LN_S = ln -s
LTLIBOBJS =
MAJOR_VERSION = 0
MAKEINFO = ${SHELL} /home/gsherman/development/qgis_switch_test/missing --run makeinfo
MAKEINFO = ${SHELL} /home/humarco/src/qgis/missing --run makeinfo
MICRO_VERSION = 0
MINOR_VERSION = 8
MOC = /usr/local/Trolltech/Qt-4.2.1/bin/moc
MOC = /home/humarco/src/qt-x11-opensource-src-4.2.1/bin/moc
NO_UIC_IMPLEMENTATIONS_FALSE =
NO_UIC_IMPLEMENTATIONS_TRUE = #
OBJEXT = o
@@ -157,38 +165,37 @@ PACKAGE_TARNAME =
PACKAGE_VERSION =
PATH_SEPARATOR = :
PG_CONFIG = /usr/local/pgsql/bin/pg_config
PG_INC = -I/usr/local/pgsql-8.1.3/include
PG_LIB = -L/usr/local/pgsql-8.1.3/lib -lpq
PG_INC = -I/usr/local/pgsql/include
PG_LIB = -L/usr/local/pgsql/lib -lpq
PROJ_INC =
PROJ_LIB = -lproj
PYTHON_BIN = python2.4
PYTHON_INCLUDE_DIR = -I/usr/include/python2.4
PYTHON_LIB = -lpython2.4
PYTHON_BIN =
PYTHON_INCLUDE_DIR =
PYTHON_LIB =
QASSISTANTCLIENT_LDADD = -lqassistantclient
QTDIR = /usr/local/Trolltech/Qt-4.2.1
QT_CXXFLAGS = -DQT3_SUPPORT -I/usr/local/Trolltech/Qt-4.2.1/mkspecs/default -I/usr/local/Trolltech/Qt-4.2.1/include/Qt3Support -I/usr/local/Trolltech/Qt-4.2.1/include/QtCore -I/usr/local/Trolltech/Qt-4.2.1/include/QtDesigner -I/usr/local/Trolltech/Qt-4.2.1/include/QtGui -I/usr/local/Trolltech/Qt-4.2.1/include/QtNetwork -I/usr/local/Trolltech/Qt-4.2.1/include/QtOpenGL -I/usr/local/Trolltech/Qt-4.2.1/include/QtSql -I/usr/local/Trolltech/Qt-4.2.1/include/QtXml -I/usr/local/Trolltech/Qt-4.2.1/include -I/usr/local/Trolltech/Qt-4.2.1/include/QtSvg -I/usr/local/Trolltech/Qt-4.2.1/include/QtTest -I/usr/local/Trolltech/Qt-4.2.1/include/QtDesigner -D_REENTRANT -DQT_THREAD_SUPPORT
QTDIR = /home/humarco/src/qt-x11-opensource-src-4.2.1
QT_CXXFLAGS = -DQT3_SUPPORT -I/home/humarco/src/qt-x11-opensource-src-4.2.1/mkspecs/default -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/Qt3Support -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtCore -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtDesigner -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtGui -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtNetwork -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtOpenGL -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtSql -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtXml -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtSvg -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtTest -I/home/humarco/src/qt-x11-opensource-src-4.2.1/include/QtDesigner -D_REENTRANT -DQT_THREAD_SUPPORT
QT_GUILINK =
QT_LDADD = -L/usr/local/Trolltech/Qt-4.2.1/lib -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtSvg -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtXml -lQtSvg -lQtTest -lQtDesigner
QT_LDADD = -L/home/humarco/src/qt-x11-opensource-src-4.2.1/lib -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtSvg -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtXml -lQtSvg -lQtTest -lQtDesigner
RANLIB = ranlib
RCC = /usr/local/Trolltech/Qt-4.2.1/bin/rcc
RCC = /home/humarco/src/qt-x11-opensource-src-4.2.1/bin/rcc
SET_MAKE =
SHELL = /bin/sh
SHELL = /bin/bash
SQLITE3_INC =
SQLITE3_LIB = -lsqlite3
STRIP = strip
UIC = /usr/local/Trolltech/Qt-4.2.1/bin/uic
USE_PYTHON_FALSE = #
USE_PYTHON_TRUE =
UIC = /home/humarco/src/qt-x11-opensource-src-4.2.1/bin/uic
USE_PYTHON_FALSE =
USE_PYTHON_TRUE = #
VERSION = 0.8.0
WITH_UNITTESTS_FALSE =
WITH_UNITTESTS_TRUE = #
XMKMF =
YACC = bison -y
ac_ct_AR = ar
ac_ct_CC = ccache gcc
ac_ct_CXX =
YFLAGS =
ac_ct_CC = gcc
ac_ct_CXX = g++
ac_ct_F77 =
ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip
ac_prefix_program =
am__fastdepCC_FALSE = #
am__fastdepCC_TRUE =
@@ -197,30 +204,39 @@ am__fastdepCXX_TRUE =
am__include = include
am__leading_dot = .
am__quote =
am__tar = ${AMTAR} chof - "$$tardir"
am__untar = ${AMTAR} xf -
bindir = ${exec_prefix}/bin
build = i686-pc-linux-gnu
build_alias =
build_cpu = i686
build_os = linux-gnu
build_vendor = pc
datadir = ${prefix}/share
datadir = ${datarootdir}
datarootdir = ${prefix}/share
docdir = ${datarootdir}/doc/${PACKAGE}
dvidir = ${docdir}
exec_prefix = ${prefix}
host = i686-pc-linux-gnu
host_alias =
host_cpu = i686
host_os = linux-gnu
host_vendor = pc
htmldir = ${docdir}
includedir = ${prefix}/include
infodir = ${prefix}/info
install_sh = /home/gsherman/development/qgis_switch_test/install-sh
infodir = ${datarootdir}/info
install_sh = /home/humarco/src/qgis/install-sh
libdir = ${exec_prefix}/lib
libexecdir = ${exec_prefix}/libexec
localedir = ${datarootdir}/locale
localstatedir = ${prefix}/var
mandir = ${prefix}/man
mkdir_p = mkdir -p -- .
mandir = ${datarootdir}/man
mkdir_p = mkdir -p --
oldincludedir = /usr/include
prefix = /home/gsherman/qgis08
pdfdir = ${docdir}
prefix = /home/humarco/src/qgis
program_transform_name = s,x,x,
psdir = ${docdir}
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
@@ -275,15 +291,15 @@ install-contexthelpDATA: $(contexthelp_DATA)
test -z "$(contexthelpdir)" || $(mkdir_p) "$(DESTDIR)$(contexthelpdir)"
@list='$(contexthelp_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
f=$(am__strip_dir) \
echo " $(contexthelpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(contexthelpdir)/$$f'"; \
$(contexthelpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(contexthelpdir)/$$f"; \
done

uninstall-contexthelpDATA:
@$(NORMAL_UNINSTALL)
@list='$(contexthelp_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(contexthelpdir)/$$f'"; \
rm -f "$(DESTDIR)$(contexthelpdir)/$$f"; \
done
@@ -347,7 +363,7 @@ mostlyclean-generic:
clean-generic:

distclean-generic:
-rm -f $(CONFIG_CLEAN_FILES)
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1,8 +1,8 @@
# Makefile.in generated by automake 1.8.5 from Makefile.am.
# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@

# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
# 2003, 2004 Free Software Foundation, Inc.
# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -46,6 +46,7 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = resources/context_help
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -59,6 +60,12 @@ CONFIG_HEADER = $(top_builddir)/qgsconfig.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(contexthelpdir)"
contexthelpDATA_INSTALL = $(INSTALL_DATA)
DATA = $(contexthelp_DATA)
@@ -103,6 +110,7 @@ GEOS_LDADD = @GEOS_LDADD@
GRASS_BASE = @GRASS_BASE@
GRASS_INC = @GRASS_INC@
GRASS_LIB = @GRASS_LIB@
GREP = @GREP@
GSL_CFLAGS = @GSL_CFLAGS@
GSL_CONFIG = @GSL_CONFIG@
GSL_LIBS = @GSL_LIBS@
@@ -182,13 +190,12 @@ USE_PYTHON_TRUE = @USE_PYTHON_TRUE@
VERSION = @VERSION@
WITH_UNITTESTS_FALSE = @WITH_UNITTESTS_FALSE@
WITH_UNITTESTS_TRUE = @WITH_UNITTESTS_TRUE@
XMKMF = @XMKMF@
YACC = @YACC@
ac_ct_AR = @ac_ct_AR@
YFLAGS = @YFLAGS@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_prefix_program = @ac_prefix_program@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -197,30 +204,39 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -275,15 +291,15 @@ install-contexthelpDATA: $(contexthelp_DATA)
test -z "$(contexthelpdir)" || $(mkdir_p) "$(DESTDIR)$(contexthelpdir)"
@list='$(contexthelp_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
f=$(am__strip_dir) \
echo " $(contexthelpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(contexthelpdir)/$$f'"; \
$(contexthelpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(contexthelpdir)/$$f"; \
done

uninstall-contexthelpDATA:
@$(NORMAL_UNINSTALL)
@list='$(contexthelp_DATA)'; for p in $$list; do \
f="`echo $$p | sed -e 's|^.*/||'`"; \
f=$(am__strip_dir) \
echo " rm -f '$(DESTDIR)$(contexthelpdir)/$$f'"; \
rm -f "$(DESTDIR)$(contexthelpdir)/$$f"; \
done
@@ -347,7 +363,7 @@ mostlyclean-generic:
clean-generic:

distclean-generic:
-rm -f $(CONFIG_CLEAN_FILES)
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -100,9 +100,10 @@ void QgsGraduatedSymbolRenderer::renderFeature(QPainter * p, QgsFeature * f, QPi
}
}

if (it == mSymbols.end()) //value is contained in no item
if (it == mSymbols.end()) //only draw features which are covered by a render item
{
std::cout << "Warning, value is contained in no class" << std::endl << std::flush;
p->setPen(QPen(Qt::NoPen));
p->setBrush(QBrush(Qt::NoBrush));
return;
}
else

0 comments on commit b63dd1a

Please sign in to comment.
You can’t perform that action at this time.