mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Print: label update on height slider move

Browse source 
The PrintOptions widget has value labels next to the
horizontal sliders. Add slots to update these labels
when a slider moves.

Patch also makes a modification so that the PrintOptions
constructor requires a 'struct options' pointer. If
an options struct is not received we do not set predefined
values and do not connect signals to slots, where
options will be updated immediately.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov 2013-07-09 23:43:21 +03:00
parent 5d81eee0da
commit 2c7a208bc1
3 changed files with 58 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
qt-ui/printdialog.cpp
View file

@ -18,7 +18,8 @@ PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f)
printOptions = tempOptions;
/* temporary.
* add the PrintOptions widget and a Print button for testing purposes. */
optionsWidget = PrintOptions::instance();
optionsWidget = new PrintOptions(this, &printOptions);
QVBoxLayout *layout = new QVBoxLayout(this);
setLayout(layout);
layout->addWidget(optionsWidget);
@ -27,7 +28,7 @@ PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f)
connect(printButton, SIGNAL(clicked(bool)), this, SLOT(printClicked()));
layout->addWidget(printButton);
setFixedSize(600, 400);
setFixedSize(520, 500);
setWindowTitle("Print");
}

50
qt-ui/printoptions.cpp
View file

@ -1,14 +1,50 @@
#include "printoptions.h"
#include "ui_printoptions.h"
PrintOptions *PrintOptions::instance()
{
static PrintOptions *self = new PrintOptions();
return self;
}
PrintOptions::PrintOptions(QWidget *parent, Qt::WindowFlags f)
PrintOptions::PrintOptions(QWidget *parent, struct options *printOpt)
: ui( new Ui::PrintOptions())
{
if (parent)
setParent(parent);
if (!printOpt)
return;
printOptions = printOpt;
ui->setupUi(this);
// make height sliders update the labels next to them
connect(ui->sliderPHeight, SIGNAL(sliderMoved(int)), this, SLOT(sliderPHeightMoved(int)));
connect(ui->sliderOHeight, SIGNAL(sliderMoved(int)), this, SLOT(sliderOHeightMoved(int)));
connect(ui->sliderNHeight, SIGNAL(sliderMoved(int)), this, SLOT(sliderNHeightMoved(int)));
initSliderWithLabel(ui->sliderPHeight, ui->valuePHeight, printOptions->profile_height);
initSliderWithLabel(ui->sliderOHeight, ui->valueOHeight, printOptions->notes_height);
initSliderWithLabel(ui->sliderNHeight, ui->valueNHeight, printOptions->tanks_height);
}
void PrintOptions::initSliderWithLabel(QSlider *slider, QLabel *label, int value)
{
slider->setValue(value);
label->setText(formatSliderValueText(value));
}
QString PrintOptions::formatSliderValueText(int value)
{
QString str = QString("%1%").arg(QString::number(value));
return str;
}
void PrintOptions::sliderPHeightMoved(int value)
{
ui->valuePHeight->setText(formatSliderValueText(value));
printOptions->profile_height = value;
}
void PrintOptions::sliderOHeightMoved(int value)
{
ui->valueOHeight->setText(formatSliderValueText(value));
printOptions->notes_height = value;
}
void PrintOptions::sliderNHeightMoved(int value)
{
ui->valueNHeight->setText(formatSliderValueText(value));
printOptions->tanks_height = value;
}

14
qt-ui/printoptions.h
View file

@ -2,6 +2,8 @@
#define PRINTOPTIONS_H
#include <QWidget>
#include <QSlider>
#include <QLabel>
#include "../display.h"
namespace Ui {
@ -13,11 +15,19 @@ class PrintOptions : public QWidget {
Q_OBJECT
public:
static PrintOptions *instance();
explicit PrintOptions(QWidget *parent = 0, struct options *printOpt = 0);
private:
explicit PrintOptions(QWidget *parent = 0, Qt::WindowFlags f = 0);
Ui::PrintOptions *ui;
void setLabelFromSlider(QSlider *slider, QLabel *label);
void initSliderWithLabel(QSlider *slider, QLabel *label, int value);
QString formatSliderValueText(int value);
struct options *printOptions;
private slots:
void sliderPHeightMoved(int value);
void sliderOHeightMoved(int value);
void sliderNHeightMoved(int value);
};
#endif