From 6d8e8d0e1dc072d1c8d74becb43b8dbe577bbbd7 Mon Sep 17 00:00:00 2001 From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08> Date: Wed, 2 Jun 2010 11:51:55 +0000 Subject: [PATCH] Removed unused SequenceViewerV2Proxy, fixed bug (conservation coloring) git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2313 5a81b35b-ba03-0410-adc8-b2c5c5119f08 --- modules/gui/pymod/sequence_viewer_proxyV2.hh | 47 ------------------- .../gui/src/sequence/alignment_view_object.cc | 2 +- 2 files changed, 1 insertion(+), 48 deletions(-) delete mode 100644 modules/gui/pymod/sequence_viewer_proxyV2.hh diff --git a/modules/gui/pymod/sequence_viewer_proxyV2.hh b/modules/gui/pymod/sequence_viewer_proxyV2.hh deleted file mode 100644 index 7d7e1f269..000000000 --- a/modules/gui/pymod/sequence_viewer_proxyV2.hh +++ /dev/null @@ -1,47 +0,0 @@ -//------------------------------------------------------------------------------ -// This file is part of the OpenStructure project <www.openstructure.org> -// -// Copyright (C) 2008-2010 by the OpenStructure authors -// -// This library is free software; you can redistribute it and/or modify it under -// the terms of the GNU Lesser General Public License as published by the Free -// Software Foundation; either version 3.0 of the License, or (at your option) -// any later version. -// This library is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -// FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -// details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this library; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -//------------------------------------------------------------------------------ -#ifndef OST_GUI_SEQUENCE_VIEWER_PROXY_V2_HH -#define OST_GUI_SEQUENCE_VIEWER_PROXY_V2_HH - -#include <ost/gui/sequence/sequence_viewer.hh> - -#include "sip_handler.hh" - -namespace ost { namespace gui { - -class SequenceViewerProxyV2 : public SipHandler<SequenceViewerV2> { - -public: - SequenceViewerProxyV2(SequenceViewerV2* seq_viewer=new SequenceViewerV2()): - SipHandler<SequenceViewerV2>(seq_viewer) - { } - - void Show() - { - return Me()->show(); - } - void Hide() - { - return Me()->hide(); - } -}; - -}} - -#endif diff --git a/modules/gui/src/sequence/alignment_view_object.cc b/modules/gui/src/sequence/alignment_view_object.cc index 3217085bf..a0786828c 100644 --- a/modules/gui/src/sequence/alignment_view_object.cc +++ b/modules/gui/src/sequence/alignment_view_object.cc @@ -135,7 +135,7 @@ AlignmentViewObject::AlignmentViewObject(const seq::AlignmentHandle& alignment, QVariant AlignmentViewObject::GetData(int row, int column, int role) { - if(column > 0 && column <= alignment_.GetLength() && this->GetCurrentDisplayMode() == conservation_mode){ + if(column > 0 && this->GetCurrentDisplayMode() == conservation_mode){ if(role == Qt::UserRole+3 ){ if(column -1 < conservation_.size()){ return QVariant(conservation_[column-1]); -- GitLab