[rkward-cvs] SF.net SVN: rkward:[4419] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 4419
          http://rkward.svn.sourceforge.net/rkward/?rev=4419&view=rev
Author:   tfry
Date:     2012-11-07 14:40:58 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
There are not illegal values in string matrices

Modified Paths:
--------------
    trunk/rkward/rkward/misc/editlabelsdialog.cpp
    trunk/rkward/rkward/plugin/rkmatrixinput.cpp

Modified: trunk/rkward/rkward/misc/editlabelsdialog.cpp
===================================================================
--- trunk/rkward/rkward/misc/editlabelsdialog.cpp	2012-11-07 12:55:59 UTC (rev 4418)
+++ trunk/rkward/rkward/misc/editlabelsdialog.cpp	2012-11-07 14:40:58 UTC (rev 4419)
@@ -52,6 +52,7 @@
 	setModel (lmodel = new RKVarLevelsTableModel (labels, this));
 	connect (this, SIGNAL (blankSelectionRequest()), this, SLOT (blankSelected()));
 	setRKItemDelegate (new RKItemDelegate (this, lmodel, true));
+	trailing_rows = 1;
 }
 
 RKVarLevelsTable::~RKVarLevelsTable () {

Modified: trunk/rkward/rkward/plugin/rkmatrixinput.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkmatrixinput.cpp	2012-11-07 12:55:59 UTC (rev 4418)
+++ trunk/rkward/rkward/plugin/rkmatrixinput.cpp	2012-11-07 14:40:58 UTC (rev 4419)
@@ -61,6 +61,7 @@
 
 	// Note: string type matrix allows missings, implicitly (treating them as empty strings)
 	allow_missings = xml->getBoolAttribute (element, "allow_missings", false, DL_INFO);
+	if (mode == String) allow_missings = true;
 	allow_user_resize_columns = xml->getBoolAttribute (element, "allow_user_resize_columns", true, DL_INFO);
 	allow_user_resize_rows = xml->getBoolAttribute (element, "allow_user_resize_rows", true, DL_INFO);
 	trailing_rows = allow_user_resize_rows ? 1 : 0;
@@ -338,6 +339,8 @@
 		return false;
 	}
 
+	if (mode == String) return true;
+
 	if (column >= columns.size ()) return (allow_missings || (row_count->intValue () == 0));
 
 	Column &col = columns[column];
@@ -345,7 +348,6 @@
 		return true;
 	} else if (allow_missings && (col.last_valid_row >= (col.storage.size () - 1))) {
 		return true;
-	} else {
 	}
 
 	int row = col.last_valid_row + 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.