#include "psppire-dialog.h"
#include "builder-wrapper.h"
-#include "checkbox-treeview.h"
+#include "psppire-checkbox-treeview.h"
#include "psppire-dict.h"
#include "libpspp/str.h"
#define N_(msgid) msgid
-#define REGRESSION_STATS \
- RG (COEFF, N_("Coeff")) \
- RG (R, N_("R")) \
- RG (ANOVA, N_("Anova")) \
- RG (BCOV, N_("Bcov"))
+#define REGRESSION_STATS \
+ RG (COEFF, N_("Coeff"), N_("Show the regression coefficients")) \
+ RG (CI, N_("Conf. Interval"), N_("Show the confidence interval for the regression coefficients")) \
+ RG (R, N_("R"), N_("Show the correlation between observed and predicted values")) \
+ RG (ANOVA, N_("Anova"), N_("Show the analysis of variance table")) \
+ RG (BCOV, N_("Bcov"), N_("Show the variance coefficient matrix"))
+
enum
{
-#define RG(NAME, LABEL) RG_##NAME,
+#define RG(NAME, LABEL, TOOLTIP) RG_##NAME,
REGRESSION_STATS
#undef RG
N_REGRESSION_STATS
enum
{
-#define RG(NAME, LABEL) B_RG_##NAME = 1u << RG_##NAME,
+#define RG(NAME, LABEL, TOOLTIP) B_RG_##NAME = 1u << RG_##NAME,
REGRESSION_STATS
#undef RG
B_RG_STATS_ALL = (1u << N_REGRESSION_STATS) - 1,
static const struct checkbox_entry_item stats[] =
{
-#define RG(NAME, LABEL) {#NAME, LABEL},
+#define RG(NAME, LABEL, TOOLTIP) {#NAME, LABEL, TOOLTIP},
REGRESSION_STATS
#undef RG
};
PsppireDialogActionRegression *act = PSPPIRE_DIALOG_ACTION_REGRESSION (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GtkBuilder *xml = builder_new ("regression.ui");
+ GHashTable *thing = psppire_dialog_action_get_pointer (pda);
+ GtkBuilder *xml = g_hash_table_lookup (thing, a);
+ if (!xml)
+ {
+ xml = builder_new ("regression.ui");
+ g_hash_table_insert (thing, a, xml);
+ }
+
GtkWidget *stat_button = get_widget_assert (xml, "stat-button");
GtkWidget *save_button = get_widget_assert (xml, "save-button");
act->pred_button = get_widget_assert (xml, "pred-button");
act->resid_button = get_widget_assert (xml, "resid-button");
- g_object_unref (xml);
-
- put_checkbox_items_in_treeview (GTK_TREE_VIEW (act->stat_view),
- B_RG_STATS_DEFAULT,
- N_REGRESSION_STATS,
- stats);
+ psppire_checkbox_treeview_populate (PSPPIRE_CHECKBOX_TREEVIEW (act->stat_view),
+ B_RG_STATS_DEFAULT,
+ N_REGRESSION_STATS,
+ stats);
psppire_dialog_action_set_refresh (pda, refresh);
g_string_append (string, "\n\t/VARIABLES=");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->indep_vars), 0, string);
- g_string_append (string, "\n\t/DEPENDENT=\t");
+ g_string_append (string, "\n\t/DEPENDENT=");
psppire_var_view_append_names (PSPPIRE_VAR_VIEW (rd->dep_vars), 0, string);
-
+ g_string_append (string, "\n\t/METHOD=ENTER");
+
selected = 0;
for (i = 0, ok = gtk_tree_model_get_iter_first (model, &iter); ok;
i++, ok = gtk_tree_model_iter_next (model, &iter))
static void
psppire_dialog_action_regression_class_init (PsppireDialogActionRegressionClass *class)
{
- GtkActionClass *action_class = GTK_ACTION_CLASS (class);
-
- action_class->activate = psppire_dialog_action_regression_activate;
+ psppire_dialog_action_set_activation (class, psppire_dialog_action_regression_activate);
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}