From c42f6028ce2e209216a5c6b7449fe8a5e29e5aa1 Mon Sep 17 00:00:00 2001
From: Olivier Langella <Olivier.Langella@moulon.inra.fr>
Date: Sat, 24 Jun 2017 07:02:33 +0200
Subject: [PATCH] monospace font to display protein sequence
---
src/gui/protein_view/protein_detail_view.ui | 13 +++++++++----
src/gui/workerthread.cpp | 2 +-
src/output/ods/odsexport.cpp | 14 +++++++++++++-
src/output/ods/odsexport.h | 3 ++-
4 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/gui/protein_view/protein_detail_view.ui b/src/gui/protein_view/protein_detail_view.ui
index f2bf486b..36e1467f 100644
--- a/src/gui/protein_view/protein_detail_view.ui
+++ b/src/gui/protein_view/protein_detail_view.ui
@@ -121,6 +121,11 @@
</item>
<item>
<widget class="QTextEdit" name="sequenceTextEdit">
+ <property name="font">
+ <font>
+ <family>Bitstream Vera Sans Mono</family>
+ </font>
+ </property>
<property name="lineWrapMode">
<enum>QTextEdit::WidgetWidth</enum>
</property>
@@ -134,14 +139,14 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>cove&rage</string>
+ <string>coverage</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="coverage_label">
<property name="text">
- <string>&0%</string>
+ <string>0%</string>
</property>
</widget>
</item>
@@ -155,7 +160,7 @@
<item row="1" column="1">
<widget class="QLabel" name="mw_label">
<property name="text">
- <string>&1Da</string>
+ <string>1Da</string>
</property>
</widget>
</item>
@@ -185,7 +190,7 @@
<x>0</x>
<y>0</y>
<width>609</width>
- <height>23</height>
+ <height>25</height>
</rect>
</property>
</widget>
diff --git a/src/gui/workerthread.cpp b/src/gui/workerthread.cpp
index 7bc526d6..87c71455 100644
--- a/src/gui/workerthread.cpp
+++ b/src/gui/workerthread.cpp
@@ -219,7 +219,7 @@ void WorkerThread::doWritingOdsFile(QString filename, ProjectSp project_sp) {
emit loadingMessage(tr("writing ODS file, please wait"));
OdsDocWriter writer(filename);
OdsExport export_ods(project_sp.get());
- export_ods.write(&writer);
+ export_ods.write(&writer, _p_work_monitor);
writer.close();
emit operationFinished();
}
diff --git a/src/output/ods/odsexport.cpp b/src/output/ods/odsexport.cpp
index 0aef7f9f..8cfdd5f6 100644
--- a/src/output/ods/odsexport.cpp
+++ b/src/output/ods/odsexport.cpp
@@ -53,7 +53,7 @@ void OdsExport::setEvenOrOddStyle(unsigned int number, CalcWriterInterface * p_w
}
-void OdsExport::write(CalcWriterInterface * p_writer) {
+void OdsExport::write(CalcWriterInterface * p_writer, WorkMonitorInterface * p_monitor) {
QSettings settings;
OdsTableCellStyle style;
@@ -64,42 +64,54 @@ void OdsExport::write(CalcWriterInterface * p_writer) {
InfoSheet(this, p_writer, _p_project);
if (settings.value("export_ods/groups", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing groups"));
GroupingSheet(this, p_writer, _p_project);
}
if (settings.value("export_ods/simple", "false").toBool()) {
SimpleSheet(p_writer, _p_project);
}
if (settings.value("export_ods/proteins", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing proteins"));
ProteinSheet(this, p_writer, _p_project);
}
if (settings.value("export_ods/peptides", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing peptides"));
PeptideSheet(this, p_writer, _p_project);
}
if (settings.value("export_ods/spectra", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing spectra"));
SpectraSheet(this, p_writer, _p_project);
}
if (settings.value("export_ods/peptidepos", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing peptide and positions on proteins"));
PeptidePosSheet(this, p_writer, _p_project);
}
if (settings.value("export_ods/comparspectra", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing spectra comparisons"));
ComparSpectraSheet(this, p_writer, _p_project).writeSheet();
}
if (settings.value("export_ods/comparspecificspectra", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing specific spectra comparisons"));
ComparSpecificSpectraSheet(this, p_writer, _p_project).writeSheet();
}
if (settings.value("export_ods/comparuniquesequence", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing unique sequence comparisons"));
ComparSequenceSheet(this, p_writer, _p_project).writeSheet();
}
if (settings.value("export_ods/comparspecificuniquesequence", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing specific unique sequence comparisons"));
ComparSpecificSequenceSheet(this, p_writer, _p_project).writeSheet();
}
if (settings.value("export_ods/comparpai", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing PAI comparisons"));
ComparPaiSheet(this, p_writer, _p_project).writeSheet();
}
if (settings.value("export_ods/comparempai", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing emPAI comparisons"));
ComparEmpaiSheet(this, p_writer, _p_project).writeSheet();
}
if (settings.value("export_ods/samples", "true").toBool()) {
+ p_monitor->message(QObject::tr("writing samples"));
SampleSheet(this, p_writer, _p_project);
}
}
diff --git a/src/output/ods/odsexport.h b/src/output/ods/odsexport.h
index 8920ae08..52564aa3 100644
--- a/src/output/ods/odsexport.h
+++ b/src/output/ods/odsexport.h
@@ -32,13 +32,14 @@
#include "../../core/project.h"
#include <odsstream/calcwriterinterface.h>
+#include "../../utils/workmonitor.h"
class OdsExport
{
public:
OdsExport(const Project * project);
- void write(CalcWriterInterface * p_writer);
+ void write(CalcWriterInterface * p_writer, WorkMonitorInterface * p_monitor);
void setEvenOrOddStyle(unsigned int number, CalcWriterInterface * p_writer);
--
GitLab