X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-case-file.c;h=fda121605a467dee5c5089c2a302780857554a6f;hb=3f159627d3b80706e58a54be2431c3edbc5333dc;hp=6c7942f551a0bfe34e86bd80c6d7b190c1098e8e;hpb=cf63d499efd5e6ca3a7dcc6386b3b87bd31bfda9;p=pspp

diff --git a/src/ui/gui/psppire-case-file.c b/src/ui/gui/psppire-case-file.c
index 6c7942f551..fda121605a 100644
--- a/src/ui/gui/psppire-case-file.c
+++ b/src/ui/gui/psppire-case-file.c
@@ -48,7 +48,7 @@ enum  {CASE_CHANGED,
        CASES_DELETED,
        n_SIGNALS};
 
-static guint signal[n_SIGNALS];
+static guint signals [n_SIGNALS];
 
 
 /* --- functions --- */
@@ -92,9 +92,9 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 
   object_class->finalize = psppire_case_file_finalize;
 
-  signal[CASE_CHANGED] =
+  signals [CASE_CHANGED] =
     g_signal_new ("case_changed",
-		  G_TYPE_FROM_CLASS(class),
+		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
 		  0,
 		  NULL, NULL,
@@ -104,9 +104,9 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 		  G_TYPE_INT);
 
 
-  signal[CASE_INSERTED] =
+  signals [CASE_INSERTED] =
     g_signal_new ("case_inserted",
-		  G_TYPE_FROM_CLASS(class),
+		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
 		  0,
 		  NULL, NULL,
@@ -116,9 +116,9 @@ psppire_case_file_class_init (PsppireCaseFileClass *class)
 		  G_TYPE_INT);
 
 
