From 24d3c18f4193201d2cb2da56db45d82908178243 Mon Sep 17 00:00:00 2001
From: Olivier Langella <olivier.langella@u-psud.fr>
Date: Tue, 24 Apr 2018 13:45:37 +0200
Subject: [PATCH] new libodsstream API
---
src/output/ods/comparbasesheet.cpp | 5 ++---
win64/home.cmake | 8 ++++++++
2 files changed, 10 insertions(+), 3 deletions(-)
create mode 100644 win64/home.cmake
diff --git a/src/output/ods/comparbasesheet.cpp b/src/output/ods/comparbasesheet.cpp
index 86717c9f..7f4e19fc 100644
--- a/src/output/ods/comparbasesheet.cpp
+++ b/src/output/ods/comparbasesheet.cpp
@@ -31,7 +31,6 @@
#include <tuple>
#include <pappsomspp/utils.h>
-#include <odsstream/odscolorscale.h>
#include <QDebug>
@@ -114,7 +113,7 @@ void ComparBaseSheet::writeProteinMatch(const ProteinMatch * p_protein_match) {
for (MsRunSp & msrun_sp: _msrun_list) {
writeComparValue(p_protein_match, ValidationState::validAndChecked, msrun_sp.get());
if(_first_cell_coordinate.isEmpty()) {
- _first_cell_coordinate = _p_writer->getCellCoordinate();
+ _first_cell_coordinate = _p_writer->getOdsCellCoordinate();
}
}
@@ -155,7 +154,7 @@ void ComparBaseSheet::writeIdentificationGroup(IdentificationGroup * p_ident) {
}
if (!_first_cell_coordinate.isEmpty()) {
- QString last_cell_coordinate = _p_writer->getCellCoordinate();
+ QString last_cell_coordinate = _p_writer->getOdsCellCoordinate();
qDebug() << __FILE__ << " " << __FUNCTION__ << " " << __LINE__ << " " << _first_cell_coordinate<< " " << last_cell_coordinate;
OdsColorScale color_scale(_first_cell_coordinate, last_cell_coordinate);
_p_writer->addColorScale(color_scale);
diff --git a/win64/home.cmake b/win64/home.cmake
new file mode 100644
index 00000000..751c6687
--- /dev/null
+++ b/win64/home.cmake
@@ -0,0 +1,8 @@
+
+# cd buildwin64
+# cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../win64/home.cmake ..
+
+
+set(ODSSTREAM_QT5_FOUND 1)
+set(ODSSTREAM_INCLUDE_DIR "/home/olivier/eclipse/git/libodsstream/src")
+set(ODSSTREAM_QT5_LIBRARY "/home/olivier/eclipse/git/libodsstream/build/src/libodsstream-qt5.so")
--
GitLab