Mercurial > hg > octave-shane
changeset 13447:c836ec162a2e
Fixed crash when querying matrices.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Thu, 14 Apr 2011 21:47:37 +0200 |
parents | 1728cf96c7c4 |
children | ec0e771cc348 |
files | gui//src/BrowserWidget.cpp gui//src/OctaveLink.cpp gui//src/VariablesDockWidget.cpp |
diffstat | 3 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/gui//src/BrowserWidget.cpp +++ b/gui//src/BrowserWidget.cpp @@ -54,7 +54,7 @@ connect(forwardAction, SIGNAL(triggered()), m_webView, SLOT(forward())); connect(m_webView, SIGNAL(urlChanged(QUrl)), this, SLOT(setUrl(QUrl))); connect(m_urlLineEdit, SIGNAL(returnPressed()), this, SLOT(jumpToWebsite())); - connect(m_webView, SIGNAL(statusBarMessage(QString)), this, SLOT(showMessage(QString))); + //connect(m_webView, SIGNAL(statusBarMessage(QString)), this, SLOT(showMessage(QString))); } void BrowserWidget::setUrl(QUrl url) {
--- a/gui//src/OctaveLink.cpp +++ b/gui//src/OctaveLink.cpp @@ -195,13 +195,11 @@ //************************************************************************* void OctaveLink::retrieveVariables() { - QList<SymbolRecord> currentVariables; + m_variableSymbolTableList.clear(); std::list<SymbolRecord> allVariables = symbol_table::all_variables(); std::list<SymbolRecord>::iterator iterator; for(iterator = allVariables.begin(); iterator != allVariables.end(); iterator++) - currentVariables.append(*iterator); - - m_variableSymbolTableList = currentVariables; + m_variableSymbolTableList.append(*iterator); }
--- a/gui//src/VariablesDockWidget.cpp +++ b/gui//src/VariablesDockWidget.cpp @@ -56,9 +56,9 @@ double scalarValue = symbolRecord.varval().scalar_value(); treeItem->setData(2, 0, QString("%1").arg(scalarValue)); } else if(type == "matrix") { - Matrix matrixValue = symbolRecord.varval().matrix_value(); + // Matrix matrixValue = symbolRecord.varval().matrix_value(); // TODO: Display matrix values. - treeItem->setData(2, 0, QString("{%1 x %2}").arg(matrixValue.rows()).arg(matrixValue.cols())); + //treeItem->setData(2, 0, QString("{%1 x %2}").arg(matrixValue.rows()).arg(matrixValue.cols())); } else { treeItem->setData(2, 0, QString("<Type not recognized>")); }