-  signal[CASES_DELETED] =
+  signals [CASES_DELETED] =
     g_signal_new ("cases_deleted",
-		  G_TYPE_FROM_CLASS(class),
+		  G_TYPE_FROM_CLASS (class),
 		  G_SIGNAL_RUN_FIRST,
 		  0,
 		  NULL, NULL,
@@ -134,7 +134,7 @@ psppire_case_file_finalize (GObject *object)
   PsppireCaseFile *cf = PSPPIRE_CASE_FILE (object);
 
   if ( cf->flexifile)
-    casefile_destroy(cf->flexifile);
+    casefile_destroy (cf->flexifile);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -153,65 +153,56 @@ psppire_case_file_init (PsppireCaseFile *cf)
  * Creates a new #PsppireCaseFile.
  */
 PsppireCaseFile*
-psppire_case_file_new (gint val_cnt)
+psppire_case_file_new (void)
 {
   PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
 
-  cf->flexifile = flexifile_create (val_cnt);
+  cf->flexifile = flexifile_create (0);
 
   return cf;
 }
 
 
-/**
- * psppire_case_file_new_from_flexifile:
- * @returns: a new #PsppireCaseFile object
- *
- * Creates a new #PsppireCaseFile from an existing flexifile
- */
-PsppireCaseFile*
-psppire_case_file_new_from_flexifile (struct flexifile *ff)
+void
+psppire_case_file_replace_flexifile (PsppireCaseFile *cf, struct flexifile *ff)
 {
-  PsppireCaseFile *cf = g_object_new (G_TYPE_PSPPIRE_CASE_FILE, NULL);
-
   cf->flexifile = (struct casefile *) ff;
-
-  return cf;
 }
 
 
+
 gboolean
-psppire_case_file_delete_cases(PsppireCaseFile *cf, gint n_cases, gint first)
+psppire_case_file_delete_cases (PsppireCaseFile *cf, gint n_cases, gint first)
 {
   int result;
 
-  g_return_val_if_fail(cf, FALSE);
-  g_return_val_if_fail(cf->flexifile, FALSE);
+  g_return_val_if_fail (cf, FALSE);
+  g_return_val_if_fail (cf->flexifile, FALSE);
 
-  result =  flexifile_delete_cases(FLEXIFILE(cf->flexifile), n_cases,  first);
+  result =  flexifile_delete_cases (FLEXIFILE (cf->flexifile), n_cases,  first);
 
-  g_signal_emit(cf, signal[CASES_DELETED], 0, n_cases, first);
+  g_signal_emit (cf, signals [CASES_DELETED], 0, n_cases, first);
 
   return result;
 }
 
 /* Insert case CC into the case file before POSN */
 gboolean
-psppire_case_file_insert_case(PsppireCaseFile *cf,
+psppire_case_file_insert_case (PsppireCaseFile *cf,
 			      struct ccase *cc,
 			      gint posn)
 {
   bool result ;
 
-  g_return_val_if_fail(cf, FALSE);
-  g_return_val_if_fail(cf->flexifile, FALSE);
+  g_return_val_if_fail (cf, FALSE);
+  g_return_val_if_fail (cf->flexifile, FALSE);
 
-  result = flexifile_insert_case(FLEXIFILE(cf->flexifile), cc, posn);
+  result = flexifile_insert_case (FLEXIFILE (cf->flexifile), cc, posn);
 
   if ( result )
-    g_signal_emit(cf, signal[CASE_INSERTED], 0, posn);
+    g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
   else
-    g_warning("Cannot insert case at position %d\n", posn);
+    g_warning ("Cannot insert case at position %d\n", posn);
 
   return result;
 }
@@ -219,91 +210,91 @@ psppire_case_file_insert_case(PsppireCaseFile *cf,
 
 /* Append a case to the case file */
 gboolean
-psppire_case_file_append_case(PsppireCaseFile *cf,
+psppire_case_file_append_case (PsppireCaseFile *cf,
 			      struct ccase *c)
 {
   bool result ;
   gint posn ;
 
-  g_return_val_if_fail(cf, FALSE);
-  g_return_val_if_fail(cf->flexifile, FALSE);
+  g_return_val_if_fail (cf, FALSE);
+  g_return_val_if_fail (cf->flexifile, FALSE);
 
-  posn = casefile_get_case_cnt(cf->flexifile);
+  posn = casefile_get_case_cnt (cf->flexifile);
 
-  result = casefile_append(cf->flexifile, c);
+  result = casefile_append (cf->flexifile, c);
 
-  g_signal_emit(cf, signal[CASE_INSERTED], 0, posn);
+  g_signal_emit (cf, signals [CASE_INSERTED], 0, posn);
 
   return result;
 }
 
 
 inline gint
-psppire_case_file_get_case_count(const PsppireCaseFile *cf)
+psppire_case_file_get_case_count (const PsppireCaseFile *cf)
 {
-  g_return_val_if_fail(cf, FALSE);
+  g_return_val_if_fail (cf, FALSE);
 
   if ( ! cf->flexifile)
     return 0;
 
-  return casefile_get_case_cnt(cf->flexifile);
+  return casefile_get_case_cnt (cf->flexifile);
 }
 
 /* Return the IDXth value from case CASENUM.
    The return value must not be freed or written to
  */
 const union value *
-psppire_case_file_get_value(const PsppireCaseFile *cf, gint casenum, gint idx)
+psppire_case_file_get_value (const PsppireCaseFile *cf, gint casenum, gint idx)
 {
   const union value *v;
   struct ccase c;
 
-  g_return_val_if_fail(cf, NULL);
-  g_return_val_if_fail(cf->flexifile, NULL);
+  g_return_val_if_fail (cf, NULL);
+  g_return_val_if_fail (cf->flexifile, NULL);
 
-  g_return_val_if_fail(idx < casefile_get_value_cnt(cf->flexifile), NULL);
+  g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), NULL);
 
-  flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &c);
+  flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &c);
 
-  v = case_data_idx(&c, idx);
-  case_destroy(&c);
+  v = case_data_idx (&c, idx);
+  case_destroy (&c);
 
   return v;
 }
 
 void
-psppire_case_file_clear(PsppireCaseFile *cf)
+psppire_case_file_clear (PsppireCaseFile *cf)
 {
-  casefile_destroy(cf->flexifile);
+  casefile_destroy (cf->flexifile);
   cf->flexifile = 0;
-  g_signal_emit(cf, signal[CASES_DELETED], 0, 0, -1);
+  g_signal_emit (cf, signals [CASES_DELETED], 0, 0, -1);
 }
 
 /* Set the IDXth value of case C to SYSMIS/EMPTY */
 gboolean
-psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum, gint idx,
+psppire_case_file_set_value (PsppireCaseFile *cf, gint casenum, gint idx,
 			    union value *v, gint width)
 {
   struct ccase cc ;
   int bytes;
 
-  g_return_val_if_fail(cf, FALSE);
-  g_return_val_if_fail(cf->flexifile, FALSE);
+  g_return_val_if_fail (cf, FALSE);
+  g_return_val_if_fail (cf->flexifile, FALSE);
 
-  g_return_val_if_fail(idx < casefile_get_value_cnt(cf->flexifile), FALSE);
+  g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE);
 
