[genius] Fri Jun 14 10:48:41 2013 Jiri (George) Lebl <jirka 5z com>
- From: George Lebl <jirka src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [genius] Fri Jun 14 10:48:41 2013 Jiri (George) Lebl <jirka 5z com>
- Date: Fri, 14 Jun 2013 15:49:06 +0000 (UTC)
commit 2a13e337602bb5ee9ee998ba1b6cabbc448b7cdc
Author: Jiri (George) Lebl <jirka 5z com>
Date: Fri Jun 14 10:48:46 2013 -0500
Fri Jun 14 10:48:41 2013 Jiri (George) Lebl <jirka 5z com>
* gtkextra/*: finish updating GtkExtra to 3.0.5
ChangeLog | 4 +
NEWS | 15 +-
gtkextra/CONVERTEDTO3 | 11 +-
gtkextra/gtkplot3d.c | 919 +++++++++++++++++++++++++++++++++++++++++----
gtkextra/gtkplot3d.h | 27 +-
gtkextra/gtkplotdt.c | 87 ++++-
gtkextra/gtkplotdt.h | 28 +-
gtkextra/gtkplotsurface.c | 433 ++++++++++++++++++++--
gtkextra/gtkplotsurface.h | 54 ++-
9 files changed, 1408 insertions(+), 170 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ffe2be0..5df6aa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 14 10:48:41 2013 Jiri (George) Lebl <jirka 5z com>
+
+ * gtkextra/*: finish updating GtkExtra to 3.0.5
+
Fri Jun 14 10:04:20 2013 Jiri (George) Lebl <jirka 5z com>
* src/gnome-genius.c: Properly report errors from saving files
diff --git a/NEWS b/NEWS
index 5d3eb3c..f0eaf39 100644
--- a/NEWS
+++ b/NEWS
@@ -4,18 +4,19 @@ Changes to 1.0.17
smaller if needed
* Line plots and parametric plots now allow "fit dependent axis" automatically when
z limits are unspecified. And this is the default in the UI
-* Line plot step size is adaptive, also line plots now detect jumps and don't
- draw a connecting line
-* All plots are now antialiased on the screen.
- (Obtained by updating pieces of internal GtkExtra updated to obtain Cairo
- drawing)
-* Add export of graphs to PDF
+* Add export of graphs to PDF directly
+* Line plot step size is adaptive, also line plots now detect jumps and do not
+ draw a connecting line, try plotting UnitStep for example
+* All plots are now antialiased on the screen (due to GtkExtra update and
+ cairo usage).
+* Update internal GtkExtra to 3.0.5, and forward port all our changes/fixes
+ (this gets us closer to supporting GTK+3 at some point)
* Completion for "help on function" in the GUI
* Fix FindRootBisection and FindRootMullersMethod
* Factors is now a lot faster on very large numbers (as fast as Factorize)
* A few small fixes and updates to the documentation
* A few minor bugfixes
-* Update mersenne primes
+* Update mersenne primes (new one is known)
* During making of these changes the author (Jiri) was partially supported by
NSF grant DMS 0900885 and the University of Wisconsin-Madison
diff --git a/gtkextra/CONVERTEDTO3 b/gtkextra/CONVERTEDTO3
index 7ce1a15..82ffa9c 100644
--- a/gtkextra/CONVERTEDTO3
+++ b/gtkextra/CONVERTEDTO3
@@ -1,3 +1,7 @@
+Some files have changes and fixes of our own, so ... don't just wholesale update,
+we have to hand merge and check these through. I try to keep changes minimal
+to be able to update easily, but ...
+
File VERSION
gtkplotcairo.[ch] 3.0.5 (was new)
gtkextra-compat.h 3.0.5 (was new)
@@ -22,7 +26,6 @@ gtkplotpolar.[ch] 3.0.5
gtkplotgdk.[ch] 3.0.5
gtkplotdata.[ch] 3.0.5
gtkplot.[ch] 3.0.5
-
-gtkplot3d.[ch] 2.? svn
-gtkplotdt.[ch] 2.? svn
-gtkplotsurface.[ch] 2.? svn
+gtkplot3d.[ch] 3.0.5
+gtkplotdt.[ch] 3.0.5
+gtkplotsurface.[ch] 3.0.5
diff --git a/gtkextra/gtkplot3d.c b/gtkextra/gtkplot3d.c
index 5c983fd..34ad193 100644
--- a/gtkextra/gtkplot3d.c
+++ b/gtkextra/gtkplot3d.c
@@ -17,6 +17,14 @@
* Boston, MA 02111-1307, USA.
*/
+/**
+ * SECTION: gtkplot3d
+ * @short_description: 3d scientific plots widget
+ *
+ * FIXME:: Need long description.
+ */
+
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -135,26 +143,21 @@ extern inline gint roundint (gdouble x);
static GtkPlotClass *parent_class = NULL;
-GtkType
+GType
gtk_plot3d_get_type (void)
{
- static GtkType plot_type = 0;
+ static GType plot_type = 0;
if (!plot_type)
{
- GtkTypeInfo plot_info =
- {
- "GtkPlot3D",
- sizeof (GtkPlot3D),
- sizeof (GtkPlot3DClass),
- (GtkClassInitFunc) gtk_plot3d_class_init,
- (GtkObjectInitFunc) gtk_plot3d_init,
- /* reserved 1*/ NULL,
- /* reserved 2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- plot_type = gtk_type_unique (gtk_plot_get_type(), &plot_info);
+ plot_type = g_type_register_static_simple (
+ gtk_plot_get_type(),
+ "GtkPlot3D",
+ sizeof (GtkPlot3DClass),
+ (GClassInitFunc) gtk_plot3d_class_init,
+ sizeof (GtkPlot3D),
+ (GInstanceInitFunc) gtk_plot3d_init,
+ 0);
}
return plot_type;
}
@@ -168,7 +171,7 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
GtkPlot3DClass *plot3d_class;
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- parent_class = gtk_type_class (gtk_plot_get_type ());
+ parent_class = g_type_class_ref (gtk_plot_get_type ());
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -182,18 +185,36 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
plot_class->plot_paint = gtk_plot3d_real_paint;
plot3d_class->get_pixel = gtk_plot3d_real_get_pixel;
+
+ /**
+ * GtkPlot3D:center_vector:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_CENTER,
g_param_spec_pointer ("center_vector",
P_("Center"),
P_("Position of the center point"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:origin_vector:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ORIGIN,
g_param_spec_pointer ("origin_vector",
P_("Origin"),
P_("Position of the origin"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:a1:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_A1,
g_param_spec_double ("a1",
@@ -201,6 +222,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Angle 1"),
-G_MAXDOUBLE, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:a2:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_A2,
g_param_spec_double ("a2",
@@ -208,6 +235,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Angle 2"),
-G_MAXDOUBLE, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:a3:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_A3,
g_param_spec_double ("a3",
@@ -215,6 +248,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Angle 3"),
-G_MAXDOUBLE, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xy_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XY_VISIBLE,
g_param_spec_boolean ("xy_visible",
@@ -222,6 +261,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XY Plane visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yz_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YZ_VISIBLE,
g_param_spec_boolean ("yz_visible",
@@ -229,6 +274,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YZ Plane visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zx_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZX_VISIBLE,
g_param_spec_boolean ("zx_visible",
@@ -236,36 +287,72 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZX Plane visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:color_xy:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_COLOR_XY,
g_param_spec_pointer ("color_xy",
P_("XY Color"),
P_("Color of XY Plane"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:color_yz:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_COLOR_YZ,
g_param_spec_pointer ("color_yz",
P_("YZ Color"),
P_("Color of YZ Plane"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:color_zx:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_COLOR_ZX,
g_param_spec_pointer ("color_zx",
P_("ZX Color"),
P_("Color of ZX Plane"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:frame_line:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_FRAME,
g_param_spec_pointer ("frame_line",
P_("Frame Line"),
P_("Frame Line"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:corner_line:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_CORNER,
g_param_spec_pointer ("corner_line",
P_("Corner Line"),
P_("Corner Line"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:corner_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_CORNER_VISIBLE,
g_param_spec_boolean ("corner_visible",
@@ -273,6 +360,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Draw the entire cube"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zmin:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZMIN,
g_param_spec_double ("zmin",
@@ -280,6 +373,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Min value of the Z axis"),
-G_MAXDOUBLE, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zmax:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZMAX,
g_param_spec_double ("zmax",
@@ -287,6 +386,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Max value of the Z axis"),
-G_MAXDOUBLE, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zscale:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZSCALE,
g_param_spec_int ("zscale",
@@ -294,6 +399,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Scale used for the Z axis"),
0,G_MAXINT,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:titles_offset:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_TITLES_OFFSET,
g_param_spec_int ("titles_offset",
@@ -301,6 +412,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Titles distance from the axes"),
-G_MAXINT,G_MAXINT,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xfactor:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XFACTOR,
g_param_spec_double ("xfactor",
@@ -308,6 +425,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Relative size of the x axis"),
0.0, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yfactor:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YFACTOR,
g_param_spec_double ("yfactor",
@@ -315,6 +438,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Relative size of the y axis"),
0.0, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zfactor:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZFACTOR,
g_param_spec_double ("zfactor",
@@ -322,18 +451,36 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Relative size of the z axis"),
0.0, G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:e1_vector:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_E1,
g_param_spec_pointer ("e1_vector",
P_("E1"),
P_("Vector e1"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:e2_vector:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_E2,
g_param_spec_pointer ("e2_vector",
P_("E2"),
P_("Vector e2"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:e3_vector:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_E3,
g_param_spec_pointer ("e3_vector",
@@ -341,6 +488,11 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("Vector e3"),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+ /**
+ * GtkPlot3D:xy_label_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XY_LABEL_MASK,
g_param_spec_int ("xy_label_mask",
@@ -348,6 +500,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XY label mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xy_major_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XY_MAJOR_MASK,
g_param_spec_int ("xy_major_mask",
@@ -355,6 +513,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XY major mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xy_minor_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XY_MINOR_MASK,
g_param_spec_int ("xy_minor_mask",
@@ -362,6 +526,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XY minor mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xy_title_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XY_TITLE_VISIBLE,
g_param_spec_boolean ("xy_title_visible",
@@ -369,6 +539,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XY title Visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xz_label_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XZ_LABEL_MASK,
g_param_spec_int ("xz_label_mask",
@@ -376,6 +552,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XZ label mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xz_major_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XZ_MAJOR_MASK,
g_param_spec_int ("xz_major_mask",
@@ -383,6 +565,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XZ major mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xz_minor_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XZ_MINOR_MASK,
g_param_spec_int ("xz_minor_mask",
@@ -390,6 +578,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XZ minor mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:xz_title_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_XZ_TITLE_VISIBLE,
g_param_spec_boolean ("xz_title_visible",
@@ -397,6 +591,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("XZ title Visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yz_label_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YZ_LABEL_MASK,
g_param_spec_int ("yz_label_mask",
@@ -404,6 +604,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YZ label mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yz_major_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YZ_MAJOR_MASK,
g_param_spec_int ("yz_major_mask",
@@ -411,6 +617,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YZ major mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yz_minor_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YZ_MINOR_MASK,
g_param_spec_int ("yz_minor_mask",
@@ -418,6 +630,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YZ minor mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yz_title_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YZ_TITLE_VISIBLE,
g_param_spec_boolean ("yz_title_visible",
@@ -425,6 +643,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YZ title Visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yx_label_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YX_LABEL_MASK,
g_param_spec_int ("yx_label_mask",
@@ -432,6 +656,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YX label mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yx_major_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YX_MAJOR_MASK,
g_param_spec_int ("yx_major_mask",
@@ -439,6 +669,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YX major mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yx_minor_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YX_MINOR_MASK,
g_param_spec_int ("yx_minor_mask",
@@ -446,6 +682,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YX minor mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:yx_title_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_YX_TITLE_VISIBLE,
g_param_spec_boolean ("yx_title_visible",
@@ -453,6 +695,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("YX title Visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zx_label_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZX_LABEL_MASK,
g_param_spec_int ("zx_label_mask",
@@ -460,6 +708,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZX label mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zx_major_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZX_MAJOR_MASK,
g_param_spec_int ("zx_major_mask",
@@ -467,6 +721,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZX major mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zx_minor_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZX_MINOR_MASK,
g_param_spec_int ("zx_minor_mask",
@@ -474,6 +734,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZX minor mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zx_title_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZX_TITLE_VISIBLE,
g_param_spec_boolean ("zx_title_visible",
@@ -481,6 +747,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZX title Visible"),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zy_label_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZY_LABEL_MASK,
g_param_spec_int ("zy_label_mask",
@@ -488,6 +760,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZY label mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zy_major_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZY_MAJOR_MASK,
g_param_spec_int ("zy_major_mask",
@@ -495,6 +773,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZY major mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zy_minor_mask:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZY_MINOR_MASK,
g_param_spec_int ("zy_minor_mask",
@@ -502,6 +786,12 @@ gtk_plot3d_class_init (GtkPlot3DClass *klass)
P_("ZY minor mask"),
0,3,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlot3D:zy_title_visible:
+ *
+ *
+ **/
g_object_class_install_property(gobject_class,
PROP_ZY_TITLE_VISIBLE,
g_param_spec_boolean ("zy_title_visible",
@@ -519,7 +809,7 @@ gtk_plot3d_init (GtkPlot3D *plot)
GdkColor color;
gint i;
- GTK_WIDGET_SET_FLAGS(plot, GTK_NO_WINDOW);
+ gtk_widget_set_has_window(GTK_WIDGET(plot), FALSE);
for(i = 0; i < 360; i++){
plot->ncos[i] = cos(i*PI/180.);
@@ -527,8 +817,10 @@ gtk_plot3d_init (GtkPlot3D *plot)
}
widget = GTK_WIDGET(plot);
- gdk_color_black(gtk_widget_get_colormap(widget), &widget->style->black);
- gdk_color_white(gtk_widget_get_colormap(widget), &widget->style->white);
+ gdk_color_black(gtk_widget_get_colormap(widget),
+ >k_widget_get_style(widget)->black);
+ gdk_color_white(gtk_widget_get_colormap(widget),
+ >k_widget_get_style(widget)->white);
GTK_PLOT(plot)->legends_x = .8;
@@ -639,11 +931,11 @@ gtk_plot3d_init (GtkPlot3D *plot)
plot->az->line.line_style = GTK_PLOT_LINE_SOLID;
plot->az->line.line_width = 2;
- plot->az->line.color = widget->style->black;
+ plot->az->line.color = gtk_widget_get_style(widget)->black;
plot->az->labels_attr.text = NULL;
plot->az->labels_attr.height = DEFAULT_FONT_HEIGHT;
- plot->az->labels_attr.fg = widget->style->black;
- plot->az->labels_attr.bg = widget->style->white;
+ plot->az->labels_attr.fg = gtk_widget_get_style(widget)->black;
+ plot->az->labels_attr.bg = gtk_widget_get_style(widget)->white;
plot->az->labels_attr.transparent = TRUE;
plot->az->labels_attr.justification = GTK_JUSTIFY_CENTER;
plot->az->labels_attr.angle = 0;
@@ -653,18 +945,18 @@ gtk_plot3d_init (GtkPlot3D *plot)
plot->az->title.angle = 90;
plot->az->title.justification = GTK_JUSTIFY_CENTER;
plot->az->title.height = DEFAULT_FONT_HEIGHT;
- plot->az->title.fg = widget->style->black;
- plot->az->title.bg = widget->style->white;
+ plot->az->title.fg = gtk_widget_get_style(widget)->black;
+ plot->az->title.bg = gtk_widget_get_style(widget)->white;
plot->az->title.transparent = TRUE;
plot->az->title_visible = TRUE;
plot->ax->line.line_style = GTK_PLOT_LINE_SOLID;
plot->ax->line.line_width = 2;
- plot->ax->line.color = widget->style->black;
+ plot->ax->line.color = gtk_widget_get_style(widget)->black;
plot->ax->labels_attr.text = NULL;
plot->ax->labels_attr.height = DEFAULT_FONT_HEIGHT;
- plot->ax->labels_attr.fg = widget->style->black;
- plot->ax->labels_attr.bg = widget->style->white;
+ plot->ax->labels_attr.fg = gtk_widget_get_style(widget)->black;
+ plot->ax->labels_attr.bg = gtk_widget_get_style(widget)->white;
plot->ax->labels_attr.transparent = TRUE;
plot->ax->labels_attr.justification = GTK_JUSTIFY_CENTER;
plot->ax->labels_attr.angle = 0;
@@ -674,18 +966,18 @@ gtk_plot3d_init (GtkPlot3D *plot)
plot->ax->title.angle = 0;
plot->ax->title.justification = GTK_JUSTIFY_CENTER;
plot->ax->title.height = DEFAULT_FONT_HEIGHT;
- plot->ax->title.fg = widget->style->black;
- plot->ax->title.bg = widget->style->white;
+ plot->ax->title.fg = gtk_widget_get_style(widget)->black;
+ plot->ax->title.bg = gtk_widget_get_style(widget)->white;
plot->ax->title.transparent = TRUE;
plot->ax->title_visible = TRUE;
plot->ay->line.line_style = GTK_PLOT_LINE_SOLID;
plot->ay->line.line_width = 2;
- plot->ay->line.color = widget->style->black;
+ plot->ay->line.color = gtk_widget_get_style(widget)->black;
plot->ay->labels_attr.text = NULL;
plot->ay->labels_attr.height = DEFAULT_FONT_HEIGHT;
- plot->ay->labels_attr.fg = widget->style->black;
- plot->ay->labels_attr.bg = widget->style->white;
+ plot->ay->labels_attr.fg = gtk_widget_get_style(widget)->black;
+ plot->ay->labels_attr.bg = gtk_widget_get_style(widget)->white;
plot->ay->labels_attr.transparent = TRUE;
plot->ay->labels_attr.angle = 0;
plot->ay->label_mask = GTK_PLOT_LABEL_OUT;
@@ -695,8 +987,8 @@ gtk_plot3d_init (GtkPlot3D *plot)
plot->ay->title.angle = 0;
plot->ay->title.justification = GTK_JUSTIFY_CENTER;
plot->ay->title.height = DEFAULT_FONT_HEIGHT;
- plot->ay->title.fg = widget->style->black;
- plot->ay->title.bg = widget->style->white;
+ plot->ay->title.fg = gtk_widget_get_style(widget)->black;
+ plot->ay->title.bg = gtk_widget_get_style(widget)->white;
plot->ay->title.transparent = TRUE;
plot->ay->title_visible = TRUE;
@@ -753,14 +1045,14 @@ gtk_plot3d_init (GtkPlot3D *plot)
plot->zx->title_visible = plot->az->title_visible;
plot->zy->title_visible = plot->az->title_visible;
- plot->frame.color = widget->style->black;
+ plot->frame.color = gtk_widget_get_style(widget)->black;
plot->frame.line_width = 1;
plot->frame.line_style = GTK_PLOT_LINE_SOLID;
plot->corner_visible = FALSE;
plot->corner.line_style = GTK_PLOT_LINE_SOLID;
plot->corner.line_width = 0;
- plot->corner.color = widget->style->black;
+ plot->corner.color = gtk_widget_get_style(widget)->black;
plot->ax->direction = plot->e1;
plot->ay->direction = plot->e2;
@@ -1153,7 +1445,7 @@ gtk_plot3d_real_paint (GtkWidget *widget)
GtkPlotVector vx, vy, vz;
gint i;
- if(!GTK_WIDGET_VISIBLE(widget)) return;
+ if(!gtk_widget_get_visible(widget)) return;
plot = GTK_PLOT3D(widget);
@@ -1175,7 +1467,7 @@ gtk_plot3d_real_paint (GtkWidget *widget)
/* draw frame to guide the eyes*/
/*
- gdk_draw_rectangle (pixmap, widget->style->black_gc, FALSE,
+ gdk_draw_rectangle (pixmap, gtk_widget_get_style(widget)->black_gc, FALSE,
xoffset, yoffset,
width , height);
*/
@@ -1455,37 +1747,70 @@ gtk_plot3d_real_paint (GtkWidget *widget)
gtk_plot_pc_grestore(pc);
}
-
+/**
+ * gtk_plot3d_new:
+ * @drawable: a Gdk drawable.
+ *
+ *
+ *
+ * Return value:
+ */
GtkWidget*
gtk_plot3d_new (GdkDrawable *drawable)
{
- GtkPlot3D *plot;
+ GtkWidget *plot;
- plot = gtk_type_new (gtk_plot3d_get_type ());
+ plot = gtk_widget_new (gtk_plot3d_get_type (), NULL);
gtk_plot3d_construct(GTK_PLOT3D(plot), drawable);
- return GTK_WIDGET (plot);
+ return plot;
}
+/**
+ * gtk_plot3d_construct:
+ * @plot: a #GtkPlot3D widget.
+ * @drawable: a Gdk drawable.
+ *
+ *
+ */
void
gtk_plot3d_construct(GtkPlot3D *plot, GdkDrawable *drawable)
{
GTK_PLOT(plot)->drawable = drawable;
}
+/**
+ * gtk_plot3d_new_with_size:
+ * @drawable: a Gdk drawable.
+ * @width:
+ * @height:
+ *
+ *
+ *
+ * Return value:
+ */
GtkWidget*
gtk_plot3d_new_with_size (GdkDrawable *drawable, gdouble width, gdouble height)
{
GtkWidget *plot;
- plot = gtk_type_new (gtk_plot3d_get_type ());
+ plot = gtk_widget_new (gtk_plot3d_get_type (), NULL);
gtk_plot3d_construct_with_size(GTK_PLOT3D(plot), drawable, width, height);
return(plot);
}
+/**
+ * gtk_plot3d_construct_with_size:
+ * @plot: a #GtkPlot3D widget.
+ * @drawable: a Gdk drawable.
+ * @width:
+ * @height:
+ *
+ *
+ */
void
gtk_plot3d_construct_with_size(GtkPlot3D *plot, GdkDrawable *drawable,
gdouble width, gdouble height)
@@ -1495,6 +1820,16 @@ gtk_plot3d_construct_with_size(GtkPlot3D *plot, GdkDrawable *drawable,
gtk_plot_resize (GTK_PLOT(plot), width, height);
}
+/**
+ * gtk_plot3d_draw_plane:
+ * @plot: a #GtkPlot3D widget.
+ * @v1:
+ * @v2:
+ * @v3:
+ * @v4:
+ *
+ *
+ */
static void
gtk_plot3d_draw_plane(GtkPlot3D *plot,
GtkPlotVector v1,
@@ -1512,7 +1847,7 @@ gtk_plot3d_draw_plane(GtkPlot3D *plot,
gint i;
widget = GTK_WIDGET(plot);
- if(!GTK_WIDGET_VISIBLE(plot)) return;
+ if(!gtk_widget_get_visible(widget)) return;
pixmap = GTK_PLOT(plot)->drawable;
pc = GTK_PLOT(plot)->pc;
@@ -1546,8 +1881,8 @@ static void
gtk_plot3d_draw_grids(GtkPlot3D *plot, GtkPlotAxis *axis, GtkPlotVector delta)
{
GtkWidget *widget;
- GtkPlotLine major_grid, minor_grid;
gdouble xx;
+ GtkPlotLine major_grid, minor_grid;
gdouble x1, x2, y1, y2;
gint size, width, height;
gdouble xp, yp, oz;
@@ -1565,6 +1900,8 @@ gtk_plot3d_draw_grids(GtkPlot3D *plot, GtkPlotAxis *axis, GtkPlotVector delta)
size = MIN(width, height) / SQRT2;
+ major_grid = GTK_PLOT(plot)->left->major_grid;
+ minor_grid = GTK_PLOT(plot)->left->minor_grid;
switch(axis->orientation){
case GTK_PLOT_AXIS_X:
major_grid = GTK_PLOT(plot)->left->major_grid;
@@ -1734,6 +2071,7 @@ gtk_plot3d_draw_labels(GtkPlot3D *plot,
GtkPlotVector ticks_direction, center, aux;
gdouble proj;
gboolean veto = FALSE;
+ GtkAllocation allocation;
widget = GTK_WIDGET(plot);
pc = GTK_PLOT(plot)->pc;
@@ -1817,16 +2155,17 @@ gtk_plot3d_draw_labels(GtkPlot3D *plot,
}
else
{
- gtk_signal_emit_by_name(GTK_OBJECT(axis), "tick_label",
+ g_signal_emit_by_name(GTK_OBJECT(axis), "tick_label",
&tick_value, label, &veto);
if(!veto)
gtk_plot_axis_parse_label(axis, tick_value, axis->label_precision, axis->label_style, label);
}
tick.text = label;
+ gtk_widget_get_allocation(widget, &allocation);
if(axis->label_mask == GTK_PLOT_LABEL_OUT){
- tick.x = (gdouble)tick.x / (gdouble)widget->allocation.width;
- tick.y = (gdouble)tick.y / (gdouble)widget->allocation.height;
+ tick.x = (gdouble)tick.x / (gdouble)allocation.width;
+ tick.y = (gdouble)tick.y / (gdouble)allocation.height;
gtk_plot_draw_text(GTK_PLOT(plot), tick);
}
}
@@ -1845,8 +2184,8 @@ gtk_plot3d_draw_labels(GtkPlot3D *plot,
title.x = ox + plot->titles_offset * ticks_direction.x;
title.y = oy + plot->titles_offset * ticks_direction.y;
- title.x = title.x / (gdouble)widget->allocation.width;
- title.y = title.y / (gdouble)widget->allocation.height;
+ title.x = title.x / (gdouble)allocation.width;
+ title.y = title.y / (gdouble)allocation.height;
gtk_plot_draw_text(GTK_PLOT(plot), title);
}
@@ -1865,6 +2204,13 @@ get_clean_tick_size(gdouble delta)
/******************************************
******************************************/
+
+/**
+ * gtk_plot3d_autoscale:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ */
void
gtk_plot3d_autoscale(GtkPlot3D *plot)
{
@@ -1937,22 +2283,40 @@ gtk_plot3d_autoscale(GtkPlot3D *plot)
plot->zmin = plot->az->ticks.min;
plot->zmax = plot->az->ticks.max;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_rotate:
+ * @plot: a #GtkPlot3D widget.
+ * @angle_x:
+ * @angle_y:
+ * @angle_z:
+ *
+ *
+ */
void
-gtk_plot3d_rotate(GtkPlot3D *plot, gdouble a1, gdouble a2, gdouble a3)
+gtk_plot3d_rotate(GtkPlot3D *plot, gdouble angle_x, gdouble angle_y, gdouble angle_z)
{
- gtk_plot3d_rotate_vector(plot, &plot->e1, a1, a2, a3);
- gtk_plot3d_rotate_vector(plot, &plot->e2, a1, a2, a3);
- gtk_plot3d_rotate_vector(plot, &plot->e3, a1, a2, a3);
+ gtk_plot3d_rotate_vector(plot, &plot->e1, angle_x, angle_y, angle_z);
+ gtk_plot3d_rotate_vector(plot, &plot->e2, angle_x, angle_y, angle_z);
+ gtk_plot3d_rotate_vector(plot, &plot->e3, angle_x, angle_y, angle_z);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_rotate_vector:
+ * @plot: a #GtkPlot3D widget.
+ * @a1:
+ * @a2:
+ * @a3:
+ *
+ *
+ */
void
gtk_plot3d_rotate_vector(GtkPlot3D *plot,
GtkPlotVector *vector,
@@ -1993,6 +2357,18 @@ gtk_plot3d_rotate_vector(GtkPlot3D *plot,
vector->y = v.y;
}
+/**
+ * gtk_plot3d_get_pixel:
+ * @plot: a #GtkPlot3D widget.
+ * @x:
+ * @y:
+ * @z:
+ * @px:
+ * @py:
+ * @pz:
+ *
+ *
+ */
void
gtk_plot3d_get_pixel(GtkPlot3D *plot,
gdouble x, gdouble y, gdouble z,
@@ -2056,6 +2432,15 @@ gtk_plot3d_real_get_pixel(GtkWidget *widget,
* gtk_plot3d_get_yfactor
* gtk_plot3d_get_zfactor
***********************************************************/
+
+/**
+ * gtk_plot3d_set_xrange:
+ * @plot: a #GtkPlot3D widget.
+ * @min:
+ * @max:
+ *
+ *
+ */
void
gtk_plot3d_set_xrange(GtkPlot3D *plot, gdouble min, gdouble max)
{
@@ -2067,10 +2452,19 @@ gtk_plot3d_set_xrange(GtkPlot3D *plot, gdouble min, gdouble max)
plot->ax->ticks.max = max;
gtk_plot_axis_ticks_recalc(plot->ax);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_set_yrange:
+ * @plot: a #GtkPlot3D widget.
+ * @min:
+ * @max:
+ *
+ *
+ */
+
void
gtk_plot3d_set_yrange(GtkPlot3D *plot, gdouble min, gdouble max)
{
@@ -2082,10 +2476,17 @@ gtk_plot3d_set_yrange(GtkPlot3D *plot, gdouble min, gdouble max)
plot->ay->ticks.max = max;
gtk_plot_axis_ticks_recalc(plot->ay);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
-
+/**
+ * gtk_plot3d_set_zrange:
+ * @plot: a #GtkPlot3D widget.
+ * @min:
+ * @max:
+ *
+ *
+ */
void
gtk_plot3d_set_zrange(GtkPlot3D *plot, gdouble min, gdouble max)
{
@@ -2097,10 +2498,17 @@ gtk_plot3d_set_zrange(GtkPlot3D *plot, gdouble min, gdouble max)
plot->az->ticks.max = max;
gtk_plot_axis_ticks_recalc(plot->az);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", TRUE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_set_xfactor:
+ * @plot: a #GtkPlot3D widget.
+ * @xfactor:
+ *
+ *
+ */
void
gtk_plot3d_set_xfactor(GtkPlot3D *plot, gdouble xfactor)
{
@@ -2118,10 +2526,17 @@ gtk_plot3d_set_xfactor(GtkPlot3D *plot, gdouble xfactor)
plot->ax->direction = plot->e1;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_set_yfactor:
+ * @plot: a #GtkPlot3D widget.
+ * @yfactor:
+ *
+ *
+ */
void
gtk_plot3d_set_yfactor(GtkPlot3D *plot, gdouble yfactor)
{
@@ -2139,10 +2554,17 @@ gtk_plot3d_set_yfactor(GtkPlot3D *plot, gdouble yfactor)
plot->ay->direction = plot->e1;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_set_zfactor:
+ * @plot: a #GtkPlot3D widget.
+ * @zfactor:
+ *
+ *
+ */
void
gtk_plot3d_set_zfactor(GtkPlot3D *plot, gdouble zfactor)
{
@@ -2160,22 +2582,46 @@ gtk_plot3d_set_zfactor(GtkPlot3D *plot, gdouble zfactor)
plot->az->direction = plot->e1;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_get_xfactor:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ *
+ * Return value:
+ */
gdouble
gtk_plot3d_get_xfactor(GtkPlot3D *plot)
{
return (plot->xfactor);
}
+/**
+ * gtk_plot3d_get_yfactor:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ *
+ * Return value:
+ */
gdouble
gtk_plot3d_get_yfactor(GtkPlot3D *plot)
{
return (plot->yfactor);
}
+/**
+ * gtk_plot3d_get_zfactor:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ *
+ * Return value:
+ */
gdouble
gtk_plot3d_get_zfactor(GtkPlot3D *plot)
{
@@ -2189,6 +2635,13 @@ gtk_plot3d_get_zfactor(GtkPlot3D *plot)
* gtk_plot3d_plane_visible
***********************************************************/
+/**
+ * gtk_plot3d_plane_set_color:
+ * @plane:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_plane_set_color (GtkPlot3D *plot,
GtkPlotPlane plane,
@@ -2211,6 +2664,13 @@ gtk_plot3d_plane_set_color (GtkPlot3D *plot,
}
+/**
+ * gtk_plot3d_plane_set_visible:
+ * @plane:
+ * @visible:
+ *
+ *
+ */
void
gtk_plot3d_plane_set_visible (GtkPlot3D *plot,
GtkPlotPlane plane,
@@ -2233,6 +2693,15 @@ gtk_plot3d_plane_set_visible (GtkPlot3D *plot,
}
+/**
+ * gtk_plot3d_plane_visible:
+ * @plot: a #GtkPlot3D widget.
+ * @plane:
+ *
+ *
+ *
+ * Return value:
+ */
gboolean
gtk_plot3d_plane_visible (GtkPlot3D *plot,
GtkPlotPlane plane)
@@ -2278,18 +2747,44 @@ gtk_plot3d_plane_visible (GtkPlot3D *plot,
* gtk_plot3d_set_titles_offset
* gtk_plot3d_get_titles_offset
***********************************************************/
+
+
+/**
+ * gtk_plot3d_corner_set_visible:
+ * @plot: a #GtkPlot3D widget.
+ * @visible:
+ *
+ *
+ */
void
gtk_plot3d_corner_set_visible(GtkPlot3D *plot, gboolean visible)
{
plot->corner_visible = visible;
}
+/**
+ * gtk_plot3d_corner_visible:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ *
+ * Return value:
+ */
gboolean
gtk_plot3d_corner_visible(GtkPlot3D *plot)
{
return (plot->corner_visible);
}
+/**
+ * gtk_plot3d_corner_set_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_corner_set_attributes (GtkPlot3D *plot,
GtkPlotLineStyle style,
@@ -2301,7 +2796,15 @@ gtk_plot3d_corner_set_attributes (GtkPlot3D *plot,
if(color) plot->corner.color = *color;
}
-
+/**
+ * gtk_plot3d_corner_get_attribute:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_corner_get_attributes (GtkPlot3D *plot,
GtkPlotLineStyle *style,
@@ -2313,6 +2816,15 @@ gtk_plot3d_corner_get_attributes (GtkPlot3D *plot,
*color = plot->corner.color;
}
+/**
+ * gtk_plot3d_frame_set_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_frame_set_attributes (GtkPlot3D *plot,
GtkPlotLineStyle style,
@@ -2324,6 +2836,15 @@ gtk_plot3d_frame_set_attributes (GtkPlot3D *plot,
if(color) plot->frame.color = *color;
}
+/**
+ * gtk_plot3d_frame_get_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_frame_get_attributes (GtkPlot3D *plot,
GtkPlotLineStyle *style,
@@ -2335,6 +2856,14 @@ gtk_plot3d_frame_get_attributes (GtkPlot3D *plot,
*color = plot->frame.color;
}
+/**
+ * gtk_plot3d_get_axis:
+ * @plot: a #GtkPlot3D widget.
+ * @orientation: of axis to be returned
+ *
+ * Return value: (transfer none) the #GtkPlotAxis with given
+ * orientation
+ */
GtkPlotAxis *
gtk_plot3d_get_axis(GtkPlot3D *plot, GtkPlotOrientation orientation)
{
@@ -2358,6 +2887,14 @@ gtk_plot3d_get_axis(GtkPlot3D *plot, GtkPlotOrientation orientation)
return axis;
}
+/**
+ * gtk_plot3d_get_side:
+ * @plot: a #GtkPlot3D widget.
+ * @side: #GtkPlotSide of the wanted axis
+ *
+ * Return value: (transfer none): the #GtkPlotAxis on the given
+ * side
+ */
GtkPlotAxis *
gtk_plot3d_get_side(GtkPlot3D *plot, GtkPlotSide side)
{
@@ -2389,6 +2926,14 @@ gtk_plot3d_get_side(GtkPlot3D *plot, GtkPlotSide side)
return axis;
}
+/**
+ * gtk_plot3d_show_labels:
+ * @plot: a #GtkPlot3D widget.
+ * @side:
+ * @label_mask:
+ *
+ *
+ */
void
gtk_plot3d_show_labels (GtkPlot3D *plot,
GtkPlotSide side,
@@ -2401,6 +2946,13 @@ gtk_plot3d_show_labels (GtkPlot3D *plot,
axis->label_mask = label_mask;
}
+/**
+ * gtk_plot3d_show_title:
+ * @plot: a #GtkPlot3D widget.
+ * @side:
+ *
+ *
+ */
void
gtk_plot3d_show_title (GtkPlot3D *plot,
GtkPlotSide side)
@@ -2412,6 +2964,13 @@ gtk_plot3d_show_title (GtkPlot3D *plot,
axis->title_visible = TRUE;
}
+/**
+ * gtk_plot3d_hide_title:
+ * @plot: a #GtkPlot3D widget.
+ * @side:
+ *
+ *
+ */
void
gtk_plot3d_hide_title (GtkPlot3D *plot,
GtkPlotSide side)
@@ -2424,6 +2983,14 @@ gtk_plot3d_hide_title (GtkPlot3D *plot,
}
+/**
+ * gtk_plot3d_show_major_ticks:
+ * @plot: a #GtkPlot3D widget.
+ * @side:
+ * @ticks_mask:
+ *
+ *
+ */
void
gtk_plot3d_show_major_ticks (GtkPlot3D *plot,
GtkPlotSide side,
@@ -2436,6 +3003,14 @@ gtk_plot3d_show_major_ticks (GtkPlot3D *plot,
axis->major_mask = ticks_mask;
}
+/**
+ * gtk_plot3d_show_minor_ticks:
+ * @plot: a #GtkPlot3D widget.
+ * @side:
+ * @ticks_mask:
+ *
+ *
+ */
void
gtk_plot3d_show_minor_ticks(GtkPlot3D *plot,
GtkPlotSide side,
@@ -2448,6 +3023,15 @@ gtk_plot3d_show_minor_ticks(GtkPlot3D *plot,
axis->minor_mask = ticks_mask;
}
+/**
+ * gtk_plot3d_set_ticks:
+ * @plot: a #GtkPlot3D widget.
+ * @direction:
+ * @major_step:
+ * @nminor:
+ *
+ *
+ */
void
gtk_plot3d_set_ticks (GtkPlot3D *plot,
GtkPlotOrientation direction,
@@ -2463,6 +3047,14 @@ gtk_plot3d_set_ticks (GtkPlot3D *plot,
axis->ticks.nminor = nminor;
}
+/**
+ * gtk_plot3d_set_major_ticks:
+ * @plot: a #GtkPlot3D widget.
+ * @direction:
+ * @major_step:
+ *
+ *
+ */
void
gtk_plot3d_set_major_ticks (GtkPlot3D *plot,
GtkPlotOrientation direction,
@@ -2475,6 +3067,14 @@ gtk_plot3d_set_major_ticks (GtkPlot3D *plot,
axis->ticks.step = major_step;
}
+/**
+ * gtk_plot3d_set_minor_ticks:
+ * @plot: a #GtkPlot3D widget.
+ * @direction:
+ * @nminor:
+ *
+ *
+ */
void
gtk_plot3d_set_minor_ticks (GtkPlot3D *plot,
GtkPlotOrientation direction,
@@ -2487,6 +3087,14 @@ gtk_plot3d_set_minor_ticks (GtkPlot3D *plot,
axis->ticks.nminor = nminor;
}
+/**
+ * gtk_plot3d_set_ticks_length:
+ * @plot: a #GtkPlot3D widget.
+ * @direction:
+ * @length:
+ *
+ *
+ */
void
gtk_plot3d_set_ticks_length (GtkPlot3D *plot,
GtkPlotOrientation direction,
@@ -2499,6 +3107,14 @@ gtk_plot3d_set_ticks_length (GtkPlot3D *plot,
axis->ticks_length = length;
}
+/**
+ * gtk_plot3d_set_ticks_width:
+ * @plot: a #GtkPlot3D widget.
+ * @direction:
+ * @width:
+ *
+ *
+ */
void
gtk_plot3d_set_ticks_width (GtkPlot3D *plot,
GtkPlotOrientation direction,
@@ -2511,6 +3127,15 @@ gtk_plot3d_set_ticks_width (GtkPlot3D *plot,
axis->ticks_width = width;
}
+/**
+ * gtk_plot3d_show_ticks:
+ * @plot: a #GtkPlot3D widget.
+ * @side:
+ * @major_mask:
+ * @minor_mask:
+ *
+ *
+ */
void
gtk_plot3d_show_ticks (GtkPlot3D *plot,
GtkPlotSide side,
@@ -2525,7 +3150,13 @@ gtk_plot3d_show_ticks (GtkPlot3D *plot,
axis->minor_mask = minor_mask;
}
-
+/**
+ * gtk_plot3d_set_titles_offset:
+ * @plot: a #GtkPlot3D widget.
+ * @offset
+ *
+ *
+ */
void
gtk_plot3d_set_titles_offset (GtkPlot3D *plot,
gint offset)
@@ -2533,6 +3164,14 @@ gtk_plot3d_set_titles_offset (GtkPlot3D *plot,
plot->titles_offset = offset;
}
+/**
+ * gtk_plot3d_get_titles_offset:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ *
+ * Return value:
+ */
gint
gtk_plot3d_get_titles_offset (GtkPlot3D *plot)
{
@@ -2550,6 +3189,15 @@ gtk_plot3d_get_titles_offset (GtkPlot3D *plot)
* gtk_plot3d_minor_grids_get_attributes
***********************************************************/
+/**
+ * gtk_plot3d_major_grids_set_visible:
+ * @plot: a #GtkPlot3D widget.
+ * @x:
+ * @y:
+ * @z:
+ *
+ *
+ */
void
gtk_plot3d_major_grids_set_visible (GtkPlot3D *plot,
gboolean x,
@@ -2561,6 +3209,15 @@ gtk_plot3d_major_grids_set_visible (GtkPlot3D *plot,
plot->az->show_major_grid = z;
}
+/**
+ * gtk_plot3d_minor_grids_set_visible:
+ * @plot: a #GtkPlot3D widget.
+ * @x:
+ * @y:
+ * @z:
+ *
+ *
+ */
void
gtk_plot3d_minor_grids_set_visible (GtkPlot3D *plot,
gboolean x,
@@ -2572,6 +3229,15 @@ gtk_plot3d_minor_grids_set_visible (GtkPlot3D *plot,
plot->az->show_minor_grid = z;
}
+/**
+ * gtk_plot3d_major_grids_visible:
+ * @plot: a #GtkPlot3D widget.
+ * @x:
+ * @y:
+ * @z:
+ *
+ *
+ */
void
gtk_plot3d_major_grids_visible (GtkPlot3D *plot,
gboolean *x,
@@ -2583,6 +3249,15 @@ gtk_plot3d_major_grids_visible (GtkPlot3D *plot,
*z = plot->az->show_major_grid;
}
+/**
+ * gtk_plot3d_minor_grids_visible:
+ * @plot: a #GtkPlot3D widget.
+ * @x:
+ * @y:
+ * @z:
+ *
+ *
+ */
void
gtk_plot3d_minor_grids_visible (GtkPlot3D *plot,
gboolean *x,
@@ -2594,6 +3269,15 @@ gtk_plot3d_minor_grids_visible (GtkPlot3D *plot,
*z = plot->az->show_minor_grid;
}
+/**
+ * gtk_plot3d_major_zgrid_set_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_major_zgrid_set_attributes (GtkPlot3D *plot,
GtkPlotLineStyle style,
@@ -2605,6 +3289,15 @@ gtk_plot3d_major_zgrid_set_attributes (GtkPlot3D *plot,
if(color) plot->az->major_grid.color = *color;
}
+/**
+ * gtk_plot3d_minor_zgrid_set_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_minor_zgrid_set_attributes (GtkPlot3D *plot,
GtkPlotLineStyle style,
@@ -2616,6 +3309,15 @@ gtk_plot3d_minor_zgrid_set_attributes (GtkPlot3D *plot,
if(color) plot->az->minor_grid.color = *color;
}
+/**
+ * gtk_plot3d_major_zgrid_get_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_major_zgrid_get_attributes (GtkPlot3D *plot,
GtkPlotLineStyle *style,
@@ -2627,6 +3329,15 @@ gtk_plot3d_major_zgrid_get_attributes (GtkPlot3D *plot,
*color = plot->az->major_grid.color;
}
+/**
+ * gtk_plot3d_minor_zgrid_get_attributes:
+ * @plot: a #GtkPlot3D widget.
+ * @style:
+ * @width:
+ * @color:
+ *
+ *
+ */
void
gtk_plot3d_minor_zgrid_get_attributes (GtkPlot3D *plot,
GtkPlotLineStyle *style,
@@ -2644,6 +3355,13 @@ gtk_plot3d_minor_zgrid_get_attributes (GtkPlot3D *plot,
* gtk_plot3d_rotate_y
* gtk_plot3d_rotate_z
*******************************************/
+
+/**
+ * gtk_plot3d_reset_angles:
+ * @plot: a #GtkPlot3D widget.
+ *
+ *
+ */
void
gtk_plot3d_reset_angles(GtkPlot3D *plot)
{
@@ -2660,10 +3378,17 @@ gtk_plot3d_reset_angles(GtkPlot3D *plot)
plot->e3.y = 0.;
plot->e3.z = -plot->zfactor;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_rotate_x:
+ * @plot: a #GtkPlot3D widget.
+ * @angle:
+ *
+ *
+ */
void
gtk_plot3d_rotate_x(GtkPlot3D *plot, gdouble angle)
{
@@ -2716,10 +3441,17 @@ gtk_plot3d_rotate_x(GtkPlot3D *plot, gdouble angle)
plot->e3.y *= plot->zfactor;
plot->e3.z *= plot->zfactor;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_rotate_y:
+ * @plot: a #GtkPlot3D widget.
+ * @angle:
+ *
+ *
+ */
void
gtk_plot3d_rotate_y(GtkPlot3D *plot, gdouble angle)
{
@@ -2772,10 +3504,17 @@ gtk_plot3d_rotate_y(GtkPlot3D *plot, gdouble angle)
plot->e3.y *= plot->zfactor;
plot->e3.z *= plot->zfactor;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_rotate_z:
+ * @plot: a #GtkPlot3D widget.
+ * @angle:
+ *
+ *
+ */
void
gtk_plot3d_rotate_z(GtkPlot3D *plot, gdouble angle)
{
@@ -2827,10 +3566,18 @@ gtk_plot3d_rotate_z(GtkPlot3D *plot, gdouble angle)
plot->e3.y *= plot->zfactor;
plot->e3.z *= plot->zfactor;
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
- gtk_signal_emit_by_name(GTK_OBJECT(plot), "changed");
+ g_signal_emit_by_name(GTK_OBJECT(plot), "update", FALSE);
+ g_signal_emit_by_name(GTK_OBJECT(plot), "changed");
}
+/**
+ * gtk_plot3d_set_scale:
+ * @plot: a #GtkPlot3D widget.
+ * @axis:
+ * @scale:
+ *
+ *
+ */
void
gtk_plot3d_set_scale (GtkPlot3D *plot,
GtkPlotOrientation axis,
@@ -2841,6 +3588,16 @@ gtk_plot3d_set_scale (GtkPlot3D *plot,
ax->ticks.scale = scale;
}
+/**
+ * gtk_plot3d_get_scale:
+ * @plot: a #GtkPlot3D widget.
+ * @axis:
+ *
+ *
+ *
+ * Return value:
+ */
+
GtkPlotScale
gtk_plot3d_get_scale (GtkPlot3D *plot,
GtkPlotOrientation axis)
diff --git a/gtkextra/gtkplot3d.h b/gtkextra/gtkplot3d.h
index 1b8f0e9..b48079d 100644
--- a/gtkextra/gtkplot3d.h
+++ b/gtkextra/gtkplot3d.h
@@ -27,10 +27,10 @@ extern "C" {
#include "gtkplot.h"
-#define GTK_PLOT3D(obj) GTK_CHECK_CAST (obj, gtk_plot3d_get_type (), GtkPlot3D)
-#define GTK_TYPE_PLOT3D (gtk_plot3d_get_type ())
-#define GTK_PLOT3D_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_plot3d_get_type(), GtkPlot3DClass)
-#define GTK_IS_PLOT3D(obj) GTK_CHECK_TYPE (obj, gtk_plot3d_get_type ())
+#define GTK_PLOT3D(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_plot3d_get_type (), GtkPlot3D)
+#define G_TYPE_PLOT3D (gtk_plot3d_get_type ())
+#define GTK_PLOT3D_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_plot3d_get_type(), GtkPlot3DClass)
+#define GTK_IS_PLOT3D(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_plot3d_get_type ())
#define GTK_PLOT3D_FLAGS(plot) (GTK_PLOT3D(plot)->flags)
#define GTK_PLOT3D_SET_FLAGS(plot,flag) (GTK_PLOT3D_FLAGS(plot) |= (flag))
#define GTK_PLOT3D_UNSET_FLAGS(plot,flag) (GTK_PLOT3D_FLAGS(plot) &= ~(flag))
@@ -60,6 +60,13 @@ typedef enum
GTK_PLOT_SIDE_ZY = 1 << 5 ,
} GtkPlotSide;
+/**
+ * GtkPlot3D:
+ *
+ * The GtkPlot3D struct contains only private data.
+ * It should only be accessed through the functions described below.
+ */
+
struct _GtkPlot3D
{
GtkPlot plot;
@@ -109,7 +116,7 @@ struct _GtkPlot3DClass
/* Plot3D */
-GtkType gtk_plot3d_get_type (void);
+GType gtk_plot3d_get_type (void);
GtkWidget* gtk_plot3d_new (GdkDrawable *drawable);
GtkWidget* gtk_plot3d_new_with_size (GdkDrawable *drawable,
gdouble width, gdouble height);
@@ -212,20 +219,20 @@ void gtk_plot3d_show_title (GtkPlot3D *plot,
void gtk_plot3d_hide_title (GtkPlot3D *plot,
GtkPlotSide side);
void gtk_plot3d_set_ticks (GtkPlot3D *plot,
- GtkPlotOrientation axis,
+ GtkPlotOrientation direction,
gdouble major_step,
gint nminor);
void gtk_plot3d_set_major_ticks (GtkPlot3D *plot,
- GtkPlotOrientation axis,
+ GtkPlotOrientation direction,
gdouble major_step);
void gtk_plot3d_set_minor_ticks (GtkPlot3D *plot,
- GtkPlotOrientation axis,
+ GtkPlotOrientation direction,
gint nminor);
void gtk_plot3d_set_ticks_length (GtkPlot3D *plot,
- GtkPlotOrientation axis,
+ GtkPlotOrientation direction,
gint length);
void gtk_plot3d_set_ticks_width (GtkPlot3D *plot,
- GtkPlotOrientation axis,
+ GtkPlotOrientation direction,
gfloat width);
void gtk_plot3d_show_ticks (GtkPlot3D *plot,
GtkPlotSide side,
diff --git a/gtkextra/gtkplotdt.c b/gtkextra/gtkplotdt.c
index 10ea23b..2e15c7c 100644
--- a/gtkextra/gtkplotdt.c
+++ b/gtkextra/gtkplotdt.c
@@ -17,6 +17,13 @@
* Boston, MA 02111-1307, USA.
*/
+/**
+ * SECTION: gtkplotdt
+ * @short_description:
+ *
+ * FIXME:: Need long description.
+ */
+
#include <stdlib.h>
#include <stdio.h>
#include <math.h>
@@ -48,26 +55,21 @@ static void gtk_plot_dt_clear_triangles (GtkPlotDT *data);
static GtkObjectClass *parent_class = NULL;
-GtkType
+GType
gtk_plot_dt_get_type (void)
{
- static GtkType data_type = 0;
+ static GType data_type = 0;
if (!data_type)
{
- GtkTypeInfo data_info =
- {
- "GtkPlotDT",
- sizeof (GtkPlotDT),
- sizeof (GtkPlotDTClass),
- (GtkClassInitFunc) gtk_plot_dt_class_init,
- (GtkObjectInitFunc) gtk_plot_dt_init,
- /* reserved 1*/ NULL,
- /* reserved 2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- data_type = gtk_type_unique (GTK_TYPE_OBJECT, &data_info);
+ data_type = g_type_register_static_simple (
+ gtk_object_get_type(),
+ "GtkPlotDT",
+ sizeof (GtkPlotDTClass),
+ (GClassInitFunc) gtk_plot_dt_class_init,
+ sizeof (GtkPlotDT),
+ (GInstanceInitFunc) gtk_plot_dt_init,
+ 0);
}
return data_type;
}
@@ -78,7 +80,7 @@ gtk_plot_dt_class_init (GtkPlotDTClass *klass)
GtkObjectClass *object_class;
GtkPlotDTClass *dt_class;
- parent_class = gtk_type_class (gtk_object_get_type ());
+ parent_class = g_type_class_ref (gtk_object_get_type ());
object_class = (GtkObjectClass *) klass;
dt_class = (GtkPlotDTClass *) klass;
@@ -121,12 +123,20 @@ gtk_plot_dt_expand(GtkPlotDT *data, gint num)
* num: initial number of nodes
*/
+/**
+ * gtk_plot_dt_new:
+ * @num:
+ *
+ *
+ *
+ * Return value:
+ */
GtkObject*
gtk_plot_dt_new (gint num)
{
GtkObject *object;
- object = gtk_type_new (gtk_plot_dt_get_type ());
+ object = g_object_new (gtk_plot_dt_get_type (), NULL);
gtk_plot_dt_expand(GTK_PLOT_DT(object), num);
@@ -161,24 +171,53 @@ gtk_plot_dt_destroy(GtkObject *object)
gtk_plot_dt_clear(data);
}
+/**
+ * gtk_plot_dt_clear:
+ * @data:
+ *
+ *
+ */
void
gtk_plot_dt_clear(GtkPlotDT *data)
{
GTK_PLOT_DT_CLASS(GTK_OBJECT_GET_CLASS(GTK_OBJECT(data)))->clear(data);
}
+/**
+ * gtk_plot_dt_add_node:
+ * @data:
+ *
+ *
+ *
+ * Return value:
+ */
gboolean
gtk_plot_dt_add_node(GtkPlotDT *data, GtkPlotDTnode node)
{
return(GTK_PLOT_DT_CLASS(GTK_OBJECT_GET_CLASS(GTK_OBJECT(data)))->add_node(data, node));
}
+/**
+ * gtk_plot_dt_get_node:
+ * @data:
+ * @idx:
+ *
+ * Return value: (transfer none) the #GtkPlotDTnode
+ */
GtkPlotDTnode *
gtk_plot_dt_get_node(GtkPlotDT *data, gint idx)
{
return(GTK_PLOT_DT_CLASS(GTK_OBJECT_GET_CLASS(GTK_OBJECT(data)))->get_node(data, idx));
}
+/**
+ * gtk_plot_dt_triangulate:
+ * @data:
+ *
+ *
+ *
+ * Return value:
+ */
gboolean
gtk_plot_dt_triangulate(GtkPlotDT *data)
{
@@ -1155,6 +1194,13 @@ gtk_plot_dt_triangulate_tryquad(GtkPlotDT *data)
return TRUE;
}
+/**
+ * gtk_plot_dt_set_quadriteral:
+ * @dt:
+ * @set:
+ *
+ *
+ */
void
gtk_plot_dt_set_quadrilateral(GtkPlotDT *dt, gboolean set)
{
@@ -1163,6 +1209,13 @@ gtk_plot_dt_set_quadrilateral(GtkPlotDT *dt, gboolean set)
if(dt->triangles && old!=set) gtk_plot_dt_triangulate(dt);
}
+/**
+ * gtk_plot_dt_set_subsampling:
+ * @dt:
+ * @set:
+ *
+ *
+ */
void
gtk_plot_dt_set_subsampling(GtkPlotDT *dt, gboolean set)
{
diff --git a/gtkextra/gtkplotdt.h b/gtkextra/gtkplotdt.h
index e761534..4572147 100644
--- a/gtkextra/gtkplotdt.h
+++ b/gtkextra/gtkplotdt.h
@@ -25,11 +25,11 @@
extern "C" {
#endif /* __cplusplus */
-#define GTK_PLOT_DT(obj) GTK_CHECK_CAST (obj, gtk_plot_dt_get_type (), GtkPlotDT)
-#define GTK_TYPE_PLOT_DT (gtk_plot_dt_get_type ())
+#define GTK_PLOT_DT(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_plot_dt_get_type (), GtkPlotDT)
+#define G_TYPE_PLOT_DT (gtk_plot_dt_get_type ())
-#define GTK_PLOT_DT_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_plot_dt_get_type(), GtkPlotDTClass)
-#define GTK_IS_PLOT_DT(obj) GTK_CHECK_TYPE (obj, gtk_plot_dt_get_type ())
+#define GTK_PLOT_DT_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_plot_dt_get_type(), GtkPlotDTClass)
+#define GTK_IS_PLOT_DT(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_plot_dt_get_type ())
typedef struct _GtkPlotDTnode GtkPlotDTnode;
@@ -39,8 +39,15 @@ typedef struct _GtkPlotDT GtkPlotDT;
typedef struct _GtkPlotDTClass GtkPlotDTClass;
/* A 2D-node for the delaunay triangulation */
+/**
+ * GtkPlotDTnode:
+ *
+ * The GtkPlotDTnode struct contains only private data.
+ * It should only be accessed through the functions described below.
+ */
struct _GtkPlotDTnode
{
+ /*< private >*/
gdouble x, y, z; /* actual coordinates */
gdouble px, py, pz; /* pixel coordinates */
gint id; /* some kind of 'meta-data' for external use */
@@ -48,8 +55,15 @@ struct _GtkPlotDTnode
gint boundary_marker;
};
+/**
+ * GtkPlotDTtriangle:
+ *
+ * The GtkPlotDTtriangle struct contains only private data.
+ * It should only be accessed through the functions described below.
+ */
struct _GtkPlotDTtriangle
{
+ /*< private >*/
gint a, b, c;
GtkPlotDTnode *na, *nb, *nc;
double radius; /* radius-square */
@@ -104,11 +118,11 @@ struct _GtkPlotDTClass
void (* clear) (GtkPlotDT *data);
};
-GtkType gtk_plot_dt_get_type (void);
+GType gtk_plot_dt_get_type (void);
GtkObject* gtk_plot_dt_new (gint num);
-void gtk_plot_dt_set_quadrilateral (GtkPlotDT *data,
+void gtk_plot_dt_set_quadrilateral (GtkPlotDT *dt,
gboolean set);
-void gtk_plot_dt_set_subsampling (GtkPlotDT *data,
+void gtk_plot_dt_set_subsampling (GtkPlotDT *dt,
gboolean set);
gboolean gtk_plot_dt_add_node (GtkPlotDT *data,
GtkPlotDTnode node);
diff --git a/gtkextra/gtkplotsurface.c b/gtkextra/gtkplotsurface.c
index 64ae99e..b5889b2 100644
--- a/gtkextra/gtkplotsurface.c
+++ b/gtkextra/gtkplotsurface.c
@@ -17,6 +17,14 @@
* Boston, MA 02111-1307, USA.
*/
+/**
+ * SECTION: gtkplotsurface
+ * @short_description:
+ *
+ * FIXME:: need long description
+ */
+
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -112,26 +120,21 @@ inline gulong _sqrt(register gulong arg)
return val;
}
-GtkType
+GType
gtk_plot_surface_get_type (void)
{
- static GtkType data_type = 0;
+ static GType data_type = 0;
if (!data_type)
{
- GtkTypeInfo data_info =
- {
- "GtkPlotSurface",
- sizeof (GtkPlotSurface),
- sizeof (GtkPlotSurfaceClass),
- (GtkClassInitFunc) gtk_plot_surface_class_init,
- (GtkObjectInitFunc) gtk_plot_surface_init,
- /* reserved 1*/ NULL,
- /* reserved 2 */ NULL,
- (GtkClassInitFunc) NULL,
- };
-
- data_type = gtk_type_unique (gtk_plot_data_get_type(), &data_info);
+ data_type = g_type_register_static_simple (
+ gtk_plot_data_get_type(),
+ "GtkPlotSurface",
+ sizeof (GtkPlotSurfaceClass),
+ (GClassInitFunc) gtk_plot_surface_class_init,
+ sizeof (GtkPlotSurface),
+ (GInstanceInitFunc) gtk_plot_surface_init,
+ 0);
}
return data_type;
}
@@ -145,7 +148,7 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
GtkPlotSurfaceClass *surface_class;
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
- parent_class = gtk_type_class (gtk_plot_data_get_type ());
+ parent_class = g_type_class_ref (gtk_plot_data_get_type ());
object_class = (GtkObjectClass *) klass;
widget_class = (GtkWidgetClass *) klass;
@@ -157,6 +160,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
gobject_class->set_property = gtk_plot_surface_set_property;
gobject_class->get_property = gtk_plot_surface_get_property;
+
+ /**
+ * GtkPlotSurface:use_height:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_USE_HEIGHT,
g_param_spec_boolean ("use_height",
@@ -164,6 +173,11 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
TRUE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+ /**
+ * GtkPlotSurface:use_amplitud:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_USE_AMPLITUD,
g_param_spec_boolean ("use_amplitud",
@@ -171,12 +185,24 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:vector_light:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_LIGHT,
g_param_spec_pointer ("vector_light",
P_(""),
P_(""),
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:ambient:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_AMBIENT,
g_param_spec_double ("ambient",
@@ -184,6 +210,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:nx:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_NX,
g_param_spec_int ("nx",
@@ -191,6 +223,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXINT,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:ny:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_NY,
g_param_spec_int ("ny",
@@ -198,6 +236,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXINT,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:show_grid:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_SHOW_GRID,
g_param_spec_boolean ("show_grid",
@@ -205,6 +249,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:show_mesh:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_SHOW_MESH,
g_param_spec_boolean ("show_mesh",
@@ -212,6 +262,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:transparent:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_TRANSPARENT,
g_param_spec_boolean ("transparent",
@@ -219,6 +275,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
FALSE,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:xstep:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_XSTEP,
g_param_spec_double ("xstep",
@@ -226,6 +288,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:ystep:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_YSTEP,
g_param_spec_double ("ystep",
@@ -233,6 +301,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:mesh_style:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_MESH_STYLE,
g_param_spec_int ("mesh_style",
@@ -240,6 +314,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXINT,0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:mesh_width:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_MESH_WIDTH,
g_param_spec_double ("mesh_width",
@@ -247,6 +327,12 @@ gtk_plot_surface_class_init (GtkPlotSurfaceClass *klass)
P_(""),
0,G_MAXDOUBLE,0.0,
G_PARAM_READABLE|G_PARAM_WRITABLE));
+
+ /**
+ * GtkPlotSurface:mesh_color:
+ *
+ *
+ **/
g_object_class_install_property (gobject_class,
ARG_MESH_COLOR,
g_param_spec_pointer ("mesh_color",
@@ -504,7 +590,7 @@ gtk_plot_surface_init (GtkPlotSurface *dataset)
GdkColor color;
GtkPlotArray *dim;
- GTK_WIDGET_SET_FLAGS(dataset, GTK_NO_WINDOW);
+ gtk_widget_set_has_window(GTK_WIDGET(dataset), FALSE);
widget = GTK_WIDGET(dataset);
colormap = gtk_widget_get_colormap(widget);
@@ -564,23 +650,34 @@ gtk_plot_surface_new (void)
{
GtkPlotData *data;
- data = gtk_type_new (gtk_plot_surface_get_type ());
+ data = g_object_new (gtk_plot_surface_get_type (), NULL);
return GTK_WIDGET (data);
}
+/**
+ * gtk_plot_surface_new_function:
+ * @function: (scope async): a #GtkPlotFunc3D
+ *
+ * Return value: (transfer full) the constructed #GtkWidget
+ */
GtkWidget*
gtk_plot_surface_new_function (GtkPlotFunc3D function)
{
GtkWidget *dataset;
- dataset = gtk_type_new (gtk_plot_surface_get_type ());
+ dataset = g_object_new (gtk_plot_surface_get_type (), NULL);
gtk_plot_surface_construct_function(GTK_PLOT_SURFACE(dataset), function);
return dataset;
}
+/**
+ * gtk_plot_surface_construct_function:
+ * @surface:
+ * @function: (scope async): a #GtkPlotFunc3D
+ */
void
gtk_plot_surface_construct_function(GtkPlotSurface *surface,
GtkPlotFunc3D function)
@@ -589,6 +686,12 @@ gtk_plot_surface_construct_function(GtkPlotSurface *surface,
GTK_PLOT_DATA(surface)->function3d = function;
}
+/**
+ * gtk_plot_surface_destroy:
+ * @object:
+ *
+ *
+ */
void
gtk_plot_surface_destroy(GtkObject *object)
{
@@ -663,6 +766,7 @@ gtk_plot_surface_draw_private (GtkPlotData *data)
g_return_if_fail(GTK_PLOT_DATA(data)->plot != NULL);
g_return_if_fail(GTK_IS_PLOT(GTK_PLOT_DATA(data)->plot));
+ if(!gtk_widget_get_visible(GTK_WIDGET(data))) return;
plot = GTK_PLOT(data->plot);
@@ -879,6 +983,7 @@ gtk_plot_surface_draw_legend(GtkPlotData *data, gint x, gint y)
GdkRectangle area;
gint lascent, ldescent, lheight, lwidth;
gdouble m;
+ GtkAllocation allocation;
surface = GTK_PLOT_SURFACE(data);
@@ -886,10 +991,11 @@ gtk_plot_surface_draw_legend(GtkPlotData *data, gint x, gint y)
g_return_if_fail(GTK_IS_PLOT(data->plot));
plot = data->plot;
- area.x = GTK_WIDGET(plot)->allocation.x;
- area.y = GTK_WIDGET(plot)->allocation.y;
- area.width = GTK_WIDGET(plot)->allocation.width;
- area.height = GTK_WIDGET(plot)->allocation.height;
+ gtk_widget_get_allocation(GTK_WIDGET(plot), &allocation);
+ area.x = allocation.x;
+ area.y = allocation.y;
+ area.width = allocation.width;
+ area.height = allocation.height;
m = plot->magnification;
legend = plot->legends_attr;
@@ -1101,6 +1207,13 @@ rgb_to_hsv (gdouble r, gdouble g, gdouble b,
* gtk_plot_surface_get_mesh_visible
******************************************/
+/**
+ * gtk_plot_surface_set_color:
+ * @data:
+ * @color:
+ *
+ *
+ */
void
gtk_plot_surface_set_color (GtkPlotSurface *data,
GdkColor *color)
@@ -1108,6 +1221,13 @@ gtk_plot_surface_set_color (GtkPlotSurface *data,
data->color = *color;
}
+/**
+ * gtk_plot_surface_set_shadow:
+ * @data:
+ * @color:
+ *
+ *
+ */
void
gtk_plot_surface_set_shadow (GtkPlotSurface *data,
GdkColor *color)
@@ -1115,6 +1235,13 @@ gtk_plot_surface_set_shadow (GtkPlotSurface *data,
data->shadow = *color;
}
+/**
+ * gtk_plot_surface_set_grid_foreground:
+ * @data:
+ * @foreground:
+ *
+ *
+ */
void
gtk_plot_surface_set_grid_foreground (GtkPlotSurface *data,
GdkColor *foreground)
@@ -1122,6 +1249,13 @@ gtk_plot_surface_set_grid_foreground (GtkPlotSurface *data,
data->grid_foreground = *foreground;
}
+/**
+ * gtk_plot_surface_set_grid_background:
+ * @data:
+ * @background:
+ *
+ *
+ */
void
gtk_plot_surface_set_grid_background (GtkPlotSurface *data,
GdkColor *background)
@@ -1129,6 +1263,13 @@ gtk_plot_surface_set_grid_background (GtkPlotSurface *data,
data->grid_background = *background;
}
+/**
+ * gtk_plot_surface_set_grid_visible:
+ * @data:
+ * @visible:
+ *
+ *
+ */
void
gtk_plot_surface_set_grid_visible (GtkPlotSurface *data,
gboolean visible)
@@ -1136,12 +1277,25 @@ gtk_plot_surface_set_grid_visible (GtkPlotSurface *data,
data->show_grid = visible;
}
+/**
+ * gtk_plot_surface_get_grid_visible:
+ * @data:
+ *
+ *
+ */
gboolean
gtk_plot_surface_get_grid_visible (GtkPlotSurface *data)
{
return (data->show_grid);
}
+/**
+ * gtk_plot_surface_set_mesh_visible:
+ * @data:
+ * @visible:
+ *
+ *
+ */
void
gtk_plot_surface_set_mesh_visible (GtkPlotSurface *data,
gboolean visible)
@@ -1149,12 +1303,27 @@ gtk_plot_surface_set_mesh_visible (GtkPlotSurface *data,
data->show_mesh = visible;
}
+/**
+ * gtk_plot_surface_get_mesh_visible:
+ * @data:
+ *
+ *
+ */
gboolean
gtk_plot_surface_get_mesh_visible (GtkPlotSurface *data)
{
return (data->show_mesh);
}
+/**
+ * gtk_plot_surface_set_light:
+ * @data:
+ * @x:
+ * @y:
+ * @z:
+ *
+ *
+ */
void
gtk_plot_surface_set_light (GtkPlotSurface *data,
gdouble x, gdouble y, gdouble z)
@@ -1164,6 +1333,13 @@ gtk_plot_surface_set_light (GtkPlotSurface *data,
data->light.z = z;
}
+/**
+ * gtk_plot_surface_use_height_gradient:
+ * @data:
+ * @use_gradient:
+ *
+ *
+ */
void
gtk_plot_surface_use_height_gradient (GtkPlotSurface *data,
gboolean use_gradient)
@@ -1171,6 +1347,13 @@ gtk_plot_surface_use_height_gradient (GtkPlotSurface *data,
data->use_height_gradient = use_gradient;
}
+/**
+ * gtk_plot_surface_use_amplitud:
+ * @data:
+ * @use_amplitud:
+ *
+ *
+ */
void
gtk_plot_surface_use_amplitud (GtkPlotSurface *data,
gboolean use_amplitud)
@@ -1178,6 +1361,13 @@ gtk_plot_surface_use_amplitud (GtkPlotSurface *data,
data->use_amplitud = use_amplitud;
}
+/**
+ * gtk_plot_surface_set_ambient:
+ * @data:
+ * @ambient:
+ *
+ *
+ */
void
gtk_plot_surface_set_ambient (GtkPlotSurface *data,
gdouble ambient)
@@ -1185,6 +1375,13 @@ gtk_plot_surface_set_ambient (GtkPlotSurface *data,
data->ambient = ambient;
}
+/**
+ * gtk_plot_surface_set_transparent:
+ * @data:
+ * @transparent:
+ *
+ *
+ */
void
gtk_plot_surface_set_transparent (GtkPlotSurface *data,
gboolean transparent)
@@ -1217,6 +1414,19 @@ gtk_plot_surface_set_transparent (GtkPlotSurface *data,
* gtk_plot_surface_get_ystep
******************************************/
+/**
+ * gtk_plot_surface_set_points:
+ * @x:
+ * @y:
+ * @z:
+ * @dx:
+ * @dy:
+ * @dz:
+ * @nx:
+ * @ny:
+ *
+ *
+ */
void
gtk_plot_surface_set_points(GtkPlotSurface *data,
gdouble *x, gdouble *y, gdouble *z,
@@ -1236,6 +1446,19 @@ gtk_plot_surface_set_points(GtkPlotSurface *data,
gtk_plot_surface_build_mesh(data);
}
+/**
+ * gtk_plot_surface_get_points:
+ * @x:
+ * @y:
+ * @z:
+ * @dx:
+ * @dy:
+ * @dz:
+ * @nx:
+ * @ny:
+ *
+ *
+ */
void
gtk_plot_surface_get_points(GtkPlotSurface *data,
gdouble **x, gdouble **y, gdouble **z,
@@ -1253,6 +1476,13 @@ gtk_plot_surface_get_points(GtkPlotSurface *data,
*ny = data->ny;
}
+/**
+ * gtk_plot_surface_set_x:
+ * @data:
+ * @x: the value to be set
+ *
+ * Return value: (transfer none) the affected #GtkPlotArray
+ */
GtkPlotArray *
gtk_plot_surface_set_x(GtkPlotSurface *data,
gdouble *x)
@@ -1260,6 +1490,13 @@ gtk_plot_surface_set_x(GtkPlotSurface *data,
return gtk_plot_data_set_x(GTK_PLOT_DATA(data), x);
}
+/**
+ * gtk_plot_surface_set_y:
+ * @data:
+ * @y: the value to be set
+ *
+ * Return value: (transfer none) the affected #GtkPlotArray
+ */
GtkPlotArray *
gtk_plot_surface_set_y(GtkPlotSurface *data,
gdouble *y)
@@ -1267,6 +1504,13 @@ gtk_plot_surface_set_y(GtkPlotSurface *data,
return gtk_plot_data_set_y(GTK_PLOT_DATA(data), y);
}
+/**
+ * gtk_plot_surface_set_z:
+ * @data:
+ * @z: the value to be set
+ *
+ * Return value: (transfer none) the affected #GtkPlotArray
+ */
GtkPlotArray *
gtk_plot_surface_set_z(GtkPlotSurface *data,
gdouble *z)
@@ -1274,6 +1518,13 @@ gtk_plot_surface_set_z(GtkPlotSurface *data,
return gtk_plot_data_set_z(GTK_PLOT_DATA(data), z);
}
+/**
+ * gtk_plot_surface_set_dx:
+ * @data:
+ * @dx: the value to be set
+ *
+ * Return value: (transfer none) the affected #GtkPlotArray
+ */
GtkPlotArray *
gtk_plot_surface_set_dx(GtkPlotSurface *data,
gdouble *dx)
@@ -1281,6 +1532,13 @@ gtk_plot_surface_set_dx(GtkPlotSurface *data,
return gtk_plot_data_set_dx(GTK_PLOT_DATA(data), dx);
}
+/**
+ * gtk_plot_surface_set_dy:
+ * @data:
+ * @dy: the value to be set
+ *
+ * Return value: (transfer none) the affected #GtkPlotArray
+ */
GtkPlotArray *
gtk_plot_surface_set_dy(GtkPlotSurface *data,
gdouble *dy)
@@ -1288,6 +1546,13 @@ gtk_plot_surface_set_dy(GtkPlotSurface *data,
return gtk_plot_data_set_dy(GTK_PLOT_DATA(data), dy);
}
+/**
+ * gtk_plot_surface_set_dz:
+ * @data:
+ * @dz: the value to be set
+ *
+ * Return value: (transfer none) the affected #GtkPlotArray
+ */
GtkPlotArray *
gtk_plot_surface_set_dz(GtkPlotSurface *data,
gdouble *dz)
@@ -1295,6 +1560,13 @@ gtk_plot_surface_set_dz(GtkPlotSurface *data,
return gtk_plot_data_set_dz(GTK_PLOT_DATA(data), dz);
}
+/**
+ * gtk_plot_surface_get_x:
+ * @dataset:
+ * @nx: the value to be set
+ *
+ * Return value:
+ */
gdouble *
gtk_plot_surface_get_x(GtkPlotSurface *dataset, gint *nx)
{
@@ -1303,6 +1575,15 @@ gtk_plot_surface_get_x(GtkPlotSurface *dataset, gint *nx)
return(gtk_plot_data_get_x(GTK_PLOT_DATA(dataset), &n));
}
+/**
+ * gtk_plot_surface_get_y:
+ * @dataset:
+ * @ny:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble *
gtk_plot_surface_get_y(GtkPlotSurface *dataset, gint *ny)
{
@@ -1311,6 +1592,16 @@ gtk_plot_surface_get_y(GtkPlotSurface *dataset, gint *ny)
return(gtk_plot_data_get_y(GTK_PLOT_DATA(dataset), &n));
}
+/**
+ * gtk_plot_surface_get_z:
+ * @dataset:
+ * @nx:
+ * @ny:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble *
gtk_plot_surface_get_z(GtkPlotSurface *dataset, gint *nx, gint *ny)
{
@@ -1320,6 +1611,14 @@ gtk_plot_surface_get_z(GtkPlotSurface *dataset, gint *nx, gint *ny)
return(gtk_plot_data_get_z(GTK_PLOT_DATA(dataset), &n));
}
+/**
+ * gtk_plot_surface_get_dz:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble *
gtk_plot_surface_get_dz(GtkPlotSurface *dataset)
{
@@ -1327,6 +1626,14 @@ gtk_plot_surface_get_dz(GtkPlotSurface *dataset)
return(gtk_plot_data_get_dz(GTK_PLOT_DATA(dataset), &n));
}
+/**
+ * gtk_plot_surface_get_dx:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble *
gtk_plot_surface_get_dx(GtkPlotSurface *dataset)
{
@@ -1334,6 +1641,14 @@ gtk_plot_surface_get_dx(GtkPlotSurface *dataset)
return(gtk_plot_data_get_dx(GTK_PLOT_DATA(dataset), &n));
}
+/**
+ * gtk_plot_surface_get_dy:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble *
gtk_plot_surface_get_dy(GtkPlotSurface *dataset)
{
@@ -1341,54 +1656,120 @@ gtk_plot_surface_get_dy(GtkPlotSurface *dataset)
return(gtk_plot_data_get_dy(GTK_PLOT_DATA(dataset), &n));
}
+/**
+ * gtk_plot_surface_set_nx:
+ * @dataset:
+ * @nx:
+ *
+ *
+ */
void
gtk_plot_surface_set_nx(GtkPlotSurface *dataset, gint nx)
{
dataset->nx = nx;
}
+/**
+ * gtk_plot_surface_set_ny:
+ * @dataset:
+ * @ny:
+ *
+ *
+ */
void
gtk_plot_surface_set_ny(GtkPlotSurface *dataset, gint ny)
{
dataset->ny = ny;
}
+/**
+ * gtk_plot_surface_get_nx:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gint
gtk_plot_surface_get_nx(GtkPlotSurface *dataset)
{
return(dataset->nx);
}
+/**
+ * gtk_plot_surface_get_ny:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gint
gtk_plot_surface_get_ny(GtkPlotSurface *dataset)
{
return(dataset->ny);
}
+/**
+ * gtk_plot_surface_set_xstep:
+ * @dataset:
+ * @xstep:
+ *
+ *
+ */
void
gtk_plot_surface_set_xstep(GtkPlotSurface *dataset, gdouble xstep)
{
dataset->xstep = xstep;
}
+/**
+ * gtk_plot_surface_set_ystep:
+ * @dataset:
+ * @ystep:
+ *
+ *
+ */
void
gtk_plot_surface_set_ystep(GtkPlotSurface *dataset, gdouble ystep)
{
dataset->ystep = ystep;
}
+/**
+ * gtk_plot_surface_get_xstep:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble
gtk_plot_surface_get_xstep(GtkPlotSurface *dataset)
{
return (dataset->xstep);
}
+/**
+ * gtk_plot_surface_get_ystep:
+ * @dataset:
+ *
+ *
+ *
+ * Return value:
+ */
gdouble
gtk_plot_surface_get_ystep(GtkPlotSurface *dataset)
{
return (dataset->ystep);
}
+/**
+ * gtk_plot_surface_build_mesh:
+ * @surface:
+ *
+ *
+ */
void
gtk_plot_surface_build_mesh(GtkPlotSurface *surface)
{
@@ -1570,6 +1951,12 @@ gtk_plot_surface_build_polygons(GtkPlotSurface *surface)
};
}
+/**
+ * gtk_plot_surface_recalc_nodes:
+ * @surface:
+ *
+ *
+ */
void
gtk_plot_surface_recalc_nodes(GtkPlotSurface *surface)
{
diff --git a/gtkextra/gtkplotsurface.h b/gtkextra/gtkplotsurface.h
index bcbf82e..facdbaf 100644
--- a/gtkextra/gtkplotsurface.h
+++ b/gtkextra/gtkplotsurface.h
@@ -27,15 +27,21 @@ extern "C" {
#include "gtkplot.h"
#include "gtkplotdt.h"
-#define GTK_PLOT_SURFACE(obj) GTK_CHECK_CAST (obj, gtk_plot_surface_get_type (), GtkPlotSurface)
-#define GTK_TYPE_PLOT_SURFACE (gtk_plot_surface_get_type ())
-#define GTK_PLOT_SURFACE_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_plot_surface_get_type(),
GtkPlotSurfaceClass)
-#define GTK_IS_PLOT_SURFACE(obj) GTK_CHECK_TYPE (obj, gtk_plot_surface_get_type ())
+#define GTK_PLOT_SURFACE(obj) G_TYPE_CHECK_INSTANCE_CAST (obj, gtk_plot_surface_get_type (),
GtkPlotSurface)
+#define G_TYPE_PLOT_SURFACE (gtk_plot_surface_get_type ())
+#define GTK_PLOT_SURFACE_CLASS(klass) G_TYPE_CHECK_CLASS_CAST (klass, gtk_plot_surface_get_type(),
GtkPlotSurfaceClass)
+#define GTK_IS_PLOT_SURFACE(obj) G_TYPE_CHECK_INSTANCE_TYPE (obj, gtk_plot_surface_get_type ())
typedef struct _GtkPlotPolygon GtkPlotPolygon;
typedef struct _GtkPlotSurface GtkPlotSurface;
typedef struct _GtkPlotSurfaceClass GtkPlotSurfaceClass;
+/**
+ * GtkPlotiPolygon:
+ *
+ * The GtkPlotPolygon struct contains only private data.
+ * It should only be accessed through the functions described below.
+ */
struct _GtkPlotPolygon
{
GtkPlotDTtriangle *t; /* parent triangle */
@@ -47,6 +53,12 @@ struct _GtkPlotPolygon
gboolean sublevel;
};
+/**
+ * GtkPlotSurface:
+ *
+ * The GtkPlotSurface struct contains only private data.
+ * It should only be accessed through the functions described below.
+ */
struct _GtkPlotSurface
{
GtkPlotData data;
@@ -88,7 +100,7 @@ struct _GtkPlotSurfaceClass
};
-GtkType gtk_plot_surface_get_type (void);
+GType gtk_plot_surface_get_type (void);
GtkWidget* gtk_plot_surface_new (void);
GtkWidget* gtk_plot_surface_new_function (GtkPlotFunc3D function);
@@ -150,30 +162,30 @@ GtkPlotArray * gtk_plot_surface_set_dy (GtkPlotSurface *data,
gdouble *dy);
GtkPlotArray * gtk_plot_surface_set_dz (GtkPlotSurface *data,
gdouble *dz);
-gdouble * gtk_plot_surface_get_x (GtkPlotSurface *data,
+gdouble * gtk_plot_surface_get_x (GtkPlotSurface *dataset,
gint *nx);
-gdouble * gtk_plot_surface_get_y (GtkPlotSurface *data,
+gdouble * gtk_plot_surface_get_y (GtkPlotSurface *dataset,
gint *ny);
-gdouble * gtk_plot_surface_get_z (GtkPlotSurface *data,
+gdouble * gtk_plot_surface_get_z (GtkPlotSurface *dataset,
gint *nx, gint *ny);
-gdouble * gtk_plot_surface_get_dx (GtkPlotSurface *data);
-gdouble * gtk_plot_surface_get_dy (GtkPlotSurface *data);
-gdouble * gtk_plot_surface_get_dz (GtkPlotSurface *data);
-void gtk_plot_surface_set_nx (GtkPlotSurface *data,
+gdouble * gtk_plot_surface_get_dx (GtkPlotSurface *dataset);
+gdouble * gtk_plot_surface_get_dy (GtkPlotSurface *dataset);
+gdouble * gtk_plot_surface_get_dz (GtkPlotSurface *dataset);
+void gtk_plot_surface_set_nx (GtkPlotSurface *dataset,
gint nx);
-void gtk_plot_surface_set_ny (GtkPlotSurface *data,
+void gtk_plot_surface_set_ny (GtkPlotSurface *dataset,
gint ny);
-gint gtk_plot_surface_get_nx (GtkPlotSurface *data);
-gint gtk_plot_surface_get_ny (GtkPlotSurface *data);
+gint gtk_plot_surface_get_nx (GtkPlotSurface *dataset);
+gint gtk_plot_surface_get_ny (GtkPlotSurface *dataset);
-void gtk_plot_surface_set_xstep (GtkPlotSurface *data,
+void gtk_plot_surface_set_xstep (GtkPlotSurface *dataset,
gdouble xstep);
-void gtk_plot_surface_set_ystep (GtkPlotSurface *data,
+void gtk_plot_surface_set_ystep (GtkPlotSurface *dataset,
gdouble ystep);
-gdouble gtk_plot_surface_get_xstep (GtkPlotSurface *data);
-gdouble gtk_plot_surface_get_ystep (GtkPlotSurface *data);
-void gtk_plot_surface_build_mesh (GtkPlotSurface *data);
-void gtk_plot_surface_recalc_nodes (GtkPlotSurface *data);
+gdouble gtk_plot_surface_get_xstep (GtkPlotSurface *dataset);
+gdouble gtk_plot_surface_get_ystep (GtkPlotSurface *dataset);
+void gtk_plot_surface_build_mesh (GtkPlotSurface *surface);
+void gtk_plot_surface_recalc_nodes (GtkPlotSurface *surface);
#ifdef __cplusplus
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
