From 0bb0decbac8c1f4aa8e55e66e645d8f992906e9c Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Mon, 7 Jun 2010 10:06:33 +0000
Subject: [PATCH] moved new SequenceViewer to gui/sequence_viewer
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2350 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/pymod/CMakeLists.txt | 2 +-
modules/gui/pymod/export_gosty.cc | 5 +-
..._viewerV2.cc => export_sequence_viewer.cc} | 36 ++++-----
modules/gui/pymod/wrap_gui.cc | 4 +-
modules/gui/src/CMakeLists.txt | 81 +++++++++----------
modules/gui/src/file_loader.cc | 4 +-
modules/gui/src/gosty_app.cc | 12 +--
modules/gui/src/gosty_app.hh | 6 +-
.../align_properties_painter.cc | 0
.../align_properties_painter.hh | 0
.../alignment_view_object.cc | 0
.../alignment_view_object.hh | 0
.../background_painter.cc | 0
.../background_painter.hh | 0
.../{sequence => sequence_viewer}/base_row.cc | 0
.../{sequence => sequence_viewer}/base_row.hh | 0
.../base_view_object.cc | 0
.../base_view_object.hh | 0
.../conservation_painter.cc | 0
.../conservation_painter.hh | 0
.../{sequence => sequence_viewer}/painter.hh | 0
.../secstr_row.cc | 0
.../secstr_row.hh | 0
.../seq_secstr_painter.cc | 0
.../seq_secstr_painter.hh | 0
.../seq_selection_painter.cc | 0
.../seq_selection_painter.hh | 0
.../seq_text_painter.cc | 0
.../seq_text_painter.hh | 0
.../sequence_delegate.cc | 0
.../sequence_delegate.hh | 0
.../sequence_model.cc | 0
.../sequence_model.hh | 0
.../sequence_row.cc | 0
.../sequence_row.hh | 0
.../sequence_search_bar.cc | 0
.../sequence_search_bar.hh | 0
.../sequence_table_view.cc | 0
.../sequence_table_view.hh | 0
.../sequence_view_object.cc | 0
.../sequence_view_object.hh | 0
.../sequence_viewer.cc | 72 ++++++++---------
.../sequence_viewer.hh | 6 +-
.../tick_painter.cc | 0
.../tick_painter.hh | 0
.../title_row.cc | 0
.../title_row.hh | 0
scripts/init.py | 4 +-
48 files changed, 115 insertions(+), 117 deletions(-)
rename modules/gui/pymod/{export_sequence_viewerV2.cc => export_sequence_viewer.cc} (67%)
rename modules/gui/src/{sequence => sequence_viewer}/align_properties_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/align_properties_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/alignment_view_object.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/alignment_view_object.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/background_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/background_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/base_row.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/base_row.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/base_view_object.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/base_view_object.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/conservation_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/conservation_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/secstr_row.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/secstr_row.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/seq_secstr_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/seq_secstr_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/seq_selection_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/seq_selection_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/seq_text_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/seq_text_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_delegate.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_delegate.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_model.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_model.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_row.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_row.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_search_bar.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_search_bar.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_table_view.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_table_view.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_view_object.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_view_object.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_viewer.cc (84%)
rename modules/gui/src/{sequence => sequence_viewer}/sequence_viewer.hh (95%)
rename modules/gui/src/{sequence => sequence_viewer}/tick_painter.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/tick_painter.hh (100%)
rename modules/gui/src/{sequence => sequence_viewer}/title_row.cc (100%)
rename modules/gui/src/{sequence => sequence_viewer}/title_row.hh (100%)
diff --git a/modules/gui/pymod/CMakeLists.txt b/modules/gui/pymod/CMakeLists.txt
index 03d7150c8..dabc1930a 100644
--- a/modules/gui/pymod/CMakeLists.txt
+++ b/modules/gui/pymod/CMakeLists.txt
@@ -8,7 +8,7 @@ set(OST_GUI_PYMOD_SOURCES
export_gosty.cc
export_remote_site_loader.cc
export_scene_win.cc
- export_sequence_viewerV2.cc
+ export_sequence_viewer.cc
export_perspective.cc
export_sip_handler.cc
export_scene_selection.cc
diff --git a/modules/gui/pymod/export_gosty.cc b/modules/gui/pymod/export_gosty.cc
index 1a2216e2a..0f32ef31e 100644
--- a/modules/gui/pymod/export_gosty.cc
+++ b/modules/gui/pymod/export_gosty.cc
@@ -27,7 +27,6 @@ using namespace boost::python;
#include <ost/gui/perspective.hh>
#include <ost/gui/python_shell/python_shell.hh>
#include <ost/gui/scene_win/scene_win.hh>
-#include <ost/gui/sequence_viewer/sequence_viewer.hh>
#include <ost/gui/tools/tool_options_win.hh>
#include "transfer_ownership.hh"
@@ -92,9 +91,9 @@ void export_Gosty()
return_value_policy<reference_existing_object>())
.add_property("scene_win", make_function(&GostyApp::GetSceneWin,
return_value_policy<reference_existing_object>()))
- .def("GetSequenceViewerV2", &GostyApp::GetSequenceViewerV2,
+ .def("GetSequenceViewer", &GostyApp::GetSequenceViewer,
return_value_policy<reference_existing_object>())
- .add_property("seq_viewer_v2", make_function(&GostyApp::GetSequenceViewerV2,
+ .add_property("seq_viewer", make_function(&GostyApp::GetSequenceViewer,
return_value_policy<reference_existing_object>()))
.def("GetToolOptionsWin", &GostyApp::GetToolOptionsWin,
return_value_policy<reference_existing_object>())
diff --git a/modules/gui/pymod/export_sequence_viewerV2.cc b/modules/gui/pymod/export_sequence_viewer.cc
similarity index 67%
rename from modules/gui/pymod/export_sequence_viewerV2.cc
rename to modules/gui/pymod/export_sequence_viewer.cc
index b92feb4ea..32e79ed48 100644
--- a/modules/gui/pymod/export_sequence_viewerV2.cc
+++ b/modules/gui/pymod/export_sequence_viewer.cc
@@ -21,7 +21,7 @@
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
-#include <ost/gui/sequence/sequence_viewer.hh>
+#include <ost/gui/sequence_viewer/sequence_viewer.hh>
#include "sip_handler.hh"
@@ -31,37 +31,37 @@ using namespace ost::gui;
namespace {
-void change_display_mode_a(SequenceViewerV2* seq_viewer, const QString& mode)
+void change_display_mode_a(SequenceViewer* seq_viewer, const QString& mode)
{
seq_viewer->ChangeDisplayMode(mode);
}
-void change_display_mode_b(SequenceViewerV2* seq_viewer, const gfx::EntityP& entity, const QString& mode)
+void change_display_mode_b(SequenceViewer* seq_viewer, const gfx::EntityP& entity, const QString& mode)
{
seq_viewer->ChangeDisplayMode(entity, mode);
}
-void change_display_mode_c(SequenceViewerV2* seq_viewer, const seq::AlignmentHandle& alignment, const QString& mode)
+void change_display_mode_c(SequenceViewer* seq_viewer, const seq::AlignmentHandle& alignment, const QString& mode)
{
seq_viewer->ChangeDisplayMode(alignment, mode);
}
-String get_current_display_mode_a(SequenceViewerV2* seq_viewer)
+String get_current_display_mode_a(SequenceViewer* seq_viewer)
{
return seq_viewer->GetCurrentDisplayMode().toStdString();
}
-String get_current_display_mode_b(SequenceViewerV2* seq_viewer, const gfx::EntityP& entity)
+String get_current_display_mode_b(SequenceViewer* seq_viewer, const gfx::EntityP& entity)
{
return seq_viewer->GetCurrentDisplayMode(entity).toStdString();
}
-String get_current_display_mode_c(SequenceViewerV2* seq_viewer, const seq::AlignmentHandle& alignment)
+String get_current_display_mode_c(SequenceViewer* seq_viewer, const seq::AlignmentHandle& alignment)
{
return seq_viewer->GetCurrentDisplayMode(alignment).toStdString();
}
-std::vector<String> get_display_modes_a(SequenceViewerV2* seq_viewer)
+std::vector<String> get_display_modes_a(SequenceViewer* seq_viewer)
{
std::vector<String> modes;
const QStringList& list = seq_viewer->GetDisplayModes();
@@ -71,7 +71,7 @@ std::vector<String> get_display_modes_a(SequenceViewerV2* seq_viewer)
return modes;
}
-std::vector<String> get_display_modes_b(SequenceViewerV2* seq_viewer, const gfx::EntityP& entity)
+std::vector<String> get_display_modes_b(SequenceViewer* seq_viewer, const gfx::EntityP& entity)
{
std::vector<String> modes;
const QStringList& list = seq_viewer->GetDisplayModes(entity);
@@ -81,7 +81,7 @@ std::vector<String> get_display_modes_b(SequenceViewerV2* seq_viewer, const gfx:
return modes;
}
-std::vector<String> get_display_modes_c(SequenceViewerV2* seq_viewer, const seq::AlignmentHandle& alignment)
+std::vector<String> get_display_modes_c(SequenceViewer* seq_viewer, const seq::AlignmentHandle& alignment)
{
std::vector<String> modes;
const QStringList& list = seq_viewer->GetDisplayModes(alignment);
@@ -94,14 +94,14 @@ std::vector<String> get_display_modes_c(SequenceViewerV2* seq_viewer, const seq:
}
-void export_SequenceViewerV2()
+void export_SequenceViewer()
{
- class_<SequenceViewerV2, boost::noncopyable >("SequenceViewerV2",init<>())
+ class_<SequenceViewer, boost::noncopyable >("SequenceViewer",init<>())
.def(init<bool, optional<QWidget*> >())
- .def("Show", &SequenceViewerV2::show)
- .def("Hide", &SequenceViewerV2::hide)
- .def("AddAlignment", &SequenceViewerV2::AddAlignment)
- .def("RemoveAlignment", &SequenceViewerV2::RemoveAlignment)
+ .def("Show", &SequenceViewer::show)
+ .def("Hide", &SequenceViewer::hide)
+ .def("AddAlignment", &SequenceViewer::AddAlignment)
+ .def("RemoveAlignment", &SequenceViewer::RemoveAlignment)
.def("GetDisplayModes", &get_display_modes_a)
.def("GetDisplayModes", &get_display_modes_b)
.def("GetDisplayModes", &get_display_modes_c)
@@ -111,8 +111,8 @@ void export_SequenceViewerV2()
.def("ChangeDisplayMode",&change_display_mode_a)
.def("ChangeDisplayMode",&change_display_mode_b)
.def("ChangeDisplayMode",&change_display_mode_c)
- .def("GetQObject",&get_py_qobject<SequenceViewerV2>)
- .add_property("qobject", &get_py_qobject<SequenceViewerV2>)
+ .def("GetQObject",&get_py_qobject<SequenceViewer>)
+ .add_property("qobject", &get_py_qobject<SequenceViewer>)
;
}
diff --git a/modules/gui/pymod/wrap_gui.cc b/modules/gui/pymod/wrap_gui.cc
index 542356c51..4034dfe1c 100644
--- a/modules/gui/pymod/wrap_gui.cc
+++ b/modules/gui/pymod/wrap_gui.cc
@@ -32,7 +32,7 @@ void export_GLWin();
void export_Gosty();
void export_PyShell();
void export_SceneWin();
-void export_SequenceViewerV2();
+void export_SequenceViewer();
void export_PanelBar();
void export_Perspective();
void export_SipHandler();
@@ -115,7 +115,7 @@ BOOST_PYTHON_MODULE(_gui)
export_Perspective();
export_SceneWin();
export_SceneSelection();
- export_SequenceViewerV2();
+ export_SequenceViewer();
export_RemoteSiteLoader();
export_FileLoader();
export_Widget();
diff --git a/modules/gui/src/CMakeLists.txt b/modules/gui/src/CMakeLists.txt
index d972cbd0a..085002f1e 100644
--- a/modules/gui/src/CMakeLists.txt
+++ b/modules/gui/src/CMakeLists.txt
@@ -13,7 +13,7 @@ splitter_panel_bar.hh
tabbed_panel_bar.hh
)
-set(OST_GUI_SEQUENCE_VIEW_HEADERS
+set(OST_GUI_SEQUENCE_VIEWER_HEADERS
align_properties_painter.hh
base_row.hh
background_painter.hh
@@ -204,25 +204,25 @@ scene_menu.cc
widget.cc
widget_pool.cc
remote_site_loader.cc
-sequence/align_properties_painter.cc
-sequence/base_row.cc
-sequence/background_painter.cc
-sequence/conservation_painter.cc
-sequence/secstr_row.cc
-sequence/seq_secstr_painter.cc
-sequence/seq_selection_painter.cc
-sequence/seq_text_painter.cc
-sequence/sequence_delegate.cc
-sequence/sequence_model.cc
-sequence/sequence_row.cc
-sequence/sequence_search_bar.cc
-sequence/sequence_table_view.cc
-sequence/sequence_viewer.cc
-sequence/tick_painter.cc
-sequence/title_row.cc
-sequence/alignment_view_object.cc
-sequence/base_view_object.cc
-sequence/sequence_view_object.cc
+sequence_viewer/align_properties_painter.cc
+sequence_viewer/base_row.cc
+sequence_viewer/background_painter.cc
+sequence_viewer/conservation_painter.cc
+sequence_viewer/secstr_row.cc
+sequence_viewer/seq_secstr_painter.cc
+sequence_viewer/seq_selection_painter.cc
+sequence_viewer/seq_text_painter.cc
+sequence_viewer/sequence_delegate.cc
+sequence_viewer/sequence_model.cc
+sequence_viewer/sequence_row.cc
+sequence_viewer/sequence_search_bar.cc
+sequence_viewer/sequence_table_view.cc
+sequence_viewer/sequence_viewer.cc
+sequence_viewer/tick_painter.cc
+sequence_viewer/title_row.cc
+sequence_viewer/alignment_view_object.cc
+sequence_viewer/base_view_object.cc
+sequence_viewer/sequence_view_object.cc
gosty_app.cc
change_process_name.cc
main_area.cc
@@ -334,26 +334,26 @@ scene_selection.hh
widget.hh
widget_geom_handler.hh
widget_pool.hh
-sequence/align_properties_painter.hh
-sequence/background_painter.hh
-sequence/base_row.hh
-sequence/conservation_painter.hh
-sequence/painter.hh
-sequence/secstr_row.hh
-sequence/seq_secstr_painter.hh
-sequence/seq_selection_painter.hh
-sequence/seq_text_painter.hh
-sequence/sequence_delegate.hh
-sequence/sequence_model.hh
-sequence/sequence_row.hh
-sequence/sequence_search_bar.hh
-sequence/sequence_table_view.hh
-sequence/sequence_viewer.hh
-sequence/tick_painter.hh
-sequence/title_row.hh
-sequence/alignment_view_object.hh
-sequence/base_view_object.hh
-sequence/sequence_view_object.hh
+sequence_viewer/align_properties_painter.hh
+sequence_viewer/background_painter.hh
+sequence_viewer/base_row.hh
+sequence_viewer/conservation_painter.hh
+sequence_viewer/painter.hh
+sequence_viewer/secstr_row.hh
+sequence_viewer/seq_secstr_painter.hh
+sequence_viewer/seq_selection_painter.hh
+sequence_viewer/seq_text_painter.hh
+sequence_viewer/sequence_delegate.hh
+sequence_viewer/sequence_model.hh
+sequence_viewer/sequence_row.hh
+sequence_viewer/sequence_search_bar.hh
+sequence_viewer/sequence_table_view.hh
+sequence_viewer/sequence_viewer.hh
+sequence_viewer/tick_painter.hh
+sequence_viewer/title_row.hh
+sequence_viewer/alignment_view_object.hh
+sequence_viewer/base_view_object.hh
+sequence_viewer/sequence_view_object.hh
plot_viewer/plot_axis_base.hh
plot_viewer/plot_data_graphics_item_base.hh
plot_viewer/plot_function_info.hh
@@ -456,7 +456,6 @@ module(NAME gui SOURCES ${OST_GUI_MOCS} ${OST_GUI_SOURCES}
HEADERS ${OST_GUI_TOOLS_HEADERS} IN_DIR tools
${OST_GUI_PLOT_VIEWER_HEADERS} IN_DIR plot_viewer
${OST_GUI_SEQUENCE_VIEWER_HEADERS} IN_DIR sequence_viewer
- ${OST_GUI_SEQUENCE_VIEW_HEADERS} IN_DIR sequence
${OST_GUI_PYTHON_SHELL_HEADERS} IN_DIR python_shell
${OST_GUI_PANEL_BAR_HEADERS} IN_DIR panel_bar
${OST_GUI_SCENE_WIN_HEADERS} IN_DIR scene_win
diff --git a/modules/gui/src/file_loader.cc b/modules/gui/src/file_loader.cc
index 042749828..059f661c3 100644
--- a/modules/gui/src/file_loader.cc
+++ b/modules/gui/src/file_loader.cc
@@ -50,7 +50,7 @@
#include <ost/gui/python_shell/python_interpreter.hh>
#include <ost/gui/main_area.hh>
#include <ost/gui/file_type_dialog.hh>
-#include <ost/gui/sequence/sequence_viewer.hh>
+#include <ost/gui/sequence_viewer/sequence_viewer.hh>
#if OST_IMG_ENABLED
#include <ost/io/img/load_map.hh>
@@ -329,7 +329,7 @@ gfx::GfxObjP FileLoader::TryLoadAlignment(const QString& filename, io::SequenceI
handler->Import(seq_list,filename.toStdString());
seq::AlignmentHandle alignment = seq::AlignmentFromSequenceList(seq_list);
gui::MainArea* main_area = gui::GostyApp::Instance()->GetPerspective()->GetMainArea();
- SequenceViewerV2* viewer = new SequenceViewerV2(true,main_area);
+ SequenceViewer* viewer = new SequenceViewer(true,main_area);
viewer->AddAlignment(alignment);
main_area->AddWidget(filename,viewer);
throw io::IOFileAlreadyLoadedException("Loaded in DataViewer");
diff --git a/modules/gui/src/gosty_app.cc b/modules/gui/src/gosty_app.cc
index 324aee547..dd7cda070 100644
--- a/modules/gui/src/gosty_app.cc
+++ b/modules/gui/src/gosty_app.cc
@@ -46,7 +46,7 @@ GostyApp* GostyApp::app_=NULL;
GostyApp::GostyApp():
py_shell_(NULL), w_py_shell_(NULL), gl_win_(NULL), w_gl_win_(NULL),
- scene_win_(NULL), w_scene_win_(NULL), seq_viewer_v2_(NULL), tool_options_win_(NULL),
+ scene_win_(NULL), w_scene_win_(NULL), seq_viewer_(NULL), tool_options_win_(NULL),
w_tool_options_(NULL), main_(new GostyMainWindow),
perspective_(NULL), external_widgets_(QMap<QString,WidgetGeomHandler *>())
{
@@ -95,13 +95,13 @@ SceneWin* GostyApp::GetSceneWin()
return scene_win_;
}
-SequenceViewerV2* GostyApp::GetSequenceViewerV2()
+SequenceViewer* GostyApp::GetSequenceViewer()
{
- if (seq_viewer_v2_==NULL) {
- seq_viewer_v2_=new SequenceViewerV2(false);
- seq_viewer_v2_->SetDestroyOnClose(false);
+ if (seq_viewer_==NULL) {
+ seq_viewer_=new SequenceViewer(false);
+ seq_viewer_->SetDestroyOnClose(false);
}
- return seq_viewer_v2_;
+ return seq_viewer_;
}
#if OST_IMG_ENABLED
diff --git a/modules/gui/src/gosty_app.hh b/modules/gui/src/gosty_app.hh
index e3f3a1f08..f9ce1d851 100644
--- a/modules/gui/src/gosty_app.hh
+++ b/modules/gui/src/gosty_app.hh
@@ -30,7 +30,7 @@
#include <ost/config.hh>
#include <ost/gui/module_config.hh>
#include <ost/gui/scene_win/scene_win.hh>
-#include <ost/gui/sequence/sequence_viewer.hh>
+#include <ost/gui/sequence_viewer/sequence_viewer.hh>
#include <ost/gui/main.hh>
#include <ost/gui/widget_geom_handler.hh>
#if OST_IMG_ENABLED
@@ -91,7 +91,7 @@ public:
///
/// The sequence viewer is initialized when this method is first called. All
/// subsequent calls will return the same SequenceViewer instance.
- SequenceViewerV2* GetSequenceViewerV2();
+ SequenceViewer* GetSequenceViewer();
/// \brief get tool options window
///
@@ -154,7 +154,7 @@ private:
SceneWin* scene_win_;
QWidget* w_scene_win_;
- SequenceViewerV2* seq_viewer_v2_;
+ SequenceViewer* seq_viewer_;
ToolOptionsWin* tool_options_win_;
QWidget* w_tool_options_;
diff --git a/modules/gui/src/sequence/align_properties_painter.cc b/modules/gui/src/sequence_viewer/align_properties_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/align_properties_painter.cc
rename to modules/gui/src/sequence_viewer/align_properties_painter.cc
diff --git a/modules/gui/src/sequence/align_properties_painter.hh b/modules/gui/src/sequence_viewer/align_properties_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/align_properties_painter.hh
rename to modules/gui/src/sequence_viewer/align_properties_painter.hh
diff --git a/modules/gui/src/sequence/alignment_view_object.cc b/modules/gui/src/sequence_viewer/alignment_view_object.cc
similarity index 100%
rename from modules/gui/src/sequence/alignment_view_object.cc
rename to modules/gui/src/sequence_viewer/alignment_view_object.cc
diff --git a/modules/gui/src/sequence/alignment_view_object.hh b/modules/gui/src/sequence_viewer/alignment_view_object.hh
similarity index 100%
rename from modules/gui/src/sequence/alignment_view_object.hh
rename to modules/gui/src/sequence_viewer/alignment_view_object.hh
diff --git a/modules/gui/src/sequence/background_painter.cc b/modules/gui/src/sequence_viewer/background_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/background_painter.cc
rename to modules/gui/src/sequence_viewer/background_painter.cc
diff --git a/modules/gui/src/sequence/background_painter.hh b/modules/gui/src/sequence_viewer/background_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/background_painter.hh
rename to modules/gui/src/sequence_viewer/background_painter.hh
diff --git a/modules/gui/src/sequence/base_row.cc b/modules/gui/src/sequence_viewer/base_row.cc
similarity index 100%
rename from modules/gui/src/sequence/base_row.cc
rename to modules/gui/src/sequence_viewer/base_row.cc
diff --git a/modules/gui/src/sequence/base_row.hh b/modules/gui/src/sequence_viewer/base_row.hh
similarity index 100%
rename from modules/gui/src/sequence/base_row.hh
rename to modules/gui/src/sequence_viewer/base_row.hh
diff --git a/modules/gui/src/sequence/base_view_object.cc b/modules/gui/src/sequence_viewer/base_view_object.cc
similarity index 100%
rename from modules/gui/src/sequence/base_view_object.cc
rename to modules/gui/src/sequence_viewer/base_view_object.cc
diff --git a/modules/gui/src/sequence/base_view_object.hh b/modules/gui/src/sequence_viewer/base_view_object.hh
similarity index 100%
rename from modules/gui/src/sequence/base_view_object.hh
rename to modules/gui/src/sequence_viewer/base_view_object.hh
diff --git a/modules/gui/src/sequence/conservation_painter.cc b/modules/gui/src/sequence_viewer/conservation_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/conservation_painter.cc
rename to modules/gui/src/sequence_viewer/conservation_painter.cc
diff --git a/modules/gui/src/sequence/conservation_painter.hh b/modules/gui/src/sequence_viewer/conservation_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/conservation_painter.hh
rename to modules/gui/src/sequence_viewer/conservation_painter.hh
diff --git a/modules/gui/src/sequence/painter.hh b/modules/gui/src/sequence_viewer/painter.hh
similarity index 100%
rename from modules/gui/src/sequence/painter.hh
rename to modules/gui/src/sequence_viewer/painter.hh
diff --git a/modules/gui/src/sequence/secstr_row.cc b/modules/gui/src/sequence_viewer/secstr_row.cc
similarity index 100%
rename from modules/gui/src/sequence/secstr_row.cc
rename to modules/gui/src/sequence_viewer/secstr_row.cc
diff --git a/modules/gui/src/sequence/secstr_row.hh b/modules/gui/src/sequence_viewer/secstr_row.hh
similarity index 100%
rename from modules/gui/src/sequence/secstr_row.hh
rename to modules/gui/src/sequence_viewer/secstr_row.hh
diff --git a/modules/gui/src/sequence/seq_secstr_painter.cc b/modules/gui/src/sequence_viewer/seq_secstr_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/seq_secstr_painter.cc
rename to modules/gui/src/sequence_viewer/seq_secstr_painter.cc
diff --git a/modules/gui/src/sequence/seq_secstr_painter.hh b/modules/gui/src/sequence_viewer/seq_secstr_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/seq_secstr_painter.hh
rename to modules/gui/src/sequence_viewer/seq_secstr_painter.hh
diff --git a/modules/gui/src/sequence/seq_selection_painter.cc b/modules/gui/src/sequence_viewer/seq_selection_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/seq_selection_painter.cc
rename to modules/gui/src/sequence_viewer/seq_selection_painter.cc
diff --git a/modules/gui/src/sequence/seq_selection_painter.hh b/modules/gui/src/sequence_viewer/seq_selection_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/seq_selection_painter.hh
rename to modules/gui/src/sequence_viewer/seq_selection_painter.hh
diff --git a/modules/gui/src/sequence/seq_text_painter.cc b/modules/gui/src/sequence_viewer/seq_text_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/seq_text_painter.cc
rename to modules/gui/src/sequence_viewer/seq_text_painter.cc
diff --git a/modules/gui/src/sequence/seq_text_painter.hh b/modules/gui/src/sequence_viewer/seq_text_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/seq_text_painter.hh
rename to modules/gui/src/sequence_viewer/seq_text_painter.hh
diff --git a/modules/gui/src/sequence/sequence_delegate.cc b/modules/gui/src/sequence_viewer/sequence_delegate.cc
similarity index 100%
rename from modules/gui/src/sequence/sequence_delegate.cc
rename to modules/gui/src/sequence_viewer/sequence_delegate.cc
diff --git a/modules/gui/src/sequence/sequence_delegate.hh b/modules/gui/src/sequence_viewer/sequence_delegate.hh
similarity index 100%
rename from modules/gui/src/sequence/sequence_delegate.hh
rename to modules/gui/src/sequence_viewer/sequence_delegate.hh
diff --git a/modules/gui/src/sequence/sequence_model.cc b/modules/gui/src/sequence_viewer/sequence_model.cc
similarity index 100%
rename from modules/gui/src/sequence/sequence_model.cc
rename to modules/gui/src/sequence_viewer/sequence_model.cc
diff --git a/modules/gui/src/sequence/sequence_model.hh b/modules/gui/src/sequence_viewer/sequence_model.hh
similarity index 100%
rename from modules/gui/src/sequence/sequence_model.hh
rename to modules/gui/src/sequence_viewer/sequence_model.hh
diff --git a/modules/gui/src/sequence/sequence_row.cc b/modules/gui/src/sequence_viewer/sequence_row.cc
similarity index 100%
rename from modules/gui/src/sequence/sequence_row.cc
rename to modules/gui/src/sequence_viewer/sequence_row.cc
diff --git a/modules/gui/src/sequence/sequence_row.hh b/modules/gui/src/sequence_viewer/sequence_row.hh
similarity index 100%
rename from modules/gui/src/sequence/sequence_row.hh
rename to modules/gui/src/sequence_viewer/sequence_row.hh
diff --git a/modules/gui/src/sequence/sequence_search_bar.cc b/modules/gui/src/sequence_viewer/sequence_search_bar.cc
similarity index 100%
rename from modules/gui/src/sequence/sequence_search_bar.cc
rename to modules/gui/src/sequence_viewer/sequence_search_bar.cc
diff --git a/modules/gui/src/sequence/sequence_search_bar.hh b/modules/gui/src/sequence_viewer/sequence_search_bar.hh
similarity index 100%
rename from modules/gui/src/sequence/sequence_search_bar.hh
rename to modules/gui/src/sequence_viewer/sequence_search_bar.hh
diff --git a/modules/gui/src/sequence/sequence_table_view.cc b/modules/gui/src/sequence_viewer/sequence_table_view.cc
similarity index 100%
rename from modules/gui/src/sequence/sequence_table_view.cc
rename to modules/gui/src/sequence_viewer/sequence_table_view.cc
diff --git a/modules/gui/src/sequence/sequence_table_view.hh b/modules/gui/src/sequence_viewer/sequence_table_view.hh
similarity index 100%
rename from modules/gui/src/sequence/sequence_table_view.hh
rename to modules/gui/src/sequence_viewer/sequence_table_view.hh
diff --git a/modules/gui/src/sequence/sequence_view_object.cc b/modules/gui/src/sequence_viewer/sequence_view_object.cc
similarity index 100%
rename from modules/gui/src/sequence/sequence_view_object.cc
rename to modules/gui/src/sequence_viewer/sequence_view_object.cc
diff --git a/modules/gui/src/sequence/sequence_view_object.hh b/modules/gui/src/sequence_viewer/sequence_view_object.hh
similarity index 100%
rename from modules/gui/src/sequence/sequence_view_object.hh
rename to modules/gui/src/sequence_viewer/sequence_view_object.hh
diff --git a/modules/gui/src/sequence/sequence_viewer.cc b/modules/gui/src/sequence_viewer/sequence_viewer.cc
similarity index 84%
rename from modules/gui/src/sequence/sequence_viewer.cc
rename to modules/gui/src/sequence_viewer/sequence_viewer.cc
index a801e9628..6e9e7c2d0 100644
--- a/modules/gui/src/sequence/sequence_viewer.cc
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.cc
@@ -50,18 +50,18 @@
namespace ost { namespace gui {
-class SequenceViewerV2Factory: public WidgetFactory {
+class SequenceViewerFactory: public WidgetFactory {
public:
- SequenceViewerV2Factory() :
- WidgetFactory("ost::gui::SequenceViewerV2", "Sequence Viewer V2") {
+ SequenceViewerFactory() :
+ WidgetFactory("ost::gui::SequenceViewer", "Sequence Viewer") {
}
virtual Widget* Create(QWidget* parent) {
- return GostyApp::Instance()->GetSequenceViewerV2();
+ return GostyApp::Instance()->GetSequenceViewer();
}
};
-OST_REGISTER_WIDGET(SequenceViewerV2, SequenceViewerV2Factory);
+OST_REGISTER_WIDGET(SequenceViewer, SequenceViewerFactory);
struct GetNodesVisitor: public gfx::GfxNodeVisitor {
GetNodesVisitor(): nodes_() {}
@@ -72,7 +72,7 @@ struct GetNodesVisitor: public gfx::GfxNodeVisitor {
gfx::NodePtrList GetNodes(){return nodes_;}
};
-SequenceViewerV2::SequenceViewerV2(bool stand_alone, QWidget* parent): Widget(NULL,parent)
+SequenceViewer::SequenceViewer(bool stand_alone, QWidget* parent): Widget(NULL,parent)
{
model_ = new SequenceModel(this);
@@ -102,7 +102,7 @@ SequenceViewerV2::SequenceViewerV2(bool stand_alone, QWidget* parent): Widget(NU
}
}
-void SequenceViewerV2::InitMenuBar()
+void SequenceViewer::InitMenuBar()
{
toolbar_ = new QToolBar(this);
toolbar_->setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -111,7 +111,7 @@ void SequenceViewerV2::InitMenuBar()
layout()->addWidget(toolbar_);
}
-void SequenceViewerV2::InitSearchBar()
+void SequenceViewer::InitSearchBar()
{
seq_search_bar_ = new SeqSearchBar(this);
seq_search_bar_->hide();
@@ -119,7 +119,7 @@ void SequenceViewerV2::InitSearchBar()
connect(seq_search_bar_, SIGNAL(Changed(const QString&, bool, const QString&)), this, SLOT(OnSearchBarUpdate(const QString&, bool, const QString&)));
}
-void SequenceViewerV2::InitView()
+void SequenceViewer::InitView()
{
seq_table_view_ = new SequenceTableView(model_);
layout()->addWidget(seq_table_view_);
@@ -140,7 +140,7 @@ void SequenceViewerV2::InitView()
connect(seq_table_view_,SIGNAL(MouseWheelEvent(QWheelEvent*)),this,SLOT(MouseWheelEvent(QWheelEvent*)));
}
-void SequenceViewerV2::InitActions()
+void SequenceViewer::InitActions()
{
QDir icon_path(GetSharedDataPath().c_str());
icon_path.cd("gui");
@@ -165,7 +165,7 @@ void SequenceViewerV2::InitActions()
connect(menu_action, SIGNAL(triggered(bool)), this, SLOT(DisplayMenu()));
}
-void SequenceViewerV2::NodeAdded(const gfx::GfxNodeP& n)
+void SequenceViewer::NodeAdded(const gfx::GfxNodeP& n)
{
if (gfx::EntityP o=boost::dynamic_pointer_cast<gfx::Entity>(n)) {
model_->InsertGfxEntity(o);
@@ -175,14 +175,14 @@ void SequenceViewerV2::NodeAdded(const gfx::GfxNodeP& n)
this->UpdateSearchBar();
}
-void SequenceViewerV2::NodeRemoved(const gfx::GfxNodeP& node)
+void SequenceViewer::NodeRemoved(const gfx::GfxNodeP& node)
{
if (gfx::EntityP o=boost::dynamic_pointer_cast<gfx::Entity>(node)) {
model_->RemoveGfxEntity(o);
}
}
-void SequenceViewerV2::AddAlignment(const seq::AlignmentHandle& alignment)
+void SequenceViewer::AddAlignment(const seq::AlignmentHandle& alignment)
{
if(alignment.GetCount()>0 && alignment.GetLength()>0){
model_->InsertAlignment(alignment);
@@ -191,12 +191,12 @@ void SequenceViewerV2::AddAlignment(const seq::AlignmentHandle& alignment)
}
}
-void SequenceViewerV2::RemoveAlignment(const seq::AlignmentHandle& alignment)
+void SequenceViewer::RemoveAlignment(const seq::AlignmentHandle& alignment)
{
model_->RemoveAlignment(alignment);
}
-void SequenceViewerV2::UpdateSearchBar()
+void SequenceViewer::UpdateSearchBar()
{
QStringList sequence_names_;
for(int i = 1; i< model_->rowCount(); i++){
@@ -206,14 +206,14 @@ void SequenceViewerV2::UpdateSearchBar()
seq_search_bar_->UpdateItems(sequence_names_);
}
-void SequenceViewerV2::SelectionModelChanged(const QItemSelection& sel, const QItemSelection& desel)
+void SequenceViewer::SelectionModelChanged(const QItemSelection& sel, const QItemSelection& desel)
{
gfx::Scene::Instance().DetachObserver(this);
model_->SelectionChanged(sel, desel);
gfx::Scene::Instance().AttachObserver(this);
}
-void SequenceViewerV2::SelectionChanged(const gfx::GfxObjP& o,
+void SequenceViewer::SelectionChanged(const gfx::GfxObjP& o,
const mol::EntityView& view)
{
disconnect(seq_table_view_->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(SelectionModelChanged(const QItemSelection&, const QItemSelection&)));
@@ -225,14 +225,14 @@ void SequenceViewerV2::SelectionChanged(const gfx::GfxObjP& o,
connect(seq_table_view_->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(SelectionModelChanged(const QItemSelection&, const QItemSelection&)));
}
-void SequenceViewerV2::DoubleClicked(const QModelIndex& index)
+void SequenceViewer::DoubleClicked(const QModelIndex& index)
{
disconnect(seq_table_view_->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(SelectionModelChanged(const QItemSelection&, const QItemSelection&)));
model_->DoubleClicked(index);
connect(seq_table_view_->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(SelectionModelChanged(const QItemSelection&, const QItemSelection&)));
}
-void SequenceViewerV2::MouseWheelEvent(QWheelEvent* event)
+void SequenceViewer::MouseWheelEvent(QWheelEvent* event)
{
int delta = event->delta();
if (event->orientation() == Qt::Vertical) {
@@ -252,7 +252,7 @@ void SequenceViewerV2::MouseWheelEvent(QWheelEvent* event)
event->accept();
}
-void SequenceViewerV2::CopyEvent(QKeyEvent* event)
+void SequenceViewer::CopyEvent(QKeyEvent* event)
{
QItemSelectionModel* model = seq_table_view_->selectionModel();
const QModelIndexList& list = model->selectedIndexes();
@@ -294,7 +294,7 @@ void SequenceViewerV2::CopyEvent(QKeyEvent* event)
event->accept();
}
-void SequenceViewerV2::FindInSequence()
+void SequenceViewer::FindInSequence()
{
if(seq_search_bar_->isHidden()){
seq_search_bar_->show();
@@ -304,7 +304,7 @@ void SequenceViewerV2::FindInSequence()
}
}
-void SequenceViewerV2::OnSearchBarUpdate(const QString& subject,
+void SequenceViewer::OnSearchBarUpdate(const QString& subject,
bool search_in_all, const QString& name)
{
seq_table_view_->selectionModel()->clear();
@@ -318,7 +318,7 @@ void SequenceViewerV2::OnSearchBarUpdate(const QString& subject,
}
}
-void SequenceViewerV2::SelectList(const QModelIndexList& list)
+void SequenceViewer::SelectList(const QModelIndexList& list)
{
QItemSelectionModel* model = seq_table_view_->selectionModel();
QSet<int> rows_visited;
@@ -334,56 +334,56 @@ void SequenceViewerV2::SelectList(const QModelIndexList& list)
}
}
-const QStringList& SequenceViewerV2::GetDisplayModes()
+const QStringList& SequenceViewer::GetDisplayModes()
{
return model_->GetDisplayModes();
}
-const QStringList& SequenceViewerV2::GetDisplayModes(const seq::AlignmentHandle& alignment)
+const QStringList& SequenceViewer::GetDisplayModes(const seq::AlignmentHandle& alignment)
{
return model_->GetDisplayModes(alignment);
}
-const QStringList& SequenceViewerV2::GetDisplayModes(const gfx::EntityP& entity)
+const QStringList& SequenceViewer::GetDisplayModes(const gfx::EntityP& entity)
{
return model_->GetDisplayModes(entity);
}
-const QString& SequenceViewerV2::GetCurrentDisplayMode()
+const QString& SequenceViewer::GetCurrentDisplayMode()
{
return model_->GetCurrentDisplayMode();
}
-const QString& SequenceViewerV2::GetCurrentDisplayMode(const seq::AlignmentHandle& alignment)
+const QString& SequenceViewer::GetCurrentDisplayMode(const seq::AlignmentHandle& alignment)
{
return model_->GetCurrentDisplayMode(alignment);
}
-const QString& SequenceViewerV2::GetCurrentDisplayMode(const gfx::EntityP& entity)
+const QString& SequenceViewer::GetCurrentDisplayMode(const gfx::EntityP& entity)
{
return model_->GetCurrentDisplayMode(entity);
}
-void SequenceViewerV2::ChangeDisplayMode(const QString& string)
+void SequenceViewer::ChangeDisplayMode(const QString& string)
{
model_->SetDisplayMode(string);
seq_table_view_->viewport()->update();
}
-void SequenceViewerV2::ChangeDisplayMode(const seq::AlignmentHandle& alignment, const QString& string)
+void SequenceViewer::ChangeDisplayMode(const seq::AlignmentHandle& alignment, const QString& string)
{
model_->SetDisplayMode(alignment, string);
seq_table_view_->viewport()->update();
}
-void SequenceViewerV2::ChangeDisplayMode(const gfx::EntityP& entity, const QString& string)
+void SequenceViewer::ChangeDisplayMode(const gfx::EntityP& entity, const QString& string)
{
model_->SetDisplayMode(entity, string);
seq_table_view_->viewport()->update();
}
-ActionList SequenceViewerV2::GetActions()
+ActionList SequenceViewer::GetActions()
{
return action_list_;
}
-void SequenceViewerV2::DisplayMenu()
+void SequenceViewer::DisplayMenu()
{
QMenu* menu = new QMenu();
QList<QAction*> actions = display_mode_actions_->actions();
@@ -405,7 +405,7 @@ void SequenceViewerV2::DisplayMenu()
menu->exec(QCursor::pos());
}
-void SequenceViewerV2::ChangeDisplayMode()
+void SequenceViewer::ChangeDisplayMode()
{
QAction* action = display_mode_actions_->checkedAction();
if(action){
@@ -413,7 +413,7 @@ void SequenceViewerV2::ChangeDisplayMode()
}
}
-SequenceViewerV2::~SequenceViewerV2(){
+SequenceViewer::~SequenceViewer(){
gfx::Scene::Instance().DetachObserver(this);
}
diff --git a/modules/gui/src/sequence/sequence_viewer.hh b/modules/gui/src/sequence_viewer/sequence_viewer.hh
similarity index 95%
rename from modules/gui/src/sequence/sequence_viewer.hh
rename to modules/gui/src/sequence_viewer/sequence_viewer.hh
index 9ba748323..e4f8d55f2 100644
--- a/modules/gui/src/sequence/sequence_viewer.hh
+++ b/modules/gui/src/sequence_viewer/sequence_viewer.hh
@@ -43,11 +43,11 @@
namespace ost { namespace gui {
/// \brief QTableView with first column not moving
-class DLLEXPORT_OST_GUI SequenceViewerV2 : public Widget, public gfx::SceneObserver {
+class DLLEXPORT_OST_GUI SequenceViewer : public Widget, public gfx::SceneObserver {
Q_OBJECT
public:
- SequenceViewerV2(bool stand_alone=true, QWidget* parent=NULL);
- ~SequenceViewerV2();
+ SequenceViewer(bool stand_alone=true, QWidget* parent=NULL);
+ ~SequenceViewer();
virtual void NodeAdded(const gfx::GfxNodeP& node);
virtual void NodeRemoved(const gfx::GfxNodeP& node);
diff --git a/modules/gui/src/sequence/tick_painter.cc b/modules/gui/src/sequence_viewer/tick_painter.cc
similarity index 100%
rename from modules/gui/src/sequence/tick_painter.cc
rename to modules/gui/src/sequence_viewer/tick_painter.cc
diff --git a/modules/gui/src/sequence/tick_painter.hh b/modules/gui/src/sequence_viewer/tick_painter.hh
similarity index 100%
rename from modules/gui/src/sequence/tick_painter.hh
rename to modules/gui/src/sequence_viewer/tick_painter.hh
diff --git a/modules/gui/src/sequence/title_row.cc b/modules/gui/src/sequence_viewer/title_row.cc
similarity index 100%
rename from modules/gui/src/sequence/title_row.cc
rename to modules/gui/src/sequence_viewer/title_row.cc
diff --git a/modules/gui/src/sequence/title_row.hh b/modules/gui/src/sequence_viewer/title_row.hh
similarity index 100%
rename from modules/gui/src/sequence/title_row.hh
rename to modules/gui/src/sequence_viewer/title_row.hh
diff --git a/scripts/init.py b/scripts/init.py
index 424ae4398..6df88ea01 100644
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -35,14 +35,14 @@ def _InitPanels(app):
panels.AddWidgetToPool('ost.gui.PythonShell', 1)
panels.AddWidgetToPool('ost.gui.RemoteLoader', -1)
panels.AddWidgetToPool('ost.gui.SceneWin', 1)
- panels.AddWidgetToPool('ost.gui.SequenceViewerV2', 1)
+ panels.AddWidgetToPool('ost.gui.SequenceViewer', 1)
if not panels.Restore("ui/perspective/panels"):
panels.AddWidget(gui.PanelPosition.LEFT_PANEL, app.scene_win)
panels.AddWidgetByName(gui.PanelPosition.LEFT_PANEL,
'ost.gui.FileBrowser', False)
panels.AddWidgetByName(gui.PanelPosition.LEFT_PANEL,
'ost.gui.RemoteLoader', False)
- panels.AddWidget(gui.PanelPosition.BOTTOM_PANEL, app.seq_viewer_v2)
+ panels.AddWidget(gui.PanelPosition.BOTTOM_PANEL, app.seq_viewer)
panels.AddWidget(gui.PanelPosition.BOTTOM_PANEL, app.py_shell)
def _InitFrontEnd():
--
GitLab