-  if ( ! flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &cc) )
+  if ( ! flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &cc) )
     return FALSE;
 
   if ( width == 0 )
     bytes = MAX_SHORT_STRING;
   else
-    bytes = DIV_RND_UP(width, MAX_SHORT_STRING) * MAX_SHORT_STRING ;
+    bytes = DIV_RND_UP (width, MAX_SHORT_STRING) * MAX_SHORT_STRING ;
 
   /* Cast away const in flagrant abuse of the casefile */
-  memcpy((union value *)case_data_idx(&cc, idx), v, bytes);
+  memcpy ((union value *)case_data_idx (&cc, idx), v, bytes);
 
-  g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum);
+  g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
 
   return TRUE;
 }
@@ -312,32 +303,32 @@ psppire_case_file_set_value(PsppireCaseFile *cf, gint casenum, gint idx,
 
 /* 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, gint casenum, gint idx,
                           struct substring input, const struct fmt_spec *fmt)
 {
   struct ccase cc ;
 
-  g_return_val_if_fail(cf, FALSE);
-  g_return_val_if_fail(cf->flexifile, FALSE);
+  g_return_val_if_fail (cf, FALSE);
+  g_return_val_if_fail (cf->flexifile, FALSE);
 
-  g_return_val_if_fail(idx < casefile_get_value_cnt(cf->flexifile), FALSE);
+  g_return_val_if_fail (idx < casefile_get_value_cnt (cf->flexifile), FALSE);
 
-  if ( ! flexifile_get_case(FLEXIFILE(cf->flexifile), casenum, &cc) )
+  if ( ! flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, &cc) )
     return FALSE;
 
   /* Cast away const in flagrant abuse of the casefile */
   if (!data_in (input, fmt->type, 0, 0,
-                (union value *) case_data_idx(&cc, idx), fmt_var_width (fmt)))
-    g_warning("Cant set value\n");
+                (union value *) case_data_idx (&cc, idx), fmt_var_width (fmt)))
+    g_warning ("Cant set value\n");
 
-  g_signal_emit(cf, signal[CASE_CHANGED], 0, casenum);
+  g_signal_emit (cf, signals [CASE_CHANGED], 0, casenum);
 
   return TRUE;
 }
 
 
 void
-psppire_case_file_sort(PsppireCaseFile *cf, const struct sort_criteria *sc)
+psppire_case_file_sort (PsppireCaseFile *cf, const struct sort_criteria *sc)
 {
   gint c;
 
@@ -346,16 +337,16 @@ psppire_case_file_sort(PsppireCaseFile *cf, const struct sort_criteria *sc)
 
   struct casefile_factory *factory  = flexifile_factory_create ();
 
-  cfile = sort_execute(reader, sc, factory);
+  cfile = sort_execute (reader, sc, factory);
 
-  casefile_destroy(cf->flexifile);
+  casefile_destroy (cf->flexifile);
 
   cf->flexifile = cfile;
 
   /* FIXME: Need to have a signal to change a range of cases, instead of
      calling a signal many times */
-  for ( c = 0 ; c < casefile_get_case_cnt(cf->flexifile) ; ++c )
-    g_signal_emit(cf, signal[CASE_CHANGED], 0, c);
+  for ( c = 0 ; c < casefile_get_case_cnt (cf->flexifile) ; ++c )
+    g_signal_emit (cf, signals [CASE_CHANGED], 0, c);
 
   flexifile_factory_destroy (factory);
 }
@@ -367,16 +358,16 @@ gboolean
 psppire_case_file_insert_values (PsppireCaseFile *cf,
 				 gint n_values, gint before)
 {
-  g_return_val_if_fail(cf, FALSE);
+  g_return_val_if_fail (cf, FALSE);
 
   if ( ! cf->flexifile )
     {
-      cf->flexifile = flexifile_create(n_values);
+      cf->flexifile = flexifile_create (n_values);
 
       return TRUE;
     }
 
-  return flexifile_resize (FLEXIFILE(cf->flexifile), n_values, before);
+  return flexifile_resize (FLEXIFILE (cf->flexifile), n_values, before);
 }
 
 /* Fills C with the CASENUMth case.
@@ -389,5 +380,5 @@ psppire_case_file_get_case (const PsppireCaseFile *cf, gint casenum,
   g_return_val_if_fail (cf, FALSE);
   g_return_val_if_fail (cf->flexifile, FALSE);
 
-  return flexifile_get_case (FLEXIFILE(cf->flexifile), casenum, c);
+  return flexifile_get_case (FLEXIFILE (cf->flexifile), casenum, c);
 }