Added dialog box for quick cluster command

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 9f34620016931078dfd2875d484e72f1df27594e..f21cbe7042cf1fec0a2471ac7d8873f4a2f3573e 100644 (file)
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -18,6 +18,7 @@ UI_FILES = \
        src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
+       src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
        src/ui/gui/oneway.ui \
        src/ui/gui/paired-samples.ui \
@@ -170,6 +171,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/helper.h \
        src/ui/gui/k-related-dialog.c \
        src/ui/gui/k-related-dialog.h \
+       src/ui/gui/k-means-dialog.c \
+       src/ui/gui/k-means-dialog.h \
        src/ui/gui/main.c \
        src/ui/gui/missing-val-dialog.c \
        src/ui/gui/missing-val-dialog.h \

diff --git a/src/ui/gui/data-editor.ui b/src/ui/gui/data-editor.ui
index 52a34131d3793db8d927b5a1178cd318325730bf..5feccaa24e7effc0a68191530ce949dfd9308188 100644 (file)
--- a/src/ui/gui/data-editor.ui
+++ b/src/ui/gui/data-editor.ui
@@ -403,6 +403,12 @@
             <property name="label" translatable="yes">Bivariate _Correlation...</property>
           </object>
         </child>
+        <child>
+          <object class="GtkAction" id="k-means">
+            <property name="name">k-means</property>
+            <property name="label" translatable="yes">_K-Means Cluster...</property>
+          </object>
+        </child>
         <child>
           <object class="GtkAction" id="factor-analysis">
             <property name="name">factor-analysis</property>
@@ -578,6 +584,7 @@
             <menuitem action="oneway-anova"/>
           </menu>
           <menuitem action="correlation"/>
+          <menuitem action="k-means"/>
           <menuitem action="factor-analysis"/>
           <menuitem action="reliability"/>
           <menuitem action="linear-regression"/>

diff --git a/src/ui/gui/k-means-dialog.c b/src/ui/gui/k-means-dialog.c
new file mode 100644 (file)
index 0000000..1de9b74
--- /dev/null
+++ b/src/ui/gui/k-means-dialog.c
@@ -0,0 +1,163 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2011  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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <config.h>
+
+#include "dialog-common.h"
+#include <ui/syntax-gen.h>
+#include <libpspp/str.h>
+
+#include "k-means-dialog.h"
+#include "psppire-selector.h"
+#include "psppire-dictview.h"
+#include "psppire-dialog.h"
+
+#include "psppire-data-window.h"
+#include "psppire-var-view.h"
+
+#include "executor.h"
+#include "helper.h"
+
+#include <gtk/gtk.h>
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
+
+
+struct k_means
+{
+  GtkBuilder *xml;
+  PsppireDict *dict;
+
+  GtkWidget *variables;
+  PsppireDataWindow *de ;
+
+  GtkWidget *entry;
+};
+
+static char * generate_syntax (const struct k_means *rd);
+
+
+static void
+refresh (struct k_means *fd)
+{
+  GtkTreeModel *liststore =
+    gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables));
+  gtk_list_store_clear (GTK_LIST_STORE (liststore));
+
+  gtk_entry_set_text (GTK_ENTRY (fd->entry), "");
+}
+
+
+static gboolean
+dialog_state_valid (gpointer data)
+{
+  struct k_means *fd = data;
+
+  GtkTreeModel *liststore = gtk_tree_view_get_model (GTK_TREE_VIEW (fd->variables));
+
+  if  (gtk_tree_model_iter_n_children (liststore, NULL) < 2)
+    return FALSE;
+
+  if (atoi (gtk_entry_get_text (GTK_ENTRY (fd->entry))) < 2)
+    return FALSE;
+
+  return TRUE;
+}
+
+
+/* Pops up the K_Means dialog box */
+void
+k_means_dialog (PsppireDataWindow *dw)
+{
+  struct k_means fd;
+  gint response;
+
+  PsppireVarStore *vs;
+
+  GtkWidget *dialog ;
+  GtkWidget *source ;
+
+  fd.xml = builder_new ("k-means.ui");
+
+  dialog = get_widget_assert   (fd.xml, "k-means-dialog");
+  source = get_widget_assert   (fd.xml, "dict-view");
+
+  fd.entry = get_widget_assert   (fd.xml, "entry1");
+
+  fd.de = dw;
+
+  g_signal_connect_swapped (dialog, "refresh", G_CALLBACK (refresh),  &fd);
+
+
+  fd.variables = get_widget_assert   (fd.xml, "psppire-var-view1");
+
+  g_object_get (fd.de->data_editor, "var-store", &vs, NULL);
+
+  gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (fd.de));
+
+  g_object_get (vs, "dictionary", &fd.dict, NULL);
+  g_object_set (source, "model", fd.dict, NULL);
+
+  psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog),
+                                     dialog_state_valid, &fd);
+
+  psppire_selector_set_allow (PSPPIRE_SELECTOR (get_widget_assert (fd.xml, "psppire-selector1")),
+                             numeric_only);
+
+  response = psppire_dialog_run (PSPPIRE_DIALOG (dialog));
+
+  switch (response)
+    {
+    case GTK_RESPONSE_OK:
+      g_free (execute_syntax_string (dw, generate_syntax (&fd)));
+      break;
+    case PSPPIRE_RESPONSE_PASTE:
+      g_free (paste_syntax_to_window (generate_syntax (&fd)));
+      break;
+    default:
+      break;
+    }
+
+  g_object_unref (fd.xml);
+}
+
+
+\f
+
+static char *
+generate_syntax (const struct k_means *km)
+{
+  gchar *text;
+
+  GString *string = g_string_new ("QUICK CLUSTER ");
+
+  psppire_var_view_append_names (PSPPIRE_VAR_VIEW (km->variables), 0, string);
+
+  g_string_append_printf (string, "\n\t/CRITERIA=CLUSTERS(%d)",
+                         atoi (gtk_entry_get_text (GTK_ENTRY (km->entry))));
+
+  g_string_append (string, ".\n");
+
+  text = string->str;
+
+  g_string_free (string, FALSE);
+
+  return text;
+}

