"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "examples/addremove.c" between
gtkdatabox-0.9.3.1.tar.gz and gtkdatabox-1.0.0.tar.gz

About: GtkDatabox is a Gtk+-widget for live display of large amounts of fluctuating numerical data.

addremove.c  (gtkdatabox-0.9.3.1):addremove.c  (gtkdatabox-1.0.0)
skipping to change at line 17 skipping to change at line 17
* as published by the Free Software Foundation; either version 2.1 * as published by the Free Software Foundation; either version 2.1
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details. * GNU Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gtkdatabox.h> #include <gtkdatabox.h>
#include <gtkdatabox_points.h> #include <gtkdatabox_points.h>
#include <math.h> #include <math.h>
#define POINTS 200 #define POINTS 200
GtkDataboxGraph **graphs; GtkDataboxGraph **graphs;
/*---------------------------------------------------------------- /*----------------------------------------------------------------
* databox addremove * databox addremove
*----------------------------------------------------------------*/ *----------------------------------------------------------------*/
void void
add_data (GtkDatabox * box, gint index) add_data (GtkDatabox * box, gint index)
{ {
GdkColor color; GdkRGBA color;
gint add_index; gint add_index;
color.red = 32768 + 32767 * (index + 1) / 10; color.red = 0.5 + 0.5 * (index + 1) / 10;
color.green = 65535 - 32768 * index / 10; color.green = 1 - 0.5 * index / 10;
color.blue = 65535; color.blue = 1;
color.alpha = 1;
gtk_databox_graph_set_color (graphs[index], &color); gtk_databox_graph_set_color (graphs[index], &color);
add_index = gtk_databox_graph_add (GTK_DATABOX (box), graphs[index]); add_index = gtk_databox_graph_add (GTK_DATABOX (box), graphs[index]);
g_print ("Added graph has index: %d\n", add_index); g_print ("Added graph has index: %d\n", add_index);
} }
static gboolean static gboolean
addremove_func (GtkDatabox * box) addremove_func (GtkDatabox * box)
skipping to change at line 116 skipping to change at line 117
{ {
GtkWidget *window = NULL; GtkWidget *window = NULL;
GtkWidget *box1; GtkWidget *box1;
GtkWidget *box2; GtkWidget *box2;
GtkWidget *close_button; GtkWidget *close_button;
GtkWidget *box; GtkWidget *box;
GtkWidget *table; GtkWidget *table;
GtkWidget *label; GtkWidget *label;
GtkWidget *separator; GtkWidget *separator;
GtkDataboxGraph *graph; GtkDataboxGraph *graph;
GdkColor color; GdkRGBA color;
gfloat *X; gfloat *X;
gfloat *Y; gfloat *Y;
gint i, j; gint i, j;
graphs = g_new0 (GtkDataboxGraph *, 10); graphs = g_new0 (GtkDataboxGraph *, 10);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL); window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_widget_set_size_request (window, 400, 400); gtk_widget_set_size_request (window, 400, 400);
g_signal_connect (GTK_OBJECT (window), "destroy", g_signal_connect (G_OBJECT (window), "destroy",
G_CALLBACK (gtk_main_quit), NULL); G_CALLBACK (gtk_main_quit), NULL);
gtk_window_set_title (GTK_WINDOW (window), "GtkDatabox: Basics"); gtk_window_set_title (GTK_WINDOW (window), "GtkDatabox: Basics");
gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_container_set_border_width (GTK_CONTAINER (window), 0);
box1 = gtk_vbox_new (FALSE, 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), box1); gtk_container_add (GTK_CONTAINER (window), box1);
label = label =
gtk_label_new gtk_label_new
("When you click on the \"Add/Remove\" button, a graph will be removed.\nW hen you click again, it is added again.\n\n(This is just for testing add and rem ove functions)"); ("When you click on the \"Add/Remove\" button, a graph will be removed.\nW hen you click again, it is added again.\n\n(This is just for testing add and rem ove functions)");
gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
separator = gtk_hseparator_new (); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, FALSE, 0);
/* Create a GtkDatabox widget along with scrollbars and rulers */ /* Create a GtkDatabox widget along with scrollbars and rulers */
gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table, gtk_databox_create_box_with_scrollbars_and_rulers (&box, &table,
TRUE, TRUE, TRUE, TRUE); TRUE, TRUE, TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
color.red = 16383; color.red = 0.33;
color.green = 16383; color.green = 0.33;
color.blue = 16383; color.blue = 0.33;
gtk_widget_modify_bg (box, GTK_STATE_NORMAL, &color); color.alpha = 1.0;
gtk_databox_set_bg_color (GTK_DATABOX (box), "#555555");
X = g_new0 (gfloat, POINTS); X = g_new0 (gfloat, POINTS);
for (i = 0; i < POINTS; i++) for (i = 0; i < POINTS; i++)
{ {
X[i] = i * 5; X[i] = i * 5;
} }
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
Y = g_new0 (gfloat, POINTS); Y = g_new0 (gfloat, POINTS);
skipping to change at line 181 skipping to change at line 184
X[0] = -100.; X[0] = -100.;
Y[0] = -1100.; Y[0] = -1100.;
X[1] = -100.; X[1] = -100.;
Y[1] = +1100.; Y[1] = +1100.;
X[2] = +1100.; X[2] = +1100.;
Y[2] = -1100.; Y[2] = -1100.;
X[3] = +1100.; X[3] = +1100.;
Y[3] = +1100.; Y[3] = +1100.;
color.red = 65535; color.red = 1;
color.green = 0; color.green = 0;
color.blue = 0; color.blue = 0;
color.alpha = 1;
graph = gtk_databox_points_new (4, X, Y, &color, 3); graph = gtk_databox_points_new (4, X, Y, &color, 3);
gtk_databox_graph_add (GTK_DATABOX (box), graph); gtk_databox_graph_add (GTK_DATABOX (box), graph);
gtk_databox_auto_rescale (GTK_DATABOX (box), 0.05); gtk_databox_auto_rescale (GTK_DATABOX (box), 0.05);
separator = gtk_hseparator_new (); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
box2 = gtk_vbox_new (FALSE, 10); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
gtk_box_pack_end (GTK_BOX (box1), box2, FALSE, TRUE, 0); gtk_box_pack_end (GTK_BOX (box1), box2, FALSE, TRUE, 0);
close_button = gtk_button_new_with_label ("Add/Remove"); close_button = gtk_button_new_with_label ("Add/Remove");
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", g_signal_connect_swapped (G_OBJECT (close_button), "clicked",
G_CALLBACK (addremove_func), GTK_OBJECT (box)); G_CALLBACK (addremove_func), G_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
close_button = gtk_button_new_with_label ("Close"); close_button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (GTK_OBJECT (close_button), "clicked", g_signal_connect_swapped (G_OBJECT (close_button), "clicked",
G_CALLBACK (gtk_main_quit), GTK_OBJECT (box)); G_CALLBACK (gtk_main_quit), G_OBJECT (box));
gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box2), close_button, TRUE, TRUE, 0);
gtk_widget_set_can_default(close_button, GTK_CAN_DEFAULT); gtk_widget_set_can_default(close_button, TRUE);
gtk_widget_grab_default (close_button); gtk_widget_grab_default (close_button);
gtk_widget_show_all (window); gtk_widget_show_all (window);
} }
gint gint
main (gint argc, char *argv[]) main (gint argc, char *argv[])
{ {
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
 End of changes. 15 change blocks. 
21 lines changed or deleted 26 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)