projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logistic Regression Dialog: Reimplement syntax generator using GString
[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..8640beef9bb3e23f3d22565f6459eb3e0249a381 100644
(file)
--- a/
src/ui/gui/psppire-dialog-action-logistic.c
+++ b/
src/ui/gui/psppire-dialog-action-logistic.c
@@
-27,7
+27,6
@@
#include "psppire-dialog.h"
#include "builder-wrapper.h"
#include "psppire-dialog.h"
#include "builder-wrapper.h"
-#include "checkbox-treeview.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
@@
-97,13
+96,19
@@
on_opts_clicked (PsppireDialogActionLogistic *act)
static void
static void
-psppire_dialog_action_logistic_activate (
Gtk
Action *a)
+psppire_dialog_action_logistic_activate (
PsppireDialog
Action *a)
{
PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
GtkWidget *opts_button;
{
PsppireDialogActionLogistic *act = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
GtkWidget *opts_button;
- GtkBuilder *xml = builder_new ("logistic.ui");
+ GHashTable *thing = psppire_dialog_action_get_hash_table (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("logistic.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
pda->dialog = get_widget_assert (xml, "logistic-dialog");
pda->source = get_widget_assert (xml, "dict-view");
pda->dialog = get_widget_assert (xml, "logistic-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@
-135,8
+140,6
@@
psppire_dialog_action_logistic_activate (GtkAction *a)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(act->conf_checkbox), FALSE);
- g_object_unref (xml);
-
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
psppire_dialog_action_set_refresh (pda, refresh);
psppire_dialog_action_set_valid_predicate (pda,
@@
-154,36
+157,37
@@
generate_syntax (PsppireDialogAction *a)
PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
gchar *text = NULL;
PsppireDialogActionLogistic *rd = PSPPIRE_DIALOG_ACTION_LOGISTIC (a);
gchar *text = NULL;
- GString *string = g_string_new ("LOGISTIC REGRESSION ");
-
const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
const gchar *dep = gtk_entry_get_text (GTK_ENTRY (rd->dep_var));
-
g_string_append (string, dep
);
+
GString *strx = g_string_new ("LOGISTIC REGRESSION "
);
- g_string_append (str
ing, " WITH "
);
+ g_string_append (str
x, dep
);
-
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string
);
+
g_string_append (strx, " WITH "
);
-
g_string_append (string, "\n\t/CRITERIA ="
);
+
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, strx
);
- g_string_append_printf (string, " CUT(%g)", rd->cut_point);
- g_string_append_printf (string, " ITERATE(%d)", rd->max_iterations);
+ g_string_append (strx, "\n\t/CRITERIA =");
+
+ g_string_append_printf (strx, " CUT(%g)", rd->cut_point);
+
+ g_string_append_printf (strx, " ITERATE(%d)", rd->max_iterations);
if (rd->conf)
{
if (rd->conf)
{
- g_string_append_printf (str
ing
, "\n\t/PRINT = CI(%g)", rd->conf_level);
+ g_string_append_printf (str
x
, "\n\t/PRINT = CI(%g)", rd->conf_level);
}
if (rd->constant)
}
if (rd->constant)
- g_string_append (str
ing
, "\n\t/NOORIGIN");
+ g_string_append (str
x
, "\n\t/NOORIGIN");
else
else
- g_string_append (str
ing
, "\n\t/ORIGIN");
+ g_string_append (str
x
, "\n\t/ORIGIN");
- g_string_append (str
ing
, ".\n");
+ g_string_append (str
x
, ".\n");
- text = str
ing
->str;
+ text = str
x
->str;
- g_string_free (str
ing
, FALSE);
+ g_string_free (str
x
, FALSE);
return text;
}
return text;
}
@@
-191,9
+195,7
@@
generate_syntax (PsppireDialogAction *a)
static void
psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *class)
{
static void
psppire_dialog_action_logistic_class_init (PsppireDialogActionLogisticClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_logistic_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_logistic_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}