From 3ef2d2e9092c86038eb210482970c26db1d9cc30 Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Thu, 14 Oct 2010 10:26:18 +0200
Subject: [PATCH] added GetSlab/SetSlab to DataViewer
---
modules/gui/pymod/export_data_viewer.cc | 3 +++
modules/gui/src/data_viewer/data_viewer.cc | 10 ++++++++++
modules/gui/src/data_viewer/data_viewer.hh | 4 +++-
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/modules/gui/pymod/export_data_viewer.cc b/modules/gui/pymod/export_data_viewer.cc
index c1f561062..2dc74e40f 100644
--- a/modules/gui/pymod/export_data_viewer.cc
+++ b/modules/gui/pymod/export_data_viewer.cc
@@ -77,6 +77,9 @@ void export_data_viewer()
.def("Recenter",&DataViewer::Recenter)
.def("AddDockWidget",add_dock1)
.def("AddDockWidget",add_dock2)
+ .def("SetSlab", &DataViewer::SetSlab)
+ .def("GetSlab", &DataViewer::GetSlab)
+ .add_property("slab", &DataViewer::GetSlab, &DataViewer::SetSlab)
.def("AddDockWidget",add_dock3)
.def("AddDockWidget",add_dock4)
.def("RemoveDockWidget",&DataViewer::RemoveDockWidget)
diff --git a/modules/gui/src/data_viewer/data_viewer.cc b/modules/gui/src/data_viewer/data_viewer.cc
index 11edbf9da..d97048438 100644
--- a/modules/gui/src/data_viewer/data_viewer.cc
+++ b/modules/gui/src/data_viewer/data_viewer.cc
@@ -123,6 +123,11 @@ void DataViewer::SetName(const String& name)
setWindowTitle(QString::fromStdString(name));
}
+int DataViewer::GetSlab() const
+{
+ return panel_->GetSlab();
+}
+
int DataViewer::AddOverlay(const OverlayPtr& ov, bool make_active)
{
int retval= ov_manager_->AddOverlay(ov,make_active);
@@ -140,6 +145,11 @@ OverlayManagerPtr DataViewer::GetOverlayManager() const
return ov_manager_;
}
+void DataViewer::SetSlab(int slab)
+{
+ panel_->SetSlab(slab);
+}
+
void DataViewer::OnSlabChange(int slab)
{
slablabel_->setText(QString::number(slab));
diff --git a/modules/gui/src/data_viewer/data_viewer.hh b/modules/gui/src/data_viewer/data_viewer.hh
index 9130159a0..be4d576a6 100644
--- a/modules/gui/src/data_viewer/data_viewer.hh
+++ b/modules/gui/src/data_viewer/data_viewer.hh
@@ -101,7 +101,9 @@ public:
//! event filter for DataViewerPanel
virtual bool eventFilter(QObject * object, QEvent *event);
-
+ void SetSlab(int slab);
+
+ int GetSlab() const;
public slots:
//! update view
void UpdateView();
--
GitLab