[Octave-cvsupdate] SF.net SVN: octave:[7937] trunk/octave-forge/extra/dataframe/inst/@ dataframe

[<cde...@us...>]

Revision: 7937
          http://octave.svn.sourceforge.net/octave/?rev=7937&view=rev
Author:   cdemills
Date:     2010-11-22 17:10:33 +0000 (Mon, 22 Nov 2010)

Log Message:
-----------
Display the dataframe src, if any

Modified Paths:
--------------
    trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
    trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-11-22 16:48:27 UTC (rev 7936)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-11-22 17:10:33 UTC (rev 7937)
@@ -158,12 +158,12 @@
 	  dummy = tilde_expand(x);
 	  fid = fopen(dummy);
 	  if fid != -1,
+	    df._src{end+1, 1} = dummy;
 	    dummy = fgetl(fid);
 	    if !strcmp(dummy, UTF8_BOM),
 	      frewind(fid);
 	    endif
 	    in = fscanf(fid, "%c"); %# slurps everything
-	    df._src{end+1, 1} = dummy;
 	  else
 	    in = [];
 	  endif

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m	2010-11-22 16:48:27 UTC (rev 7936)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/display.m	2010-11-22 17:10:33 UTC (rev 7937)
@@ -34,6 +34,12 @@
   head = sprintf("Dataframe with %d rows and %d columns (%d unfolded)", ...
 		 df._cnt);
 endif
+if !isempty(df._src),
+  for indi = 1:size(df._src, 1),
+    head = char(head, ["Src: " df._src{indi, 1}]);
+  endfor
+endif
+
 if all(df._cnt > 0), %# stop for empty df
   vspace = repmat(' ', df._cnt(1), 1);
   indi = 1; %# the real, unfolded index


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