Showing with 7 additions and 7 deletions.
  1. +6 −6 src/datasources/ascii/asciisource.cpp
  2. +1 −1 src/libkst/object.cpp
12 changes: 6 additions & 6 deletions src/datasources/ascii/asciisource.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ int AsciiSource::readField(double *v, const QString& field, int s, int n)
{
_actualField = field;
if (_emitProgress) {
updateProgress(i18n("Reading field"));
updateProgress(i18n("reading field"));
} else {
emit progress(0, i18n("Reading field: ") + field);
}
Expand Down Expand Up @@ -480,7 +480,7 @@ int AsciiSource::tryReadField(double *v, const QString& field, int s, int n)
_fileBuffer.clear();
}

updateProgress(i18n("Plotting data ..."));
updateProgress(i18n("column read"));

_read_count++;
if (_read_count_max == _read_count)
Expand Down Expand Up @@ -509,24 +509,24 @@ int AsciiSource::parseWindowSinglethreaded(QVector<AsciiFileData>& window, int c
//-------------------------------------------------------------------------------------------
int AsciiSource::parseWindowMultithreaded(QVector<AsciiFileData>& window, int col, double* v, int start, const QString& field)
{
updateProgress(i18n("Reading data ..."));
updateProgress(i18n("reading ..."));
for (int i = 0; i < window.size(); i++) {
if (!window[i].read()) {
return 0;
}
_progress++;
updateProgress(i18n("Reading data ..."));
updateProgress(i18n("reading ..."));
}

updateProgress(i18n("Parsing data ..."));
updateProgress(i18n("parsing ..."));
QFutureSynchronizer<int> readFutures;
foreach (const AsciiFileData& chunk, window) {
QFuture<int> future = QtConcurrent::run(&_reader, &AsciiDataReader::readFieldFromChunk, chunk, col, v, start, field);
readFutures.addFuture(future);
}
readFutures.waitForFinished();
_progress += window.size();
updateProgress(i18n("Parsing data ..."));
updateProgress(i18n("parsing ..."));
int sampleRead = 0;
foreach (const QFuture<int> future, readFutures.futures()) {
sampleRead += future.result();
Expand Down
2 changes: 1 addition & 1 deletion src/libkst/object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ Object::UpdateType Object::objectUpdate(qint64 newSerial) {
}

if (newSerial == Forced) { // register the forced update, but don't do it now.
qDebug()<<"Forced, def";
//qDebug()<<"Forced, def";
_serial = Forced;
return Deferred;
} else if (minInputSerial() < newSerial) { // if an input was forced, this will be true
Expand Down