[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp src/ui/gui/data-editor.c src/ui/gui/data-e...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp src/ui/gui/data-editor.c src/ui/gui/data-e... |
|
Date: |
Wed, 07 Feb 2007 02:12:57 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/02/07 02:12:57
Modified files:
src/ui/gui : data-editor.c data-editor.glade data-sheet.c
missing-val-dialog.c syntax-editor.glade
var-sheet.c
tests/command : npar-binomial.sh npar-chisquare.sh
very-long-strings.sh
Log message:
Addressed some of the issues raised by John McCabe-Dansted when
building
native w32 target.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.glade?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-sheet.c?cvsroot=pspp&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/missing-val-dialog.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.glade?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/var-sheet.c?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/npar-binomial.sh?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/npar-chisquare.sh?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/tests/command/very-long-strings.sh?cvsroot=pspp&r1=1.3&r2=1.4
Patches:
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/ui/gui/data-editor.c 30 Jan 2007 11:22:09 -0000 1.16
+++ src/ui/gui/data-editor.c 7 Feb 2007 02:12:57 -0000 1.17
@@ -135,6 +135,8 @@
vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+ g_assert(vs); /* Traps a possible bug in win32 build */
+
g_signal_connect (vs->dict, "weight-changed",
G_CALLBACK (on_weight_change),
de);
Index: src/ui/gui/data-editor.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.glade,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/ui/gui/data-editor.glade 26 Jan 2007 07:35:04 -0000 1.12
+++ src/ui/gui/data-editor.glade 7 Feb 2007 02:12:57 -0000 1.13
@@ -98,7 +98,6 @@
<property name="label">gtk-quit</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_quit1_activate"/>
</widget>
</child>
</widget>
@@ -256,7 +255,6 @@
<property name="sensitive">False</property>
<property name="label" translatable="yes">Insert
Variable</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_insert_variable"/>
</widget>
</child>
<child>
@@ -265,7 +263,6 @@
<property name="sensitive">False</property>
<property name="label" translatable="yes">Insert
Cases</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_insert_cases"/>
</widget>
</child>
<child>
@@ -274,7 +271,6 @@
<property name="sensitive">False</property>
<property name="label" translatable="yes">Go To
Case</property>
<property name="use_underline">True</property>
- <signal name="activate"
handler="on_go_to_case_activate"/>
</widget>
</child>
<child>
@@ -289,7 +285,6 @@
<property name="sensitive">False</property>
<property name="label" translatable="yes">Sort
Cases</property>
<property name="use_underline">True</property>
- <signal name="activate"
handler="on_sort_cases_activate"/>
</widget>
</child>
<child>
@@ -362,7 +357,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">_Windows</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_Windows_activate"/>
<child>
<widget class="GtkMenu" id="Windows_menu">
<child>
@@ -370,7 +364,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">_Minimise
All Windows</property>
<property name="use_underline">True</property>
- <signal name="activate"
handler="on_minimiseall_activate"/>
</widget>
</child>
</widget>
@@ -396,7 +389,6 @@
<property name="visible">True</property>
<property name="label"
translatable="yes">_About</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_about1_activate"/>
</widget>
</child>
</widget>
@@ -431,7 +423,6 @@
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Save</property>
<property name="stock_id">gtk-save</property>
- <signal name="clicked" handler="on_save1_activate"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -494,7 +485,6 @@
<property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Go To
Case</property>
<property name="stock_id">gtk-jump-to</property>
- <signal name="clicked" handler="on_go_to_case_activate"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -548,7 +538,6 @@
<property name="tooltip" translatable="yes">Insert
Case</property>
<property name="use_underline">True</property>
<property name="stock_id">pspp-insert-case</property>
- <signal name="clicked" handler="on_insert_case_clicked"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -625,7 +614,6 @@
<property name="tooltip" translatable="yes">Value
Labels</property>
<property name="use_underline">True</property>
<property name="stock_id">pspp-value-labels</property>
- <signal name="toggled"
handler="on_togglebutton_value_labels_toggled"/>
</widget>
<packing>
<property name="expand">False</property>
@@ -1307,7 +1295,6 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="on_var_type_cancel_clicked"
object="var_type_dialog"/>
</widget>
<packing>
<property name="position">1</property>
@@ -1537,7 +1524,6 @@
<property name="can_default">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="gtk_widget_hide"
object="val_labs_dialog"/>
</widget>
</child>
<child>
@@ -1547,7 +1533,6 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="gtk_widget_hide"
object="val_labs_dialog"/>
</widget>
<packing>
<property name="position">1</property>
@@ -1844,7 +1829,6 @@
<property name="can_default">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="gtk_widget_hide"
object="val_labs_dialog"/>
</widget>
</child>
<child>
@@ -1854,7 +1838,6 @@
<property name="can_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <signal name="clicked" handler="gtk_widget_hide"
object="val_labs_dialog"/>
</widget>
<packing>
<property name="position">1</property>
Index: src/ui/gui/data-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-sheet.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/ui/gui/data-sheet.c 28 Dec 2006 04:21:08 -0000 1.19
+++ src/ui/gui/data-sheet.c 7 Feb 2007 02:12:57 -0000 1.20
@@ -158,7 +158,7 @@
-GtkWidget*
+G_MODULE_EXPORT GtkWidget*
psppire_data_sheet_create (gchar *widget_name, gchar *string1, gchar *string2,
gint int1, gint int2)
{
Index: src/ui/gui/missing-val-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/missing-val-dialog.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/ui/gui/missing-val-dialog.c 27 Dec 2006 09:04:35 -0000 1.12
+++ src/ui/gui/missing-val-dialog.c 7 Feb 2007 02:12:57 -0000 1.13
@@ -207,6 +207,20 @@
}
+
+/* Callback for when the Missing Value dialog is closed using
+ the window delete button.*/
+static gint
+on_delete (GtkWidget *w, GdkEvent *e, gpointer data)
+{
+ struct missing_val_dialog *dialog = data;
+
+ gtk_widget_hide (dialog->window);
+
+ return TRUE;
+}
+
+
/* Creates the dialog structure from the xml */
struct missing_val_dialog *
missing_val_dialog_create (GladeXML *xml)
@@ -228,6 +242,8 @@
g_signal_connect (get_widget_assert (xml, "missing_val_ok"),
"clicked", G_CALLBACK (missing_val_dialog_accept), dialog);
+ g_signal_connect (GTK_OBJECT (dialog->window), "delete-event",
+ G_CALLBACK (on_delete), dialog);
dialog->mv[0] = get_widget_assert (xml, "mv0");
dialog->mv[1] = get_widget_assert (xml, "mv1");
Index: src/ui/gui/syntax-editor.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/syntax-editor.glade,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/syntax-editor.glade 24 Jan 2007 08:30:22 -0000 1.5
+++ src/ui/gui/syntax-editor.glade 7 Feb 2007 02:12:57 -0000 1.6
@@ -86,7 +86,6 @@
<property name="visible">True</property>
<property name="label"
translatable="yes">_Syntax</property>
<property name="use_underline">True</property>
- <signal name="activate"
handler="on_syntax4_activate" last_modification_time="Tue, 05 Dec 2006 01:43:21
GMT"/>
</widget>
</child>
@@ -233,7 +232,6 @@
<property name="visible">True</property>
<property name="label" translatable="yes">_Windows</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_windows_activate"
last_modification_time="Thu, 28 Dec 2006 00:31:09 GMT"/>
<child>
<widget class="GtkMenu" id="windows_menu">
Index: src/ui/gui/var-sheet.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/var-sheet.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/ui/gui/var-sheet.c 24 Dec 2006 23:50:59 -0000 1.18
+++ src/ui/gui/var-sheet.c 7 Feb 2007 02:12:57 -0000 1.19
@@ -410,7 +410,7 @@
/* Create the var sheet */
-GtkWidget*
+G_MODULE_EXPORT GtkWidget*
psppire_variable_sheet_create (gchar *widget_name,
gchar *string1,
gchar *string2,
Index: tests/command/npar-binomial.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/npar-binomial.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/command/npar-binomial.sh 20 Dec 2006 10:10:51 -0000 1.1
+++ tests/command/npar-binomial.sh 7 Feb 2007 02:12:57 -0000 1.2
@@ -216,9 +216,9 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output 1"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff $TEMPDIR/pspp.list - << EOF
P < 0.5; N1/N2 < 1
-
1.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -227,9 +227,7 @@
| |Group2# 2.00|15| .714| | |
| |Total # |21| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P < 0.5; N1/N2 > 1
-
2.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -238,9 +236,7 @@
| |Group2# 2.00| 6| .462| | |
| |Total # |13| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P < 0.5; N1/N2 = 1
-
3.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -249,9 +245,7 @@
| |Group2# 2.00| 8| .500| | |
| |Total # |16| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P > 0.5; N1/N2 < 1
-
4.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -260,9 +254,7 @@
| |Group2# 2.00|12| .522| | |
| |Total # |23| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P > 0.5; N1/N2 > 1
-
5.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -271,9 +263,7 @@
| |Group2# 2.00| 9| .450| | |
| |Total # |20| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P > 0.5; N1/N2 == 1
-
6.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (1-tailed)|
@@ -282,9 +272,7 @@
| |Group2# 2.00|11| .500| | |
| |Total # |22| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P == 0.5; N1/N2 < 1
-
7.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (2-tailed)|
@@ -293,9 +281,7 @@
| |Group2# 2.00|15| .652| | |
| |Total # |23| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P == 0.5; N1/N2 > 1
-
8.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (2-tailed)|
@@ -304,9 +290,7 @@
| |Group2# 2.00| 6| .333| | |
| |Total # |18| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
P == 0.5; N1/N2 == 1
-
9.1 NPAR TESTS. Binomial Test
+-+------#--------+--+--------------+----------+---------------------+
| | #Category| N|Observed Prop.|Test Prop.|Exact Sig. (2-tailed)|
@@ -315,7 +299,6 @@
| |Group2# 2.00|10| .500| | |
| |Total # |20| 1.00| | |
+-+------#--------+--+--------------+----------+---------------------+
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
Index: tests/command/npar-chisquare.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/npar-chisquare.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tests/command/npar-chisquare.sh 20 Dec 2006 10:10:51 -0000 1.1
+++ tests/command/npar-chisquare.sh 7 Feb 2007 02:12:57 -0000 1.2
@@ -95,6 +95,7 @@
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output 1"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff $TEMPDIR/pspp.list - << EOF
1.1 NPAR TESTS. x
+--------#----------+----------+--------+
@@ -108,7 +109,6 @@
| 5.00# 1| 2.33| -1.33|
|Total # 14| | |
+--------#----------+----------+--------+
-
1.2 NPAR TESTS. y
+--------#----------+----------+--------+
| #Observed N|Expected N|Residual|
@@ -119,7 +119,6 @@
| 4.00# 2| 3.50| -1.50|
|Total # 14| | |
+--------#----------+----------+--------+
-
1.3 NPAR TESTS. Test Statistics
+-----------#-----+-----+
| # x | y |
@@ -128,7 +127,6 @@
|df # 5| 3|
|Asymp. Sig.# .678| .112|
+-----------#-----+-----+
-
2.1 NPAR TESTS. y
+--------#----------+----------+--------+
| #Observed N|Expected N|Residual|
@@ -139,7 +137,6 @@
| 4.00# 2| 3.50| -1.50|
|Total # 14| | |
+--------#----------+----------+--------+
-
2.2 NPAR TESTS. Test Statistics
+-----------#------+
| # y |
@@ -148,7 +145,6 @@
|df # 3|
|Asymp. Sig.# .014|
+-----------#------+
-
3.1 NPAR TESTS. Frequencies
+-----#---------------------------------------#---------------------------------------+
| # x # y
|
@@ -160,7 +156,6 @@
|3 # 4.00| 2| 1.58| .42# 4.00| 2| 1.11|
.89|
|Total# | 10| | # | 7| |
|
+-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
3.2 NPAR TESTS. Test Statistics
+-----------#----+-----+
| # x | y |
@@ -169,7 +164,6 @@
|df # 2| 2|
|Asymp. Sig.#.936| .127|
+-----------#----+-----+
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
@@ -202,6 +196,7 @@
if [ $? -eq 0 ] ; then no_result ; fi
activity="compare errors 2"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/output
diff $TEMPDIR/output - << EOF
error: CHISQUARE test specified 6 expected values, but 4 distinct values were
encountered in variable y.
EOF
@@ -241,6 +236,7 @@
activity="compare output 3"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff $TEMPDIR/pspp.list - <<EOF
1.1 NPAR TESTS. Frequencies
+-----#---------------------------------------#---------------------------------------+
@@ -258,7 +254,6 @@
|8 # 5.00| 1| 1.50| -.50# 5.00| 1| 1.88|
-.88|
|Total# | 12| | # | 15| |
|
+-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
1.2 NPAR TESTS. Test Statistics
+-----------#------+------+
| # x | y |
@@ -267,7 +262,6 @@
|df # 7| 7|
|Asymp. Sig.# .015| .002|
+-----------#------+------+
-
1.3 NPAR TESTS. Descriptive Statistics
+-#--+-----+-----+-----+-----+
| # N| Mean| Std.|Minim|Maxim|
@@ -276,7 +270,6 @@
|x#12|2.467|1.193|1.000|5.000|
|y#15|2.067|1.335|1.000|5.000|
+-#--+-----+-----+-----+-----+
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
@@ -314,6 +307,7 @@
activity="compare output 4"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff $TEMPDIR/pspp.list - <<EOF
1.1 NPAR TESTS. Frequencies
+-----#---------------------------------------#---------------------------------------+
@@ -331,7 +325,6 @@
|8 # 5.00| 1| 1.75| -.75# 5.00| 0| 1.75|
-1.75|
|Total# | 14| | # | 14| |
|
+-----#--------+----------+----------+--------#--------+----------+----------+--------+
-
1.2 NPAR TESTS. Test Statistics
+-----------#------+------+
| # x | y |
@@ -340,7 +333,6 @@
|df # 7| 7|
|Asymp. Sig.# .062| .001|
+-----------#------+------+
-
1.3 NPAR TESTS. Descriptive Statistics
+-#--+-----+-----+-----+-----+
| # N| Mean| Std.|Minim|Maxim|
@@ -349,7 +341,6 @@
|x#14|2.686|1.231|1.000|5.000|
|y#14|1.857|1.099|1.000|4.000|
+-#--+-----+-----+-----+-----+
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
Index: tests/command/very-long-strings.sh
===================================================================
RCS file: /sources/pspp/pspp/tests/command/very-long-strings.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- tests/command/very-long-strings.sh 7 Nov 2006 13:00:00 -0000 1.3
+++ tests/command/very-long-strings.sh 7 Feb 2007 02:12:57 -0000 1.4
@@ -75,6 +75,7 @@
if [ $? -ne 0 ] ; then fail ; fi
activity="compare variable display 0"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff $TEMPDIR/pspp.list - <<EOF
1.1 DISPLAY.
+--------+-------------------------------------------+--------+
@@ -88,12 +89,10 @@
+--------+-------------------------------------------+--------+
|A2000 |Format: A2000 | 4|
+--------+-------------------------------------------+--------+
-
N
A255
A258
A2000
--------
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1.00
a1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
b1BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
c1CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
2.00
a2XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
b2YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY
c2ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ
-
2.1 DISPLAY.
+--------+-------------------------------------------+--------+
|Variable|Description |Position|
@@ -106,11 +105,9 @@
+--------+-------------------------------------------+--------+
|vl2000 |Format: A2000 | 4|
+--------+-------------------------------------------+--------+
-
vl255
vl256
vl1335
vl2000
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
@@ -175,6 +172,7 @@
activity="compare variable display"
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff $TEMPDIR/pspp.list - <<EOF
1.1 DISPLAY.
+--------+-------------------------------------------+--------+
@@ -188,7 +186,6 @@
+--------+-------------------------------------------+--------+
|d |Format: A32767 | 4|
+--------+-------------------------------------------+--------+
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp src/ui/gui/data-editor.c src/ui/gui/data-e...,
John Darrington <=