# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1337722480 -7200
# Node ID adad007cd018208ed1bf089b547db3a92f3b3679
# Parent  7b607001d5714c6f4dc90b9c9b199fcbb9f37933
Fixed bug with querying wrong matrix dimensions (bug #36421).

* OctaveLink.cpp (octaveValuesAsQString): Now querying for octaveValue.rows() and columns() instead using the matrix_values() dimensions.

diff -r 7b607001d571 -r adad007cd018 gui/src/MainWindow.cpp
--- a/gui/src/MainWindow.cpp	Tue May 22 17:46:45 2012 +0200
+++ b/gui/src/MainWindow.cpp	Tue May 22 23:34:40 2012 +0200
@@ -340,7 +340,6 @@
 
   connect (copyAction, SIGNAL (triggered()), m_terminalView, SLOT(copyClipboard ()));
   connect (pasteAction, SIGNAL (triggered()), m_terminalView, SLOT(pasteClipboard ()));
-
   setWindowTitle ("Octave");
 
   addDockWidget (Qt::LeftDockWidgetArea, m_workspaceView);
diff -r 7b607001d571 -r adad007cd018 gui/src/WorkspaceModel.cpp
--- a/gui/src/WorkspaceModel.cpp	Tue May 22 17:46:45 2012 +0200
+++ b/gui/src/WorkspaceModel.cpp	Tue May 22 23:34:40 2012 +0200
@@ -263,17 +263,17 @@
     }
   else if (octaveValue.is_real_matrix ())
     {
-      return QString ("%1x%2 matrix")
-          .arg (octaveValue.matrix_value ().rows ())
-          .arg (octaveValue.matrix_value ().cols ());
+      return QString ("%1x%2")
+          .arg (octaveValue.rows ())
+          .arg (octaveValue.columns ());
 
       // Convert complex matrix.
     }
   else if (octaveValue.is_complex_matrix ())
     {
-      return QString ("%1x%2 complex matrix")
-          .arg (octaveValue.matrix_value ().rows ())
-          .arg (octaveValue.matrix_value ().cols ());
+      return QString ("%1x%2")
+          .arg (octaveValue.rows ())
+          .arg (octaveValue.columns ());
 
       // If everything else does not fit, we could not recognize the type.
     }
diff -r 7b607001d571 -r adad007cd018 gui/src/backend/OctaveLink.cpp
--- a/gui/src/backend/OctaveLink.cpp	Tue May 22 17:46:45 2012 +0200
+++ b/gui/src/backend/OctaveLink.cpp	Tue May 22 23:34:40 2012 +0200
@@ -16,11 +16,14 @@
  */
 
 #include "OctaveLink.h"
+#include "load-path.h"
+#include <QDir>
 
 int update_hook_impl()
 {
   OctaveLink::instance()->triggerUpdateHistoryModel();
   OctaveLink::instance()->triggerCacheSymbolTable();
+  QDir::setCurrent(load_path::get_command_line_path().c_str());
   return 0;
 }