Change many %g format specifiers to %.*g with precision DBL_DIG + 1.

[pspp] / src / ui / gui / psppire-dialog-action-logistic.c

diff --git a/src/ui/gui/psppire-dialog-action-logistic.c b/src/ui/gui/psppire-dialog-action-logistic.c
index 0426931e85231e10ee2da445e3c6c5f831be9003..2eec4c6b8118dae9afb37ebbe124d8033a78f966 100644 (file)
--- a/src/ui/gui/psppire-dialog-action-logistic.c
+++ b/src/ui/gui/psppire-dialog-action-logistic.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011, 2012  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2012, 2014  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,6 +20,8 @@
 #include "psppire-dialog-action-logistic.h"
 #include "psppire-value-entry.h"
 
+#include <float.h>
+
 #include "dialog-common.h"
 #include "helper.h"
 #include <ui/syntax-gen.h>
@@ -27,7 +29,6 @@
 
 #include "psppire-dialog.h"
 #include "builder-wrapper.h"
-#include "checkbox-treeview.h"
 #include "psppire-dict.h"
 #include "libpspp/str.h"
 
@@ -153,37 +154,39 @@ generate_syntax (PsppireDialogAction *a)
 {
   PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
   gchar *text = NULL;
+  struct string str;
+  const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
 
-  GString *string = g_string_new ("LOGISTIC REGRESSION ");
+  ds_init_cstr (&str, "LOGISTIC REGRESSION ");
 
-  const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
+  ds_put_cstr (&str, dep);
 
-  g_string_append (string, dep);
+  ds_put_cstr (&str, " WITH ");
 
-  g_string_append (string, " WITH ");
+  psppire_var_view_append_names_str (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, &str);
 
-  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
+  ds_put_cstr (&str, "\n\t/CRITERIA =");
 
-  g_string_append (string, "\n\t/CRITERIA =");
+  syntax_gen_pspp (&str, " CUT(%.*g)", DBL_DIG + 1, rd->cut_point);
 
-  g_string_append_printf (string, " CUT(%g)", rd->cut_point);
-  g_string_append_printf (string, " ITERATE(%d)", rd->max_iterations);
+  syntax_gen_pspp (&str, " ITERATE(%d)", rd->max_iterations);
 
   if (rd->conf)
     {
-      g_string_append_printf (string, "\n\t/PRINT = CI(%g)", rd->conf_level);
+      syntax_gen_pspp (&str, "\n\t/PRINT = CI(%.*g)",
+                       DBL_DIG + 1, rd->conf_level);
     }
 
   if (rd->constant) 
-    g_string_append (string, "\n\t/NOORIGIN");
+    ds_put_cstr (&str, "\n\t/NOORIGIN");
   else
-    g_string_append (string, "\n\t/ORIGIN");
+    ds_put_cstr (&str, "\n\t/ORIGIN");
 
-  g_string_append (string, ".\n");
+  ds_put_cstr (&str, ".\n");
 
-  text = string->str;
+  text = ds_steal_cstr (&str);
 
-  g_string_free (string, FALSE);
+  ds_destroy (&str);
 
   return text;
 }