Skip to content
Snippets Groups Projects
Commit e54246e3 authored by Olivier Langella's avatar Olivier Langella
Browse files

protein sheet is OK

parent f0170d1d
No related branches found
No related tags found
No related merge requests found
...@@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5 ...@@ -27,11 +27,11 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Xml_EXECUTABLE_COMPILE_FLAGS} ${Qt5
#sudo apt-get install libpappsomspp-dev #sudo apt-get install libpappsomspp-dev
#FIND_PACKAGE( Pappsomspp REQUIRED ) FIND_PACKAGE( Pappsomspp REQUIRED )
SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp") # SET (PAPPSOMSPP_DIR "/home/olivier/eclipse/git/pappsomspp")
# SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp") # SET (PAPPSOMSPP_DIR "/home/langella/developpement/git/pappsomspp")
SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src") # SET (PAPPSOMSPP_INCLUDE_DIR "${PAPPSOMSPP_DIR}/src")
SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so") # SET (PAPPSOMSPP_QT4_LIBRARY "${PAPPSOMSPP_DIR}/cbuild/src/libpappsomspp-qt4.so")
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules) set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="checkBox_2"> <widget class="QCheckBox" name="protein_checkbox">
<property name="text"> <property name="text">
<string>CheckBox</string> <string>proteins</string>
</property> </property>
</widget> </widget>
</item> </item>
......
...@@ -41,6 +41,10 @@ ExportSpreadsheetDialog::ExportSpreadsheetDialog(QWidget * parent): ...@@ -41,6 +41,10 @@ ExportSpreadsheetDialog::ExportSpreadsheetDialog(QWidget * parent):
if (settings.value("export_ods/simple", "true").toBool()) { if (settings.value("export_ods/simple", "true").toBool()) {
ui->simple_checkbox->setCheckState(Qt::Checked); ui->simple_checkbox->setCheckState(Qt::Checked);
} }
ui->protein_checkbox->setCheckState(Qt::Unchecked);
if (settings.value("export_ods/proteins", "true").toBool()) {
ui->protein_checkbox->setCheckState(Qt::Checked);
}
//param.setFilterCrossSamplePeptideNumber(settings.value("automatic_filter/cross_sample", "true").toBool()); //param.setFilterCrossSamplePeptideNumber(settings.value("automatic_filter/cross_sample", "true").toBool());
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
...@@ -68,3 +72,9 @@ void ExportSpreadsheetDialog::doSimpleProteinPeptideList(bool simple) { ...@@ -68,3 +72,9 @@ void ExportSpreadsheetDialog::doSimpleProteinPeptideList(bool simple) {
QSettings settings; QSettings settings;
settings.setValue("export_ods/simple", QString("%1").arg(simple)); settings.setValue("export_ods/simple", QString("%1").arg(simple));
} }
void ExportSpreadsheetDialog::doProteinList(bool simple) {
QSettings settings;
settings.setValue("export_ods/proteins", QString("%1").arg(simple));
}
...@@ -46,6 +46,7 @@ public: ...@@ -46,6 +46,7 @@ public:
public slots: public slots:
void doSimpleProteinPeptideList(bool simple); void doSimpleProteinPeptideList(bool simple);
void doProteinList(bool simple);
signals: signals:
private: private:
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "odsexport.h" #include "odsexport.h"
#include "simplesheet.h" #include "simplesheet.h"
#include "proteinsheet.h"
#include <QSettings> #include <QSettings>
OdsExport::OdsExport(const Project * project):_p_project(project) { OdsExport::OdsExport(const Project * project):_p_project(project) {
...@@ -39,4 +40,7 @@ void OdsExport::write(CalcWriterInterface * p_writer) { ...@@ -39,4 +40,7 @@ void OdsExport::write(CalcWriterInterface * p_writer) {
if (settings.value("export_ods/simple", "false").toBool()) { if (settings.value("export_ods/simple", "false").toBool()) {
SimpleSheet(p_writer, _p_project); SimpleSheet(p_writer, _p_project);
} }
if (settings.value("export_ods/proteins", "true").toBool()) {
ProteinSheet(p_writer, _p_project);
}
} }
...@@ -82,7 +82,7 @@ void ProteinSheet::writeIdentificationGroup(IdentificationGroup * p_ident) { ...@@ -82,7 +82,7 @@ void ProteinSheet::writeIdentificationGroup(IdentificationGroup * p_ident) {
std::sort(protein_match_list.begin(), protein_match_list.end(), std::sort(protein_match_list.begin(), protein_match_list.end(),
[](const ProteinMatch * a, const ProteinMatch * b) [](const ProteinMatch * a, const ProteinMatch * b)
{ {
return a->getGrpProteinSp().get()->getSubGroupNumber() > b->getGrpProteinSp().get()->getSubGroupNumber(); return a->getGrpProteinSp().get()->getSubGroupNumber() < b->getGrpProteinSp().get()->getSubGroupNumber();
}); });
for (auto & protein_match:protein_match_list) { for (auto & protein_match:protein_match_list) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment