diff --git a/src/gui/workerthread.cpp b/src/gui/workerthread.cpp index 983193f27a4614281c75193db82ea42587e4adc8..19833b647509411d75f61d86c549601550522620 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) {