diff --git a/src/ui/gui/k-means-dialog.h b/src/ui/gui/k-means-dialog.h
new file mode 100644 (file)
index 0000000..522acbc
--- /dev/null
+++ b/src/ui/gui/k-means-dialog.h
@@ -0,0 +1,24 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2011  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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef __K_MEANS_DIALOG_H
+#define __K_MEANS_DIALOG_H
+
+#include "psppire-data-window.h"
+
+void k_means_dialog (PsppireDataWindow * data);
+
+#endif

diff --git a/src/ui/gui/k-means.ui b/src/ui/gui/k-means.ui
new file mode 100644 (file)
index 0000000..53ff489
--- /dev/null
+++ b/src/ui/gui/k-means.ui
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires psppire 0.0 -->
+  <requires lib="gtk+" version="2.16"/>
+  <!-- interface-naming-policy project-wide -->
+  <object class="PsppireDialog" id="k-means-dialog">
+    <property name="title" translatable="yes">K-Means Cluster Analysis</property>
+    <property name="modal">True</property>
+    <property name="orientation">Vertical</property>
+    <child internal-child="hbox">
+      <object class="GtkVBox" id="dialog-hbox1">
+        <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child>
+          <object class="GtkTable" id="table1">
+            <property name="visible">True</property>
+            <property name="n_rows">2</property>
+            <property name="n_columns">3</property>
+            <child>
+              <object class="PsppireSelector" id="psppire-selector1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="border_width">5</property>
+                <property name="source_widget">dict-view</property>
+                <property name="dest_widget">psppire-var-view1</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="right_attach">2</property>
+                <property name="x_options"></property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="PsppireDictView" id="dict-view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="border_width">5</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="bottom_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="scrolledwindow2">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">automatic</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="PsppireVarView" id="psppire-var-view1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="border_width">5</property>
+                    <property name="headers_visible">False</property>
+                    <property name="headers_clickable">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox1">
+                <property name="visible">True</property>
+                <child>
+                  <object class="GtkLabel" id="label1">
+                    <property name="visible">True</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">N_umber of Clusters: </property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">entry1</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkEntry" id="entry1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="invisible_char">&#x25CF;</property>
+                    <property name="width_chars">0</property>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="right_attach">3</property>
+                <property name="top_attach">1</property>
+                <property name="bottom_attach">2</property>
+                <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                <property name="y_options"></property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="PsppireHButtonBox" id="psppire-hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="default">PSPPIRE_BUTTON_GOTO_MASK</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 0ed974e0b3553fc46a3b5baf6cfb2e380a1cb4c8..b009ff90f37de8d744fe576d9521876c28181bb8 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -43,6 +43,7 @@
 #include "ui/gui/goto-case-dialog.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/k-means-dialog.h"
 #include "ui/gui/k-related-dialog.h"
 #include "ui/gui/npar-two-sample-related.h"
 #include "ui/gui/oneway-anova-dialog.h"
@@ -1116,6 +1117,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
  
   connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog));
 
+  connect_action (de, "k-means", G_CALLBACK (k_means_dialog));
+
   connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog));
 
   connect_action (de, "binomial", G_CALLBACK (binomial_dialog));