projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make cases simpler, faster, and easier to understand.
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-data-store.h
diff --git
a/src/ui/gui/psppire-data-store.h
b/src/ui/gui/psppire-data-store.h
index b6160651e535666f506b3ab83d5e80c7f4a484b7..5ffd85d68e458137b2b7c2cc25177fc3ce38b42b 100644
(file)
--- a/
src/ui/gui/psppire-data-store.h
+++ b/
src/ui/gui/psppire-data-store.h
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2006 Free Software Foundation
+ Copyright (C) 2006
, 2009
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
@@
-18,7
+18,6
@@
#define __PSPPIRE_DATA_STORE_H__
#include "psppire-dict.h"
#define __PSPPIRE_DATA_STORE_H__
#include "psppire-dict.h"
-#include "psppire-case-file.h"
#define FIRST_CASE_NUMBER 1
#define FIRST_CASE_NUMBER 1
@@
-54,14
+53,6
@@
typedef struct _PsppireDataStoreClass PsppireDataStoreClass;
struct dictionary;
struct dictionary;
-enum cf_signal_handler {
- CASES_DELETED,
- CASE_INSERTED,
- CASE_CHANGED,
- n_cf_signals
-};
-
-
enum dict_signal_handler {
VARIABLE_INSERTED,
VARIABLE_CHANGED,
enum dict_signal_handler {
VARIABLE_INSERTED,
VARIABLE_CHANGED,
@@
-71,6
+62,9
@@
enum dict_signal_handler {
};
};
+struct datasheet;
+struct casereader;
+
struct _PsppireDataStore
{
GObject parent;
struct _PsppireDataStore
{
GObject parent;
@@
-78,14
+72,11
@@
struct _PsppireDataStore
/*< private >*/
gboolean dispose_has_run ;
PsppireDict *dict;
/*< private >*/
gboolean dispose_has_run ;
PsppireDict *dict;
-
PsppireCaseFile *case_file
;
+
struct datasheet *datasheet
;
gboolean show_labels;
gboolean show_labels;
- /* Geometry */
- gint margin_width;
-
- gint cf_handler_id [n_cf_signals];
+ // gint cf_handler_id [n_cf_signals];
gint dict_handler_id [n_dict_signals];
};
gint dict_handler_id [n_dict_signals];
};
@@
-98,8
+89,9
@@
struct _PsppireDataStoreClass
GType psppire_data_store_get_type (void) G_GNUC_CONST;
PsppireDataStore *psppire_data_store_new (PsppireDict *dict);
GType psppire_data_store_get_type (void) G_GNUC_CONST;
PsppireDataStore *psppire_data_store_new (PsppireDict *dict);
-void psppire_data_store_set_case_file (PsppireDataStore *data_store,
- PsppireCaseFile *cf);
+
+void psppire_data_store_set_reader (PsppireDataStore *ds,
+ struct casereader *reader);
void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
PsppireDict *dict);
void psppire_data_store_set_dictionary (PsppireDataStore *data_store,
PsppireDict *dict);
@@
-127,6
+119,15
@@
gboolean psppire_data_store_set_string (PsppireDataStore *ds,
casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
size_t psppire_data_store_get_value_count (const PsppireDataStore *ds);
casenumber psppire_data_store_get_case_count (const PsppireDataStore *ds);
size_t psppire_data_store_get_value_count (const PsppireDataStore *ds);
+
+
\f
+
+struct ccase *psppire_data_store_get_case (const PsppireDataStore *ds,
+ casenumber casenum);
+
+
+
+
G_END_DECLS
#endif /* __PSPPIRE_DATA_STORE_H__ */
G_END_DECLS
#endif /* __PSPPIRE_DATA_STORE_H__ */