X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-case-file.c;h=717fee4873529b09c3f61b22cb4695ff4d7986cd;hb=62215e63f11b18112899541b29b3151e25f7eb6e;hp=bb6f8b5545ca72efd83ff461cf5f5e03e9799fd3;hpb=32884aab5da9ba8455d482dc1f52989ff7de4ee6;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c
index bb6f8b55..717fee48 100644
--- a/src/ui/gui/psppire-case-file.c
+++ b/src/ui/gui/psppire-case-file.c
@@ -20,8 +20,9 @@
 
 #include "psppire-case-file.h"
 
-#include <gtksheet/gtkextra-marshal.h>
+#include <gtksheet/psppire-marshal.h>
 
+#include <data/format.h>
 #include <data/case.h>
 #include <data/data-in.h>
 #include <data/datasheet.h>
@@ -80,16 +81,91 @@ psppire_case_file_get_type (void)
   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),
@@ -120,7 +196,7 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 		  G_SIGNAL_RUN_FIRST,
 		  0,
 		  NULL, NULL,
-		  gtkextra_VOID__INT_INT,
+		  psppire_marshal_VOID__INT_INT,
 		  G_TYPE_NONE,
 		  2,
 		  G_TYPE_INT, G_TYPE_INT);
@@ -152,14 +228,11 @@ psppire_case_file_init (PsppireCaseFile *cf)
  * 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);
 }
 
 
@@ -205,31 +278,7 @@ psppire_case_file_insert_case (PsppireCaseFile *cf,
 }
 
 
-/* Append a case to the case file */
-static 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);
-  g_return_val_if_fail (cf->accessible, 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);
-
-  return result;
-}
-
-
-inline casenumber
+casenumber
 psppire_case_file_get_case_count (const PsppireCaseFile *cf)
 {
   g_return_val_if_fail (cf, FALSE);
@@ -306,7 +355,7 @@ gboolean
 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;
 
@@ -318,7 +367,7 @@ psppire_case_file_data_in (PsppireCaseFile *cf, casenumber casenum, gint idx,
   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)
@@ -367,7 +416,7 @@ psppire_case_file_insert_values (PsppireCaseFile *cf,
   {
     union value *values = xcalloc (n_values, sizeof *values);
     datasheet_insert_columns (cf->datasheet, values, n_values, where);
-  free (values);
+    free (values);
   }
 
   return TRUE;