Commit 81dd0a46 authored by Langella Olivier's avatar Langella Olivier
Browse files

colorscale and table split added

parent bf8c88e1
......@@ -31,7 +31,7 @@ configure_file (${CMAKE_SOURCE_DIR}/debian/control.cmake ${CMAKE_SOURCE_DIR}/deb
SET (MASSCHROQ_MAJOR_VERSION 2)
SET (MASSCHROQ_MINOR_VERSION 2)
SET (MASSCHROQ_PATCH_LEVEL 7)
SET (MASSCHROQ_PATCH_LEVEL 8)
SET (MASSCHROQ_VERSION
"${MASSCHROQ_MAJOR_VERSION}.${MASSCHROQ_MINOR_VERSION}.${MASSCHROQ_PATCH_LEVEL}")
SET (MASSCHROQ_LIB_NAME "masschroq")
......
......@@ -34,7 +34,6 @@ Depends: ${shlibs:Depends},
libqt5concurrent5,
libpappsomspp-qt5-0 (= @LIBPAPPSOMSPP_VERSION@),
libodsstream-qt5-0,
libgflags2v5,
librocksdb4.5
Replaces: masschroq (<< 1.5.0)
Conflicts: masschroq (<< 1.5.0)
......
......@@ -116,6 +116,11 @@ void MonitorComparInterfaceOutput::writeQuantifyEnd() {
_p_writer->writeCell(p_msrun->getXmlId());
}
OdsTableSettings settings;
settings.setVerticalSplit(1);
_p_writer->setCurrentOdsTableSettings(settings);
QString start_position;
//write content
for (const QuantiItemBase * qitem : _qitem_list) {
_p_writer->writeLine();
......@@ -131,10 +136,16 @@ void MonitorComparInterfaceOutput::writeQuantifyEnd() {
else {
_p_writer->writeCell(it_msrun->second);
}
if (start_position.isEmpty()) {
start_position = _p_writer->getOdsCellCoordinate();
}
}
}
}
OdsColorScale color_scale(start_position, _p_writer->getOdsCellCoordinate());
_p_writer->addColorScale(color_scale);
_compar_table.clear();
_msrun_list.clear();
_qitem_list.clear();
......
......@@ -76,6 +76,11 @@ void MonitorOdsInterfaceOutput::writeQuantifyBegin(const Quantificator * p_quant
_p_writer->writeSheet(QString("peptides_%1_%2").arg(p_quantificator->getXmlId()).arg(_current_group_id));
OdsTableSettings settings;
settings.setVerticalSplit(1);
_p_writer->setCurrentOdsTableSettings(settings);
_p_writer->setCellAnnotation("quantification XML id");
_p_writer->writeCell("quantification");
_p_writer->setCellAnnotation("group XML id (fraction name)");
......@@ -132,6 +137,10 @@ void MonitorOdsInterfaceOutput::writePeptideList(const std::vector<const Peptide
_p_writer->writeCell("protein_description");
OdsTableSettings settings;
settings.setVerticalSplit(1);
_p_writer->setCurrentOdsTableSettings(settings);
std::vector<std::pair<QString, QString>> prot_pep_ids;
auto itpep = isotope_peptides.begin();
......
......@@ -129,6 +129,7 @@ void AlignedPeakCollectionOnDisk::endMsrunQuantification(const Msrun* p_current_
outstream << (quint32) _tmp_aligned_peak_list.size();
for (AlignedXicPeakSp xic_peak_sp:_tmp_aligned_peak_list) {
xic_peak_sp->serialize(&outstream);
//outstream << *(xic_peak_sp.get());
}
QString key(QString("%1-%2").arg(_p_quanti_item_base->getMzId()).arg(p_current_msrun->getXmlId()));
......
......@@ -67,3 +67,11 @@ bool AlignedXicPeak::unserialize(QDataStream * instream) {
}
return true;
}
QDataStream & operator<< (QDataStream& stream, const AlignedXicPeak& xic_peak) {
xic_peak.serialize(&stream);
}
QDataStream & operator>> (QDataStream& stream, AlignedXicPeak& xic_peak) {
xic_peak.unserialize(&stream);
}
......@@ -40,4 +40,6 @@ public:
bool unserialize(QDataStream * instream);
};
QDataStream & operator<< (QDataStream& stream, const AlignedXicPeak& xic_peak);
QDataStream & operator>> (QDataStream& stream, AlignedXicPeak& xic_peak);
#endif // ALIGNEDXICPEAK_H
......@@ -30,6 +30,7 @@
#include "mcqsession.h"
#include "lib/mcq_error.h"
#include <QDebug>
McqSession McqSession::m_instance=McqSession();
......@@ -38,13 +39,17 @@ McqSession::McqSession()
{
}
rocksdb::DB* McqSession::getRocksDb() {
qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__;
if (m_p_db == nullptr) {
rocksdb::Options options;
options.create_if_missing = true;
rocksdb::Status status =
rocksdb::DB::Open(options, QString("%1/rocksdb").arg(getSessionTmpDirName()).toStdString(), &m_p_db);
assert(status.ok());
if (!status.ok()) {
throw mcqError(QString("error in McqSession::getRocksDb() :\nrocksdb::Status status=%1").arg(status.ToString().c_str()));
}
}
qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__ << " " << m_p_db;
return m_p_db;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment