From 07ce3ff00b57badd88340ad5ca2344f83c49dcb3 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Wed, 28 Mar 2018 15:40:00 +0200
Subject: [PATCH] preparing new MassChroqR spectral count output
---
src/gui/workerthread.cpp | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/gui/workerthread.cpp b/src/gui/workerthread.cpp
index 983193f27..19833b647 100644
--- a/src/gui/workerthread.cpp
+++ b/src/gui/workerthread.cpp
@@ -29,7 +29,7 @@
#include "workerthread.h"
#include <odsstream/odsdocwriter.h>
-#include <odsstream/tsvoutputstream.h>
+#include <odsstream/tsvdirectorywriter.h>
#include <pappsomspp/pappsoexception.h>
#include <QDebug>
#include "../output/masschroqml.h"
@@ -347,23 +347,16 @@ void WorkerThread::doWritingProticFile(QString filename, ProjectSp project_sp) {
}
-void WorkerThread::doWritingMcqrSpectralCountFile(QString filename, ProjectSp project_sp) {
+void WorkerThread::doWritingMcqrSpectralCountFile(QString directory_name, ProjectSp project_sp) {
try {
- emit loadingMessage(tr("Writing %1 spectral count file for MassChroqR").arg(filename));
- QFile outFile;
- outFile.setFileName(filename);
- outFile.open(QIODevice::WriteOnly);
- QTextStream * p_outputStream = new QTextStream(&outFile);
- TsvOutputStream * p_writer = new TsvOutputStream(*p_outputStream);
- p_writer->setNoSheetName(true);
+ emit loadingMessage(tr("Writing spectral count files for MassChroqR in directory %1").arg(directory_name));
+ TsvDirectoryWriter * p_writer = new TsvDirectoryWriter(directory_name);
McqrSpectralCount spectra_sheet(project_sp.get());
spectra_sheet.write(p_writer, _p_work_monitor);
p_writer->close();
delete p_writer;
- delete p_outputStream;
- outFile.close();
emit operationFinished();
}
catch (pappso::PappsoException & error) {
--
GitLab