#include <language/syntax-string-source.h>
#include "psppire-data-store.h"
-#include <gtksheet/psppire-axis-hetero.h>
-#include <gtksheet/psppire-axis-uniform.h>
+#include <gtksheet/psppire-axis-impl.h>
#include "helper.h"
#include <gtksheet/gtkxpaned.h>
gint i;
for (i = 0 ; i < 4 ; ++i)
{
- PsppireAxisUniform *vaxis;
- casenumber n_cases = psppire_case_file_get_case_count (ds->case_file);
+ PsppireAxisImpl *vaxis;
+ casenumber n_cases = psppire_data_store_get_case_count (ds);
g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL);
- psppire_axis_uniform_set_count (vaxis, n_cases);
+ psppire_axis_impl_clear (vaxis);
+ psppire_axis_impl_append_n (vaxis, n_cases, DEFAULT_ROW_HEIGHT);
}
}
static void
-new_variables_callback (PsppireDict *dict, gpointer data)
+case_inserted_callback (PsppireDataStore *ds, gint before, gpointer data)
{
- gint v, i;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
- PsppireAxisHetero *vaxis;
- g_object_get (de->var_sheet, "vertical-axis", &vaxis, NULL);
+ gint i;
+
+ for (i = 0 ; i < 4 ; ++i)
+ {
+ PsppireAxisImpl *vaxis;
- psppire_axis_hetero_clear (vaxis);
+ g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL);
+
+ psppire_axis_impl_insert (vaxis, before, DEFAULT_ROW_HEIGHT);
+ }
+}
+
+
+static void
+cases_deleted_callback (PsppireDataStore *ds, gint first, gint n_cases, gpointer data)
+{
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
- for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
- psppire_axis_hetero_append (vaxis, DEFAULT_ROW_HEIGHT);
+ gint i;
for (i = 0 ; i < 4 ; ++i)
{
- PsppireAxisHetero *haxis;
- g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+ PsppireAxisImpl *vaxis;
- psppire_axis_hetero_clear (haxis);
-
- for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
- {
- const struct variable *var = psppire_dict_get_variable (dict, v);
+ g_object_get (de->data_sheet[i], "vertical-axis", &vaxis, NULL);
- psppire_axis_hetero_append (haxis, 10 * var_get_display_width (var));
- }
+ psppire_axis_impl_delete (vaxis, first, n_cases);
}
}
+
+
/* Return the width (in pixels) of an upper case M when rendered in the
current font of W
*/
return rect.width;
}
+static void
+new_variables_callback (PsppireDict *dict, gpointer data)
+{
+ gint v, i;
+ PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
+ gint m_width = width_of_m (GTK_WIDGET (de));
+
+ PsppireAxisImpl *vaxis;
+ g_object_get (de->var_sheet, "vertical-axis", &vaxis, NULL);
+
+ psppire_axis_impl_clear (vaxis);
+ psppire_axis_impl_append_n (vaxis, 1 + psppire_dict_get_var_cnt (dict), DEFAULT_ROW_HEIGHT);
+
+ for (i = 0 ; i < 4 ; ++i)
+ {
+ PsppireAxisImpl *haxis;
+ g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
+
+ psppire_axis_impl_clear (haxis);
+
+ for (v = 0 ; v < psppire_dict_get_var_cnt (dict); ++v)
+ {
+ const struct variable *var = psppire_dict_get_variable (dict, v);
+
+ psppire_axis_impl_append (haxis, m_width * var_get_display_width (var));
+ }
+ }
+}
+
static void
insert_variable_callback (PsppireDict *dict, gint x, gpointer data)
{
gint m_width = width_of_m (GTK_WIDGET (de));
- PsppireAxisHetero *var_vaxis;
+ PsppireAxisImpl *var_vaxis;
g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
- psppire_axis_hetero_insert (var_vaxis, DEFAULT_ROW_HEIGHT, x);
+ psppire_axis_impl_insert (var_vaxis, x, DEFAULT_ROW_HEIGHT);
for (i = 0 ; i < 4 ; ++i)
{
const struct variable *var = psppire_dict_get_variable (dict, x);
- PsppireAxisHetero *haxis;
+ PsppireAxisImpl *haxis;
g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
- psppire_axis_hetero_insert (haxis, m_width * var_get_display_width (var), x);
+ psppire_axis_impl_insert (haxis, x, m_width * var_get_display_width (var));
}
}
gint i;
PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (data);
- PsppireAxisHetero *var_vaxis;
+ PsppireAxisImpl *var_vaxis;
g_object_get (de->var_sheet, "vertical-axis", &var_vaxis, NULL);
- psppire_axis_hetero_remove (var_vaxis, posn);
+ psppire_axis_impl_delete (var_vaxis, posn, 1);
for (i = 0 ; i < 4 ; ++i)
{
- PsppireAxisHetero *haxis;
+ PsppireAxisImpl *haxis;
g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
- psppire_axis_hetero_remove (haxis, posn);
+ psppire_axis_impl_delete (haxis, posn, 1);
}
}
for (i = 0 ; i < 4 ; ++i)
{
const struct variable *var = psppire_dict_get_variable (dict, posn);
- PsppireAxisHetero *haxis;
+ PsppireAxisImpl *haxis;
g_object_get (de->data_sheet[i], "horizontal-axis", &haxis, NULL);
- psppire_axis_hetero_resize_unit (haxis,
- m_width *
- var_get_display_width (var), posn);
+ psppire_axis_impl_resize (haxis, posn, m_width *
+ var_get_display_width (var));
}
}
"model", de->data_store,
NULL);
- g_signal_connect (de->data_store->dict, "backend-changed", G_CALLBACK (new_variables_callback), de);
- g_signal_connect (de->data_store->dict, "variable-inserted", G_CALLBACK (insert_variable_callback), de);
- g_signal_connect (de->data_store->dict, "variable-deleted", G_CALLBACK (delete_variable_callback), de);
- g_signal_connect (de->data_store->dict, "variable-display-width-changed", G_CALLBACK (rewidth_variable_callback), de);
+ g_signal_connect (de->data_store->dict, "backend-changed",
+ G_CALLBACK (new_variables_callback), de);
+
+ g_signal_connect (de->data_store->dict, "variable-inserted",
+ G_CALLBACK (insert_variable_callback), de);
+
+ g_signal_connect (de->data_store->dict, "variable-deleted",
+ G_CALLBACK (delete_variable_callback), de);
+
+ g_signal_connect (de->data_store->dict, "variable-display-width-changed",
+ G_CALLBACK (rewidth_variable_callback), de);
+
+ g_signal_connect (de->data_store, "backend-changed",
+ G_CALLBACK (new_data_callback), de);
+
+ g_signal_connect (de->data_store, "case-inserted",
+ G_CALLBACK (case_inserted_callback), de);
+
+ g_signal_connect (de->data_store, "cases-deleted",
+ G_CALLBACK (cases_deleted_callback), de);
- g_signal_connect (de->data_store, "backend-changed", G_CALLBACK (new_data_callback), de);
break;
case PROP_VAR_STORE:
if ( de->var_store) g_object_unref (de->var_store);
init_sheet (PsppireDataEditor *de, int i,
GtkAdjustment *hadj, GtkAdjustment *vadj)
{
- PsppireAxisHetero *haxis = psppire_axis_hetero_new ();
- PsppireAxisUniform *vaxis = psppire_axis_uniform_new ();
+ PsppireAxisImpl *haxis = psppire_axis_impl_new ();
+ PsppireAxisImpl *vaxis = psppire_axis_impl_new ();
de->sheet_bin[i] = gtk_scrolled_window_new (hadj, vadj);
de->data_sheet[i] = gtk_sheet_new (NULL);
{
struct ccase old;
- if (psppire_case_file_get_case (ds->case_file, i, &old))
+ if (psppire_data_store_get_case (ds, i, &old))
{
struct ccase new;