projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New function fmt_dollar_template based on pspp-dev discussion.
[pspp]
/
src
/
ui
/
gui
/
psppire-variable.c
diff --git
a/src/ui/gui/psppire-variable.c
b/src/ui/gui/psppire-variable.c
index 0b0c24915081d916a84174a0a9626b0b21d6174c..70c69a7ee768b3bdcbee3cd02a67b287dc31a50d 100644
(file)
--- a/
src/ui/gui/psppire-variable.c
+++ b/
src/ui/gui/psppire-variable.c
@@
-18,6
+18,8
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
+#include <config.h>
+
#include <string.h>
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
@@
-43,7
+45,7
@@
psppire_variable_set_name(struct PsppireVariable *pv, const gchar *text)
if ( !text)
return FALSE;
if ( !text)
return FALSE;
- if ( 0 == strcmp(
pv->v->name
, text))
+ if ( 0 == strcmp(
var_get_name (pv->v)
, text))
return FALSE;
if ( ! psppire_dict_check_name(pv->dict, text, TRUE) )
return FALSE;
if ( ! psppire_dict_check_name(pv->dict, text, TRUE) )
@@
-51,7
+53,7
@@
psppire_variable_set_name(struct PsppireVariable *pv, const gchar *text)
dict_rename_var(pv->dict->dict, pv->v, text);
dict_rename_var(pv->dict->dict, pv->v, text);
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-64,9
+66,9
@@
psppire_variable_set_columns(struct PsppireVariable *pv, gint columns)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
-
pv->v->display_width = columns
;
+
var_set_display_width (pv->v, columns)
;
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-78,10
+80,9
@@
psppire_variable_set_label(struct PsppireVariable *pv, const gchar *label)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
- g_free(pv->v->label);
- pv->v->label = g_strdup(label);
+ var_set_label (pv->v, label);
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-96,8
+97,7
@@
psppire_variable_set_decimals(struct PsppireVariable *pv, gint decimals)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
- fmt = pv->v->write;
-
+ fmt = *var_get_write_format (pv->v);
fmt.d = decimals;
return psppire_variable_set_format(pv, &fmt);
fmt.d = decimals;
return psppire_variable_set_format(pv, &fmt);
@@
-113,21
+113,20
@@
psppire_variable_set_width(struct PsppireVariable *pv, gint width)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
- fmt = pv->v->write;
-
+ fmt = *var_get_write_format (pv->v);
fmt.w = width;
fmt.w = width;
- if (
pv->v->type == ALPHA )
+ if (
var_is_alpha (pv->v))
{
gint old_var_cnt , new_var_cnt ;
{
gint old_var_cnt , new_var_cnt ;
- if (
pv->v->width
== 0 )
+ if (
var_get_width (pv->v)
== 0 )
old_var_cnt = 1;
else
old_var_cnt = 1;
else
- old_var_cnt = DIV_RND_UP(
pv->v->width
, MAX_SHORT_STRING);
+ old_var_cnt = DIV_RND_UP(
var_get_width (pv->v)
, MAX_SHORT_STRING);
new_var_cnt = DIV_RND_UP(width, MAX_SHORT_STRING);
new_var_cnt = DIV_RND_UP(width, MAX_SHORT_STRING);
-
pv->v->width = width
;
+
var_set_width (pv->v, width)
;
psppire_dict_resize_variable(pv->dict, pv,
old_var_cnt, new_var_cnt);
psppire_dict_resize_variable(pv->dict, pv,
old_var_cnt, new_var_cnt);
@@
-146,25
+145,22
@@
psppire_variable_set_type(struct PsppireVariable *pv, int type)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
- pv->v->type = type;
-
- if ( pv->v->width == 0 )
+ if ( var_get_width (pv->v) )
old_var_cnt = 1;
else
old_var_cnt = 1;
else
- old_var_cnt = DIV_RND_UP
(pv->v->width
, MAX_SHORT_STRING);
+ old_var_cnt = DIV_RND_UP
(var_get_width (pv->v)
, MAX_SHORT_STRING);
- if ( type == NUMERIC )
- pv->v->width = 0;
+ var_set_width (pv->v, type == VAR_NUMERIC ? 0 : 1);
- if (
pv->v->width
== 0 )
+ if (
var_get_width (pv->v)
== 0 )
new_var_cnt = 1;
else
new_var_cnt = 1;
else
- new_var_cnt = DIV_RND_UP
(pv->v->width
, MAX_SHORT_STRING);
+ new_var_cnt = DIV_RND_UP
(var_get_width (pv->v)
, MAX_SHORT_STRING);
psppire_dict_resize_variable(pv->dict, pv,
old_var_cnt, new_var_cnt);
psppire_dict_resize_variable(pv->dict, pv,
old_var_cnt, new_var_cnt);
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-178,12
+174,12
@@
psppire_variable_set_format(struct PsppireVariable *pv, struct fmt_spec *fmt)
msg_disable ();
if ( fmt_check_output(fmt)
msg_disable ();
if ( fmt_check_output(fmt)
- && fmt_check_type_compat (fmt,
pv->v->type
)
- && fmt_check_width_compat (fmt,
pv->v->width
))
+ && fmt_check_type_compat (fmt,
var_get_type (pv->v)
)
+ && fmt_check_width_compat (fmt,
var_get_width (pv->v)
))
{
msg_enable ();
{
msg_enable ();
-
pv->v->write = pv->v->print = *fmt
;
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+
var_set_both_formats (pv->v, fmt)
;
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
msg_enable ();
return TRUE;
}
msg_enable ();
@@
-200,10
+196,9
@@
psppire_variable_set_value_labels(const struct PsppireVariable *pv,
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
- val_labs_destroy(pv->v->val_labs);
- pv->v->val_labs = val_labs_copy(vls);
+ var_set_value_labels (pv->v, vls);
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-215,9
+210,9
@@
psppire_variable_set_missing(const struct PsppireVariable *pv,
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
-
mv_copy(&pv->v->miss
, miss);
+
var_set_missing_values (pv->v
, miss);
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-227,9
+222,9
@@
psppire_variable_set_write_spec(const struct PsppireVariable *pv, struct fmt_spe
g_return_val_if_fail(pv, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv, FALSE);
g_return_val_if_fail(pv->v, FALSE);
-
pv->v->write = fmt
;
+
var_set_write_format (pv->v, &fmt)
;
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-239,9
+234,9
@@
psppire_variable_set_print_spec(const struct PsppireVariable *pv, struct fmt_spe
g_return_val_if_fail(pv, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv, FALSE);
g_return_val_if_fail(pv->v, FALSE);
-
pv->v->print = fmt
;
+
var_set_print_format (pv->v, &fmt)
;
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-254,9
+249,9
@@
psppire_variable_set_alignment(struct PsppireVariable *pv, gint align)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
-
pv->v->alignment = align
;
+
var_set_alignment (pv->v, align)
;
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-268,9
+263,9
@@
psppire_variable_set_measure(struct PsppireVariable *pv, gint measure)
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
g_return_val_if_fail(pv->dict, FALSE);
g_return_val_if_fail(pv->v, FALSE);
-
pv->v->measure = measure + 1
;
+
var_set_measure (pv->v, measure + 1)
;
- psppire_dict_var_changed(pv->dict,
pv->v->index
);
+ psppire_dict_var_changed(pv->dict,
var_get_dict_index (pv->v)
);
return TRUE;
}
return TRUE;
}
@@
-281,8
+276,7
@@
psppire_variable_get_write_spec(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
-
- return &pv->v->write;
+ return var_get_write_format (pv->v);
}
}
@@
-292,7
+286,7
@@
psppire_variable_get_name(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
- return
pv->v->name
;
+ return
var_get_name (pv->v)
;
}
}
@@
-302,7
+296,7
@@
psppire_variable_get_columns(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->display_width
;
+ return
var_get_display_width (pv->v)
;
}
}
@@
-313,7
+307,7
@@
psppire_variable_get_label(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
- return
pv->v->label
;
+ return
var_get_label (pv->v)
;
}
}
@@
-323,7
+317,7
@@
psppire_variable_get_missing(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
- return
&pv->v->miss
;
+ return
var_get_missing_values (pv->v)
;
}
}
@@
-333,7
+327,7
@@
psppire_variable_get_value_labels(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
g_return_val_if_fail(pv, NULL);
g_return_val_if_fail(pv->v, NULL);
- return
pv->v->val_labs
;
+ return
var_get_value_labels (pv->v)
;
}
}
@@
-343,7
+337,7
@@
psppire_variable_get_alignment(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->alignment
;
+ return
var_get_alignment (pv->v)
;
}
}
@@
-354,7
+348,7
@@
psppire_variable_get_measure(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->measure
- 1;
+ return
var_get_measure (pv->v)
- 1;
}
gint
}
gint
@@
-363,7
+357,7
@@
psppire_variable_get_type(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->type
;
+ return
var_get_type (pv->v)
;
}
}
@@
-373,7
+367,7
@@
psppire_variable_get_width(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->width
;
+ return
var_get_width (pv->v)
;
}
}
@@
-383,7
+377,7
@@
psppire_variable_get_fv(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->fv
;
+ return
var_get_case_index (pv->v)
;
}
}
@@
-394,6
+388,6
@@
psppire_variable_get_index(const struct PsppireVariable *pv)
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
g_return_val_if_fail(pv, -1);
g_return_val_if_fail(pv->v, -1);
- return
pv->v->index
;
+ return
var_get_dict_index (pv->v)
;
}
}