tempo-plotter Changeset - 06e596e43cde · protofusion repositories

Changeset - 06e596e43cde

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-03-29 17:23:28
hy@ozderya.net

fix issue #15 snapshots not loading completely in some cases

I think this is a buffering issue caused by use of QFile.canReadLine function.
Note that loaded portion of the file was approximately 16k.

1 file changed with 5 insertions and 2 deletions:

src/snapshotmanager.cpp

0 comments (0 inline, 0 general)

src/snapshotmanager.cpp

➞

Show inline comments

@@ @@ -13,24 +13,25 @@ @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
   You should have received a copy of the GNU General Public License
   along with serialplot.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <QTime>
 #include <QMenuBar>
 #include <QKeySequence>
 #include <QFileDialog>
 #include <QFile>
 #include <QTextStream>
 #include <QVector>
 #include <QPointF>
 #include <QIcon>
 #include <QtDebug>
 #include "mainwindow.h"
 #include "snapshotmanager.h"
 SnapshotManager::SnapshotManager(MainWindow* mainWindow,
                                  ChannelManager* channelMan) :
     _menu("&Snapshots"),
     _takeSnapshotAction("&Take Snapshot", this),
@@ @@ -150,35 +151,37 @@ void SnapshotManager::loadSnapshotFromFi @@
         qCritical() << "Couldn't open file: " << fileName;
         qCritical() << file.errorString();
         return;
+    }
     // read first row as headlines and determine number of channels
     auto headLine = QString(file.readLine());
     QStringList channelNames = headLine.split(',');
     unsigned numOfChannels = channelNames.size();
     // read data
     QVector<QVector<QPointF>> data(numOfChannels);
     QTextStream ts(&file);
     QString line;
     unsigned lineNum = 1;
-    while (file.canReadLine())
+    while (ts.readLineInto(&line))
+    {
         // parse line
         auto line = QString(file.readLine());
         auto split = line.split(',');
         if (split.size() != (int) numOfChannels)
+        {
             qCritical() << "Parsing error at line " << lineNum
                         << ": number of columns is not consistent.";
             qCritical() << "Line " << lineNum << ": " << line;
             return;
+        }
         for (unsigned ci = 0; ci < numOfChannels; ci++)
+        {
             // parse column
             bool ok;
             double y = split[ci].toDouble(&ok);
             if (!ok)
+            {
                 qCritical() << "Parsing error at line " << lineNum
                             << ", column " << ci

0 comments (0 inline, 0 general)