Mercurial > octave-nkf
changeset 14796:e10d7bcfdd9e gui
Now recognizing more symbol types in workspace view. Fixed bug with file system watcher complaining with new files.
* file-editor-tab.cc: Checking for empty file watcher path list when saving.
* symbol-information.h: Recognizing more types.
| author | Jacob Dawid <jacob.dawid@googlemail.com> |
|---|---|
| date | Thu, 21 Jun 2012 22:30:08 +0200 |
| parents | e3ae0850b105 |
| children | 67c6835e51b6 |
| files | gui/src/m-editor/file-editor-tab.cc gui/src/symbol-information.h |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/m-editor/file-editor-tab.cc Thu Jun 21 21:29:01 2012 +0200 +++ b/gui/src/m-editor/file-editor-tab.cc Thu Jun 21 22:30:08 2012 +0200 @@ -404,7 +404,8 @@ } QStringList watched_files = _file_system_watcher.files(); - _file_system_watcher.removePaths(watched_files); + if (!watched_files.isEmpty ()) + _file_system_watcher.removePaths(watched_files); // open the file for writing QFile file (saveFileName); @@ -427,7 +428,8 @@ _edit_area->setModified (false); // files is save -> not modified file.close(); - _file_system_watcher.addPaths (watched_files); + if (!watched_files.isEmpty ()) + _file_system_watcher.addPaths (watched_files); return true; }
--- a/gui/src/symbol-information.h Thu Jun 21 21:29:01 2012 +0200 +++ b/gui/src/symbol-information.h Thu Jun 21 22:30:08 2012 +0200 @@ -132,12 +132,14 @@ _value = QString ("%1 : %2 : %3").arg (ov.range_value ().base ()) .arg (ov.range_value ().inc ()) .arg (ov.range_value ().limit ()); - else if (ov.is_real_matrix ()) + else if (ov.is_matrix_type()) _value = QString ("%1x%2").arg (ov.rows ()) .arg (ov.columns ()); - else if (ov.is_complex_matrix ()) + else if (ov.is_cell()) _value = QString ("%1x%2").arg (ov.rows ()) .arg (ov.columns ()); + else if (ov.is_bool_type () && !ov.is_matrix_type()) + _value = ov.bool_value () ? "true" : "false"; else _value = QString ("<Type not recognized>");