projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve deletion of consecutive variables #55357
[pspp]
/
src
/
ui
/
gui
/
psppire-spreadsheet-model.c
diff --git
a/src/ui/gui/psppire-spreadsheet-model.c
b/src/ui/gui/psppire-spreadsheet-model.c
index 4742cee9c08cc81d1f728c9861836bb1bb5cf5b7..83a82d44fdd772cdf40ab3112288b8a6ae247263 100644
(file)
--- a/
src/ui/gui/psppire-spreadsheet-model.c
+++ b/
src/ui/gui/psppire-spreadsheet-model.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2013 Free Software Foundation
+ Copyright (C) 2013
, 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
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
@@
-14,15
+14,25
@@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
+/* This file implements a GtkTreeModel. It allows GtkComboBox and
+ GtkTreeView to display the names and non-empty cell ranges of the
+ sheets aka "Tables" of spreadsheet files.
+ It doesn't take any notice of the spreadsheet data itself.
+*/
#include <config.h>
#include <glib.h>
#include <config.h>
#include <glib.h>
-#include "psppire-spreadsheet-model.h"
+#include <stdint.h>
+
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+#include "psppire-spreadsheet-model.h"
#include "data/spreadsheet-reader.h"
#include "data/spreadsheet-reader.h"
-#include "data/gnumeric-reader.h"
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
static void psppire_spreadsheet_model_init (PsppireSpreadsheetModel *
spreadsheetModel);
@@
-96,6
+106,7
@@
psppire_spreadsheet_model_set_property (GObject * object,
{
case PROP_SPREADSHEET:
spreadsheetModel->spreadsheet = g_value_get_pointer (value);
{
case PROP_SPREADSHEET:
spreadsheetModel->spreadsheet = g_value_get_pointer (value);
+ spreadsheet_ref (spreadsheetModel->spreadsheet);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@
-107,6
+118,14
@@
psppire_spreadsheet_model_set_property (GObject * object,
static void
psppire_spreadsheet_model_dispose (GObject * object)
{
static void
psppire_spreadsheet_model_dispose (GObject * object)
{
+ PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (object);
+
+ if (!spreadsheetModel->dispose_has_run)
+ {
+ spreadsheet_unref (spreadsheetModel->spreadsheet);
+
+ spreadsheetModel->dispose_has_run = TRUE;
+ }
}
static void
}
static void
@@
-157,18
+176,10
@@
psppire_spreadsheet_model_new (struct spreadsheet *sp)
\f
\f
-
-enum
-{
- COL_SHEET_NAME,
- COL_SHEET_RANGE,
- N_COLS
-};
-
static gint
tree_model_n_columns (GtkTreeModel * model)
{
static gint
tree_model_n_columns (GtkTreeModel * model)
{
- return N_COLS;
+ return
PSPPIRE_SPREADSHEET_MODEL_
N_COLS;
}
static GtkTreeModelFlags
}
static GtkTreeModelFlags
@@
-184,7
+195,7
@@
static GType
tree_model_column_type (GtkTreeModel * model, gint index)
{
g_return_val_if_fail (PSPPIRE_IS_SPREADSHEET_MODEL (model), (GType) 0);
tree_model_column_type (GtkTreeModel * model, gint index)
{
g_return_val_if_fail (PSPPIRE_IS_SPREADSHEET_MODEL (model), (GType) 0);
- g_return_val_if_fail (index < N_COLS, (GType) 0);
+ g_return_val_if_fail (index <
PSPPIRE_SPREADSHEET_MODEL_
N_COLS, (GType) 0);
return G_TYPE_STRING;
}
return G_TYPE_STRING;
}
@@
-210,22
+221,19
@@
tree_model_get_iter (GtkTreeModel * model, GtkTreeIter * iter,
n = indices[0];
iter->stamp = spreadsheetModel->stamp;
n = indices[0];
iter->stamp = spreadsheetModel->stamp;
- iter->user_data = (gpointer) n;
+ iter->user_data = (gpointer)
(intptr_t)
n;
return TRUE;
}
static gboolean
return TRUE;
}
static gboolean
-tree_model_iter_next (GtkTreeModel *
model, GtkTreeIter *
iter)
+tree_model_iter_next (GtkTreeModel *
model, GtkTreeIter *
iter)
{
{
- PsppireSpreadsheetModel *spreadsheetModel =
-
PSPPIRE_SPREADSHEET_MODEL (model
);
+ PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (model);
+
g_assert (iter
);
g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE);
g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, FALSE);
- if (iter == NULL)
- return FALSE;
-
- if ((gint) iter->user_data >= spreadsheetModel->spreadsheet->sheets - 1)
+ if ((intptr_t) iter->user_data >= spreadsheetModel->spreadsheet->n_sheets - 1)
{
iter->user_data = NULL;
iter->stamp = 0;
{
iter->user_data = NULL;
iter->stamp = 0;
@@
-244,31
+252,34
@@
tree_model_get_value (GtkTreeModel * model, GtkTreeIter * iter,
{
PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (model);
{
PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (model);
- g_return_if_fail (column < N_COLS);
+ g_return_if_fail (column <
PSPPIRE_SPREADSHEET_MODEL_
N_COLS);
g_return_if_fail (iter->stamp == spreadsheetModel->stamp);
g_value_init (value, G_TYPE_STRING);
switch (column)
{
g_return_if_fail (iter->stamp == spreadsheetModel->stamp);
g_value_init (value, G_TYPE_STRING);
switch (column)
{
- case
COL_SHEET
_NAME:
+ case
PSPPIRE_SPREADSHEET_MODEL_COL
_NAME:
{
const char *x =
{
const char *x =
- gnumeric_get_sheet_name (spreadsheetModel->spreadsheet,
- (gint) iter->user_data);
+ spreadsheet_get_sheet_name (spreadsheetModel->spreadsheet,
+ (intptr_t) iter->user_data);
+
g_value_set_string (value, x);
}
break;
g_value_set_string (value, x);
}
break;
- case
COL_SHEET
_RANGE:
+ case
PSPPIRE_SPREADSHEET_MODEL_COL
_RANGE:
{
{
- const char *x =
- gnumeric_get_sheet_range (spreadsheetModel->spreadsheet,
- (gint) iter->user_data);
- g_value_set_string (value, x);
+ char *x =
+ spreadsheet_get_sheet_range (spreadsheetModel->spreadsheet,
+ (intptr_t) iter->user_data);
+
+ g_value_set_string (value, x ? x : _("(empty)"));
+ g_free (x);
}
break;
default:
}
break;
default:
- g_error ("%s:%d Invalid column in spreadsheet model",
__FILE__,
- __LINE__);
+ g_error ("%s:%d Invalid column in spreadsheet model",
+
__FILE__,
__LINE__);
break;
}
}
break;
}
}
@@
-283,11
+294,11
@@
tree_model_nth_child (GtkTreeModel * model, GtkTreeIter * iter,
if (parent)
return FALSE;
if (parent)
return FALSE;
- if (n >= spreadsheetModel->spreadsheet->sheets)
+ if (n >= spreadsheetModel->spreadsheet->
n_
sheets)
return FALSE;
iter->stamp = spreadsheetModel->stamp;
return FALSE;
iter->stamp = spreadsheetModel->stamp;
- iter->user_data = (gpointer) n;
+ iter->user_data = (gpointer)
(intptr_t)
n;
return TRUE;
}
return TRUE;
}
@@
-299,13
+310,13
@@
tree_model_n_children (GtkTreeModel * model, GtkTreeIter * iter)
PSPPIRE_SPREADSHEET_MODEL (model);
if (iter == NULL)
PSPPIRE_SPREADSHEET_MODEL (model);
if (iter == NULL)
- return spreadsheetModel->spreadsheet->sheets;
+ return spreadsheetModel->spreadsheet->
n_
sheets;
return 0;
}
static gboolean
return 0;
}
static gboolean
-tree_model_iter_has_child (GtkTreeModel *
tree_model, GtkTreeIter *
iter)
+tree_model_iter_has_child (GtkTreeModel *
tree_model, GtkTreeIter *
iter)
{
return FALSE;
}
{
return FALSE;
}
@@
-316,7
+327,7
@@
tree_model_get_path (GtkTreeModel * model, GtkTreeIter * iter)
PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (model);
GtkTreePath *path;
PsppireSpreadsheetModel *spreadsheetModel =
PSPPIRE_SPREADSHEET_MODEL (model);
GtkTreePath *path;
- gint index = (
gin
t) iter->user_data;
+ gint index = (
intptr_
t) iter->user_data;
g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, NULL);
g_return_val_if_fail (iter->stamp == spreadsheetModel->stamp, NULL);
@@
-328,6
+339,21
@@
tree_model_get_path (GtkTreeModel * model, GtkTreeIter * iter)
}
}
+static gboolean
+tree_model_children (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *parent)
+{
+ PsppireSpreadsheetModel *spreadsheetModel = PSPPIRE_SPREADSHEET_MODEL (model);
+
+ if (parent != NULL)
+ return FALSE;
+
+ iter->stamp = spreadsheetModel->stamp;
+ iter->user_data = 0;
+
+ return TRUE;
+}
+
+
static void
spreadsheet_tree_model_init (GtkTreeModelIface * iface)
static void
spreadsheet_tree_model_init (GtkTreeModelIface * iface)
@@
-339,7
+365,7
@@
spreadsheet_tree_model_init (GtkTreeModelIface * iface)
iface->iter_next = tree_model_iter_next;
iface->get_value = tree_model_get_value;
iface->iter_next = tree_model_iter_next;
iface->get_value = tree_model_get_value;
- iface->iter_children =
NULL
;
+ iface->iter_children =
tree_model_children
;
iface->iter_parent = NULL;
iface->get_path = tree_model_get_path;
iface->iter_parent = NULL;
iface->get_path = tree_model_get_path;