Redo uitable RowName and ColumnName properties for Matlab Compatibility.

* Table.cc (updateColumnname, updateRowname): Check for empty value in cell
array of names and make corresponding label the empty string "".  When there
are too few names for the number of rows/columns, make the remaining rows/cols
unlabeled ("").

Author: Rik

libgui/graphics/Table.cc

@@ -1013,43 +1013,53 @@ Table::updateColumnname ()
     {
       octave_idx_type n = columnname.numel ();
       Cell cell_value = columnname.cell_value ();
+      octave_idx_type i = 0;
 
-      for (octave_idx_type i = 0; i < n; i++)
+      for (; i < n; i++)
         {
-          octave_value v = cell_value (i);
+          octave_value v = cell_value(i);
           if (v.is_string ())
             l << Utils::fromStdString (v.string_value (true));
           else if (v.is_matrix_type ())
             {
               Matrix data = v.matrix_value ();
 
+              if (data.isempty ())
+                l << "";
               /* Now Matlab does something very strange here:
                * If data is a row or column matrix,
                * then each datapoint is added.
-               * Otherwise, nothing is set.
-               */
-              if (data.rows () > 1 && data.cols () > 1)
+               * Otherwise, nothing is set.  */
+              else if (data.rows () > 1 && data.cols () > 1)
                 l << "";
               else
                 for (octave_idx_type j = 0; j < data.numel (); j++)
                   l << QString::number (data(j));
             }
           else if (v.isnumeric ())
             l << QString::number (v.double_value ());
+          // FIXME: Should this just be an error?  struct or cell at this point.
           else
             l << QString::number (v.double_value ());
         }
+      // Any remaining columns are unlabeled
+      for (; i < m_tableWidget->columnCount (); i++)
+        l << "";
     }
-  else if (columnname.is_matrix_type ())
+  else if (columnname.is_matrix_type () || columnname.is_scalar_type ())
     {
       octave_idx_type n = columnname.numel ();
       Matrix matrix_value = columnname.matrix_value ();
+      octave_idx_type i = 0;
 
-      for (octave_idx_type i = 0; i < n; i++)
+      for (; i < n; i++)
         l << QString::number (matrix_value(i));
+      for (; i < m_tableWidget->columnCount (); i++)
+        l << "";
     }
   else
     {
+      // FIXME: Would it be better to error here when unknown value found?
       for (int i = 0; i < m_tableWidget->columnCount (); i++)
         l << "";
       visible = false;
@@ -1421,43 +1431,53 @@ Table::updateRowname ()
     {
       octave_idx_type n = rowname.numel ();
       Cell cell_value = rowname.cell_value ();
+      octave_idx_type i = 0;
 
-      for (octave_idx_type i = 0; i < n; i++)
+      for (; i < n; i++)
         {
-          octave_value v = cell_value (i);
+          octave_value v = cell_value(i);
           if (v.is_string ())
             l << Utils::fromStdString (v.string_value (true));
           else if (v.is_matrix_type ())
             {
               Matrix data = v.matrix_value ();
 
+              if (data.isempty ())
+                l << "";
               /* Now Matlab does something very strange here:
                * If data is a row or column matrix,
                * then each datapoint is added.
-               * Otherwise, nothing is set.
-               */
-              if (data.rows () > 1 && data.cols () > 1)
+               * Otherwise, nothing is set.  */
+              else if (data.rows () > 1 && data.cols () > 1)
                 l << "";
               else
                 for (octave_idx_type j = 0; j < data.numel (); j++)
                   l << QString::number (data(j));
             }
           else if (v.isnumeric ())
             l << QString::number (v.double_value (true));
+          // FIXME: Should this just be an error?  struct or cell at this point.
           else
             l << QString::number (v.double_value (true));
         }
+      // Any remaining rows are unlabeled
+      for (; i < m_tableWidget->rowCount (); i++)
+        l << "";
     }
-  else if (rowname.is_matrix_type ())
+  else if (rowname.is_matrix_type () || rowname.is_scalar_type ())
     {
       octave_idx_type n = rowname.numel ();
       Matrix matrix_value = rowname.matrix_value ();
+      octave_idx_type i = 0;
 
-      for (octave_idx_type i = 0; i < n; i++)
+      for (; i < n; i++)
         l << QString::number (matrix_value(i));
+      for (; i < m_tableWidget->rowCount (); i++)
+        l << "";
     }
   else
     {
+      // FIXME: Would it be better to error here when unknown value found?
       for (int i = 0; i < m_tableWidget->columnCount (); i++)
         l << "";
       visible = false;