[goffice] 2009-07-24 Jean Brefort <jean brefort normalesup org>

[Jean Bréfort <jbrefort src gnome org>]

commit 613df2eb4b343544a7a7c20cfb96d04c91ace190
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Jul 24 17:58:06 2009 +0200

    2009-07-24  Jean Brefort  <jean brefort normalesup org>
    
    	* plugins/plot_surface/gog-contour.c (gog_contour_view_render): don't
    	stop filling surface when one vertex is at a different level than the three
    	others. [#589512]
    	* plugins/plot_surface/gog-xyz-surface-prefs.glade: change tool tips to
    	something more meaningful. [#589511]

 ChangeLog                                        |    8 ++++++++
 NEWS                                             |    1 +
 plugins/plot_surface/gog-contour.c               |    4 +++-
 plugins/plot_surface/gog-xyz-surface-prefs.glade |   10 +++++-----
 4 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3eaadfb..833fb0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-24  Jean Brefort  <jean brefort normalesup org>
+
+	* plugins/plot_surface/gog-contour.c (gog_contour_view_render): don't
+	stop filling surface when one vertex is at a different level than the three
+	others. [#589512]
+	* plugins/plot_surface/gog-xyz-surface-prefs.glade: change tool tips to
+	something more meaningful. [#589511]
+
 2009-07-23  Jean Brefort  <jean brefort normalesup org>
 
 	* plugins/plot_surface/plot-types.xml.in: fix #589512.
diff --git a/NEWS b/NEWS
index 483960b..e260f63 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Andreas:
 
 Jean:
 	* Align surface ticks with grid. [#585298]
+	* Fixed various contour plots related issues. [#589511, #589512]
 
 Morten:
 	* Fix format localization problem. [#586567]
diff --git a/plugins/plot_surface/gog-contour.c b/plugins/plot_surface/gog-contour.c
index 54045db..84bb38b 100644
--- a/plugins/plot_surface/gog-contour.c
+++ b/plugins/plot_surface/gog-contour.c
@@ -1005,7 +1005,9 @@ gog_contour_view_render (GogView *view, GogViewAllocation const *bbox)
 						}
 					}
 					if (fabs (x0 - x1) < CONTOUR_EPSILON
-						&& fabs (y0 - y1) < CONTOUR_EPSILON)
+						&& fabs (y0 - y1) < CONTOUR_EPSILON
+						&&fabs (x0 - x[0]) > CONTOUR_EPSILON
+						&& fabs (y0 - y[0]) > CONTOUR_EPSILON)
 						continue;
 					while (k < s) {
 						go_path_line_to (path, x[k], y[k]);
diff --git a/plugins/plot_surface/gog-xyz-surface-prefs.glade b/plugins/plot_surface/gog-xyz-surface-prefs.glade
index f9e8a58..76c8ecc 100644
--- a/plugins/plot_surface/gog-xyz-surface-prefs.glade
+++ b/plugins/plot_surface/gog-xyz-surface-prefs.glade
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window1">
     <property name="title" translatable="yes">window1</property>
     <child>
@@ -45,7 +45,7 @@
           <widget class="GtkSpinButton" id="rows_spinner">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="tooltip" translatable="yes">Separation between groups as a percentage of bar/col width</property>
+            <property name="tooltip" translatable="yes">Number of rows of the data matrix used to display the data.</property>
             <property name="adjustment">10 2 1000 1 10 0</property>
             <property name="climb_rate">10</property>
             <property name="snap_to_ticks">True</property>
@@ -62,7 +62,7 @@
           <widget class="GtkSpinButton" id="columns_spinner">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="tooltip" translatable="yes">How far the bars/cols overlap as a percentage of the width</property>
+            <property name="tooltip" translatable="yes">Number of columns of the data matrix used to display the data.</property>
             <property name="adjustment">10 2 1000 1 10 0</property>
             <property name="climb_rate">0.10000000000000001</property>
             <property name="snap_to_ticks">True</property>