Skip to content
Snippets Groups Projects
Commit b551c434 authored by Andreas Schenk's avatar Andreas Schenk
Browse files

added slider for verbosity level

added slider to change verbosity level from gui
if the verbosity level is changed from the shell the slider is updated automatically
parent 46530794
Branches
Tags
No related merge requests found
......@@ -202,3 +202,16 @@ class ManyOf:
if not found:
return False
return True
from ost import PushVerbosityLevel as _PushVerbosityLevel
from ost import PopVerbosityLevel as _PopVerbosityLevel
from ost import GetVerbosityLevel as _GetVerbosityLevel
def PushVerbosityLevel(value):
GostyApp.Instance().perspective.ChangeVerbositySlider(value)
def PopVerbosityLevel():
_PopVerbosityLevel()
GostyApp.Instance().perspective.ChangeVerbositySlider(_GetVerbosityLevel())
_PopVerbosityLevel() # the slider change pushes a new level :-(
......@@ -207,7 +207,7 @@ else:
print >> rcfile, '# IMPORTANT_DIR="path/to/important/dir"'
rcfile.close()
ost.PushVerbosityLevel(options.vlevel)
ost.gui.PushVerbosityLevel(options.vlevel)
working_dir=settings.GetValue("DNG_WORKING_DIR",None)
if working_dir != None and os.path.isdir(working_dir):
......
......@@ -57,7 +57,8 @@ void export_Perspective()
.def("StatusMessage", &Perspective::StatusMessage)
.def("Restore", &Perspective::Restore)
.def("Save", &Perspective::Save)
.add_property("main_area", make_function(&Perspective::GetMainArea,
.def("ChangeVerbositySlider", &Perspective::ChangeVerbositySlider)
.add_property("main_area", make_function(&Perspective::GetMainArea,
return_value_policy<reference_existing_object>()))
.add_property("panels", make_function(&Perspective::GetPanels,
return_value_policy<reference_existing_object>()))
......
......@@ -19,6 +19,8 @@
#include <ost/platform.hh>
#include <ost/log.hh>
#include <ost/gui/widget_registry.hh>
#include <ost/gui/perspective.hh>
#include <ost/gui/file_browser.hh>
......@@ -45,6 +47,7 @@
#include <QMap>
#include <QString>
#include <QStatusBar>
#include <QSlider>
/*
Author: Marco Biasini
......@@ -55,7 +58,8 @@ Perspective::Perspective(QMainWindow* parent):
QObject(parent), central_(new QWidget(parent)),
menu_bar_(new QMenuBar(parent)),
main_area_(new MainArea),
quick_access_bar_(new QWidget)
quick_access_bar_(new QWidget),
verbosity_slider_(new QSlider(Qt::Horizontal,quick_access_bar_))
{
parent->setMenuBar(menu_bar_);
......@@ -107,7 +111,19 @@ void Perspective::SetupQuickAccessBar()
add_side_bar_widget->setIconSize(QSize(10,10));
connect(add_side_bar_widget, SIGNAL(clicked()), this,
SLOT(AddSideBarWidget()));
l2->addWidget(add_side_bar_widget, 0);
verbosity_slider_->setMinimum(0);
verbosity_slider_->setMaximum(5);
verbosity_slider_->setValue(Logger::Instance().GetVerbosityLevel());
verbosity_slider_->setToolTip("Verbosity Level");
verbosity_slider_->setTickPosition(QSlider::TicksBothSides);
verbosity_slider_->setFixedWidth(100);
connect(verbosity_slider_, SIGNAL(valueChanged(int)),
this,SLOT(VerbosityChanged(int)));
l2->addWidget(verbosity_slider_, 0);
l2->addWidget(status_bar_);
l2->addWidget(new MessageBoxWidget(quick_access_bar_));
l2->addWidget(new QSizeGrip(quick_access_bar_));
......@@ -157,6 +173,17 @@ void Perspective::AddSideBarWidget()
delete sb;
}
void Perspective::ChangeVerbositySlider(int value)
{
verbosity_slider_->setValue(value);
}
void Perspective::VerbosityChanged(int value)
{
Logger::Instance().PushVerbosityLevel(value);
}
bool Perspective::Restore()
{
return true;
......
......@@ -33,6 +33,7 @@ class QMenuBar;
class QStatusBar;
class QMainWindow;
class QTextEdit;
class QSlider;
namespace ost { namespace gui {
......@@ -80,14 +81,18 @@ public:
/// \return Returns true if it was successful. Otherwise false
bool Save();
void ChangeVerbositySlider(int value);
private slots:
void AddSideBarWidget();
void VerbosityChanged(int value);
public slots:
/// \brief set status message
/// \param m The message that will be displayed in the status bar.
void StatusMessage(const String& m);
private:
void SetupQuickAccessBar();
QWidget* central_;
......@@ -96,6 +101,7 @@ private:
PanelManager* panels_;
QWidget* quick_access_bar_;
QStatusBar* status_bar_;
QSlider* verbosity_slider_;
};
}}
......
from ost import *
from ost import gui
import ost.gui.dng.init
\ No newline at end of file
import ost.gui.dng.init
from ost.gui import PushVerbosityLevel,PopVerbosityLevel
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment