From dffc91a570749c348cb5f1645e66ab551ae8ca9e Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Mon, 17 May 2010 11:29:54 +0000
Subject: [PATCH] New SequenceViewer -colors of first column -fix for copy
behavior
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2263 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/src/sequence/sequence_model.cc | 1 -
modules/gui/src/sequence/sequence_row.cc | 12 +++++++++++-
modules/gui/src/sequence/sequence_table_view.cc | 10 ++++++----
modules/gui/src/sequence/sequence_viewer.cc | 2 +-
4 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/modules/gui/src/sequence/sequence_model.cc b/modules/gui/src/sequence/sequence_model.cc
index a44cf3a95..95264958b 100644
--- a/modules/gui/src/sequence/sequence_model.cc
+++ b/modules/gui/src/sequence/sequence_model.cc
@@ -116,7 +116,6 @@ ViewObject* SequenceModel::GetItem(gfx::EntityP& entity){
const PainterList& SequenceModel::GetPainters(const QModelIndex& index) const{
QPair<int, ViewObject*> pair = this->GetRowWithItem(index);
if(pair.second){
- pair.second->GetRow(pair.first);
return pair.second->GetRow(pair.first)->GetPainters();
}
return empty_list_;
diff --git a/modules/gui/src/sequence/sequence_row.cc b/modules/gui/src/sequence/sequence_row.cc
index 2c33712ac..c1daa1e69 100644
--- a/modules/gui/src/sequence/sequence_row.cc
+++ b/modules/gui/src/sequence/sequence_row.cc
@@ -75,12 +75,22 @@ QVariant SequenceRow::GetData(int column, int role) const
{
if(column<0 || column > sequence_.GetLength())return QVariant();
+ if (role == Qt::ForegroundRole){
+ return QColor(Qt::black);
+ }
+
if(column == 0) {
if (role == Qt::DisplayRole){
return QVariant(this->name_);
}
if (role == Qt::FontRole){
- return QVariant(name_font_);
+ return QVariant(this->name_font_);
+ }
+ if (role == Qt::TextAlignmentRole){
+ return QVariant(Qt::AlignLeft|Qt::AlignVCenter);
+ }
+ if (role==Qt::ToolTipRole){
+ return QVariant(this->name_);
}
}
else if(column > 0) {
diff --git a/modules/gui/src/sequence/sequence_table_view.cc b/modules/gui/src/sequence/sequence_table_view.cc
index 628301d37..9cd77671a 100644
--- a/modules/gui/src/sequence/sequence_table_view.cc
+++ b/modules/gui/src/sequence/sequence_table_view.cc
@@ -68,9 +68,10 @@ SequenceTableView::SequenceTableView(QAbstractItemModel * model)
this->InitStaticRow();
this->InitStaticColumn();
-// this->viewport()->stackUnder(static_row_);
this->InitStaticField();
-// this->viewport()->stackUnder(static_field_);
+ this->viewport()->stackUnder(static_field_);
+ this->viewport()->stackUnder(static_column_);
+ this->viewport()->stackUnder(static_row_);
}
void SequenceTableView::InitStaticColumn()
@@ -82,7 +83,6 @@ void SequenceTableView::InitStaticColumn()
static_column_->verticalHeader()->hide();
static_column_->horizontalHeader()->hide();
- //this->viewport()->stackUnder(static_column_);
static_column_->setSelectionBehavior(SelectRows);
static_column_->setSelectionModel(this->selectionModel());
for(int col=1; col<this->model()->columnCount(); col++){
@@ -95,7 +95,9 @@ void SequenceTableView::InitStaticColumn()
static_column_->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
static_column_->show();
static_column_->setStyleSheet("QTableView { border: 0px;"
- "background-color: #FFFFFF}"
+ "selection-color: #4f4f4f;"
+ "selection-background-color: white;"
+ "background-color: white}"
"QTableView::item{ border: none;"
"padding: 0px; border-width: 0px; margin: 0px;}");
static_column_->setShowGrid(false);
diff --git a/modules/gui/src/sequence/sequence_viewer.cc b/modules/gui/src/sequence/sequence_viewer.cc
index 0b3a99e26..d00a1b07b 100644
--- a/modules/gui/src/sequence/sequence_viewer.cc
+++ b/modules/gui/src/sequence/sequence_viewer.cc
@@ -204,7 +204,7 @@ void SequenceViewerV2::CopyEvent(QKeyEvent* event)
}
bool first_row = true;
- for(int i = 0; i < model_->rowCount(); i++){
+ for(int i = 1; i < model_->rowCount(); i++){
if(rows.contains(i)){
if(!first_row){
clipboard_string.append("\n");
--
GitLab