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

[tfry at users.sourceforge.net]

Revision: 3119
          http://rkward.svn.sourceforge.net/rkward/?rev=3119&view=rev
Author:   tfry
Date:     2010-10-08 20:05:16 +0000 (Fri, 08 Oct 2010)

Log Message:
-----------
Fix vector mode pasting

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/misc/rkspecialactions.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2010-10-08 16:57:07 UTC (rev 3118)
+++ trunk/rkward/ChangeLog	2010-10-08 20:05:16 UTC (rev 3119)
@@ -1,3 +1,4 @@
+- Fixed: "Vector" mode in "Paste special" action did not work correctly
 - Attempt to save workspace on crashes		TODO: detect recovery-file at startup, and offer to load it.
 - Also try to relay SIGABRT and SIGILL to the proper signal handlers
 - Removed the remainder of the PHP scripting backend

Modified: trunk/rkward/rkward/misc/rkspecialactions.cpp
===================================================================
--- trunk/rkward/rkward/misc/rkspecialactions.cpp	2010-10-08 16:57:07 UTC (rev 3118)
+++ trunk/rkward/rkward/misc/rkspecialactions.cpp	2010-10-08 20:05:16 UTC (rev 3119)
@@ -216,18 +216,22 @@
 
 	QString ret;
 	if (dim == DimMatrix) ret.append ("cbind (\n");
+	else ret.append ("c (");	// DimVector
 
 	for (int i = 0; i < matrix.numColumns (); ++i) {
-		if (i != 0) ret.append ("),\n");
-		ret.append ("c(");
+		if (dim == DimMatrix) {
+			if (i != 0) ret.append ("),\n");
+			ret.append ("c(");
+		} else if (i != 0) ret.append (",");
+
 		for (int j = 0; j < matrix.numRows (); ++j) {
 			if (j != 0) ret.append (",");
 			ret.append (prepString (matrix.getText (j, i)));
 		}
-		if (i == (matrix.numColumns () - 1)) ret.append (")\n");
 	}
+	ret.append (")\n");
+	if (dim == DimMatrix) ret.append (")\n");
 
-	if (dim == DimMatrix) ret.append (")\n");
 	return (ret);
 }
 


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