#include <gtksheet/gtkextra-marshal.h>
+#include <data/format.h>
#include <data/case.h>
#include <data/data-in.h>
#include <data/datasheet.h>
return object_type;
}
+/* Properties */
+enum
+{
+ PROP_0,
+ PROP_DATASHEET,
+ PROP_READER
+};
+
+
+
+
+static void
+psppire_case_file_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+
+{
+ PsppireCaseFile *cf = PSPPIRE_CASE_FILE (object);
+
+ switch (prop_id)
+ {
+ case PROP_READER:
+ cf->datasheet = datasheet_create (g_value_get_pointer (value));
+ cf->accessible = TRUE;
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ };
+}
+
+static void
+psppire_case_file_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ PsppireCaseFile *cf = PSPPIRE_CASE_FILE (object);
+
+ switch (prop_id)
+ {
+ case PROP_DATASHEET:
+ g_value_set_pointer (value, cf->datasheet);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ };
+}
+
static void
psppire_case_file_class_init (PsppireCaseFileClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
+ GParamSpec *datasheet_spec ;
+ GParamSpec *reader_spec ;
parent_class = g_type_class_peek_parent (class);
object_class->finalize = psppire_case_file_finalize;
+ datasheet_spec =
+ g_param_spec_pointer ("datasheet",
+ "Datasheet",
+ "A pointer to the datasheet belonging to this object",
+ G_PARAM_READABLE );
+ reader_spec =
+ g_param_spec_pointer ("casereader",
+ "CaseReader",
+ "A pointer to the case reader from which this object is constructed",
+ G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE );
+
+ object_class->set_property = psppire_case_file_set_property;
+ object_class->get_property = psppire_case_file_get_property;
+
+ g_object_class_install_property (object_class,
+ PROP_DATASHEET,
+ datasheet_spec);
+
+ g_object_class_install_property (object_class,
+ PROP_READER,
+ reader_spec);
+
signals [CASE_CHANGED] =
g_signal_new ("case-changed",
G_TYPE_FROM_CLASS (class),
* Creates a new #PsppireCaseFile.
*/
PsppireCaseFile*
-psppire_case_file_new (const struct casereader *reader)
+psppire_case_file_new (struct casereader *reader)
{
- PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
-
- cf->datasheet = datasheet_create (casereader_clone (reader));
- cf->accessible = TRUE;
-
- return cf;
+ return g_object_new (G_TYPE_PSPPIRE_CASE_FILE,
+ "casereader", reader,
+ NULL);
}
gboolean
-psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
+psppire_case_file_delete_cases (PsppireCaseFile *cf, casenumber n_cases, casenumber first)
{
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->datasheet, FALSE);
+ g_return_val_if_fail (cf->accessible, FALSE);
+
+ g_return_val_if_fail (first + n_cases <=
+ psppire_case_file_get_case_count (cf), FALSE);
datasheet_delete_rows (cf->datasheet, first, n_cases);
- g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first);
+ g_signal_emit (cf, signals [CASES_DELETED], 0, first, n_cases);
return TRUE;
}
/* Insert case CC into the case file before POSN */
gboolean
psppire_case_file_insert_case (PsppireCaseFile *cf,
- struct ccase *cc,
- gint posn)
+ struct ccase *cc,
+ casenumber posn)
{
struct ccase tmp;
bool result ;
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->datasheet, FALSE);
+ g_return_val_if_fail (cf->accessible, FALSE);
case_clone (&tmp, cc);
result = datasheet_insert_rows (cf->datasheet, posn, &tmp, 1);
if ( result )
g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
else
- g_warning ("Cannot insert case at position %d\n", posn);
-
- return result;
-}
-
-
-/* Append a case to the case file */
-gboolean
-psppire_case_file_append_case (PsppireCaseFile *cf,
- struct ccase *c)
-{
- struct ccase tmp;
- bool result ;
- gint posn ;
-
- g_return_val_if_fail (cf, FALSE);
- g_return_val_if_fail (cf->datasheet, FALSE);
-
- posn = datasheet_get_row_cnt (cf->datasheet);
-
- case_clone (&tmp, c);
- result = datasheet_insert_rows (cf->datasheet, posn, &tmp, 1);
-
- g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
+ g_warning ("Cannot insert case at position %ld\n", posn);
return result;
}
-inline casenumber
+casenumber
psppire_case_file_get_case_count (const PsppireCaseFile *cf)
{
g_return_val_if_fail (cf, FALSE);
/* Set the IDXth value of case C to V.
Returns true if successful, false on I/O error. */
gboolean
-psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx,
+psppire_case_file_set_value (PsppireCaseFile *cf, casenumber casenum, gint idx,
union value *v, gint width)
{
bool ok;
/* Set the IDXth value of case C using D_IN */
gboolean
-psppire_case_file_data_in (PsppireCaseFile *cf, gint casenum, gint idx,
+psppire_case_file_data_in (PsppireCaseFile *cf, casenumber casenum, gint idx,
struct substring input, const struct fmt_spec *fmt)
{
- union value *value;
+ union value *value = NULL;
int width;
bool ok;
width = fmt_var_width (fmt);
value = xmalloca (value_cnt_from_width (width) * sizeof *value);
ok = (datasheet_get_value (cf->datasheet, casenum, idx, value, width)
- && data_in (input, fmt->type, 0, 0, value, width)
+ && data_in (input, LEGACY_NATIVE, fmt->type, 0, 0, 0, value, width)
&& datasheet_put_value (cf->datasheet, casenum, idx, value, width));
if (ok)
void
-psppire_case_file_sort (PsppireCaseFile *cf, struct case_ordering *ordering)
+psppire_case_file_sort (PsppireCaseFile *cf, const struct subcase *ordering)
{
struct casereader *sorted_data;
gint c;
/* Resize the cases in the casefile, by inserting N_VALUES into every
- one of them. */
+ one of them at the position immediately preceeding WHERE.
+*/
gboolean
psppire_case_file_insert_values (PsppireCaseFile *cf,
- gint n_values, gint before)
+ gint n_values, gint where)
{
- union value *values;
g_return_val_if_fail (cf, FALSE);
g_return_val_if_fail (cf->accessible, FALSE);
+ if ( n_values == 0 )
+ return FALSE;
+
+ g_assert (n_values > 0);
+
if ( ! cf->datasheet )
cf->datasheet = datasheet_create (NULL);
- values = xcalloc (n_values, sizeof *values);
- datasheet_insert_columns (cf->datasheet, values, n_values, before);
- free (values);
+ {
+ union value *values = xcalloc (n_values, sizeof *values);
+ datasheet_insert_columns (cf->datasheet, values, n_values, where);
+ free (values);
+ }
return TRUE;
}
+
/* Fills C with the CASENUMth case.
Returns true on success, false otherwise.
*/
gboolean
-psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
+psppire_case_file_get_case (const PsppireCaseFile *cf, casenumber casenum,
struct ccase *c)
{
g_return_val_if_fail (cf, FALSE);