Fix rawFile regression

bokic · bokic · commit b72f1700f9f0 · 2017-04-06T03:46:22.000+02:00
diff --git a/analysis/analysisrunner.cpp b/analysis/analysisrunner.cpp
@@ -93,7 +93,8 @@ void AnalysisRunner::run()
     }
     else if (is_fastq(&rawFile))
     {
-        file = &rawFile;
+        rawFile.close();
+        file = new QFile(mFilename);
     }
 
     if (file == nullptr)
@@ -144,7 +145,7 @@ void AnalysisRunner::run()
             // this is critcal and can decrease the speed. Send message only 1 sequence / 1000
             if (mSequenceCount % 1000 == 0)
             {
-                int percentNow = (float)(rawFile.pos()) / fileInfo.size() * 100;
+                int percentNow = qRound(static_cast<qreal>(file->pos()) / fileInfo.size() * 100);
                 // if percentNow is still null, return empty percent ...
                 if ( (percentNow >= mProgression + 5) || (percentNow == 0))
                 {

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,8 @@ void AnalysisRunner::run()`
`93`	`93`	`}`
`94`	`94`	`else if (is_fastq(&rawFile))`
`95`	`95`	`{`
`96`		`- file = &rawFile;`
	`96`	`+ rawFile.close();`
	`97`	`+ file = new QFile(mFilename);`
`97`	`98`	`}`
`98`	`99`
`99`	`100`	`if (file == nullptr)`
`@@ -144,7 +145,7 @@ void AnalysisRunner::run()`
`144`	`145`	`// this is critcal and can decrease the speed. Send message only 1 sequence / 1000`
`145`	`146`	`if (mSequenceCount % 1000 == 0)`
`146`	`147`	`{`
`147`		`- int percentNow = (float)(rawFile.pos()) / fileInfo.size() * 100;`
	`148`	`+ int percentNow = qRound(static_cast<qreal>(file->pos()) / fileInfo.size() * 100);`
`148`	`149`	`// if percentNow is still null, return empty percent ...`
`149`	`150`	`if ( (percentNow >= mProgression + 5) \|\| (percentNow == 0))`
`150`	`151`	`{`