projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-window: Avoid doubled separator in Windows menu.
[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 d93a2f5b0c5e85fd871f7d6a4e6452af119c33d0..85137868c624cc9b854a036015f48dcd4395e417 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-logistic.c
+++ b/
src/ui/gui/psppire-dialog-action-logistic.c
@@
-41,16
+41,6
@@
psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *cla
G_DEFINE_TYPE (PsppireDialogActionLogistic, psppire_dialog_action_logistic, PSPPIRE_TYPE_DIALOG_ACTION);
G_DEFINE_TYPE (PsppireDialogActionLogistic, psppire_dialog_action_logistic, PSPPIRE_TYPE_DIALOG_ACTION);
-static void
-set_sensitivity_from_toggle (GtkToggleButton *togglebutton, gpointer data)
-{
- GtkWidget *w = data;
- gboolean active = gtk_toggle_button_get_active (togglebutton);
-
- gtk_widget_set_sensitive (w, active);
-}
-
-
static gboolean
dialog_state_valid (gpointer data)
{
static gboolean
dialog_state_valid (gpointer data)
{
@@
-163,37
+153,38
@@
generate_syntax (PsppireDialogAction *a)
{
PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
gchar *text = NULL;
{
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)", 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)
{
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)", rd->conf_level);
}
if (rd->constant)
}
if (rd->constant)
-
g_string_append (string
, "\n\t/NOORIGIN");
+
ds_put_cstr (&str
, "\n\t/NOORIGIN");
else
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;
}
return text;
}