graphics/paysages3d
1
0
Fork 0
Code Releases Activity

Use ui header file to find widgets rather than search them by name

Browse source
This commit is contained in:
Michaël Lemaire 2013-05-25 15:33:37 +02:00 committed by Michael Lemaire
parent 31ae2d3a49
commit 4a7fe29a5c
3 changed files with 36 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/editing/common/widgetglobalformbuttons.cpp
View file

@ -5,25 +5,11 @@ WidgetGlobalFormButtons::WidgetGlobalFormButtons(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::WidgetGlobalFormButtons) ui(new Ui::WidgetGlobalFormButtons)
{ {
QPushButton* button;
ui->setupUi(this); ui->setupUi(this);
button = findChild<QPushButton*>("button_ok"); connect(ui->button_ok, SIGNAL(clicked()), this, SIGNAL(okClicked()));
if (button) connect(ui->button_cancel, SIGNAL(clicked()), this, SIGNAL(cancelClicked()));
{ connect(ui->button_revert, SIGNAL(clicked()), this, SIGNAL(revertClicked()));
connect(button, SIGNAL(clicked()), this, SIGNAL(okClicked()));
}
button = findChild<QPushButton*>("button_cancel");
if (button)
{
connect(button, SIGNAL(clicked()), this, SIGNAL(cancelClicked()));
}
button = findChild<QPushButton*>("button_revert");
if (button)
{
connect(button, SIGNAL(clicked()), this, SIGNAL(revertClicked()));
}
} }
WidgetGlobalFormButtons::~WidgetGlobalFormButtons() WidgetGlobalFormButtons::~WidgetGlobalFormButtons()

119
src/editing/terrain/dialogterrainpainting.cpp
View file

@ -15,11 +15,7 @@ DialogTerrainPainting::DialogTerrainPainting(QWidget*parent, TerrainDefinition*
_terrain_original = terrain; _terrain_original = terrain;
_terrain_modified = (TerrainDefinition*)TerrainDefinitionClass.create(); _terrain_modified = (TerrainDefinition*)TerrainDefinitionClass.create();
QWidget* widget = findChild<QWidget*>("widget_commands"); ui->widget_commands->hide();
if (widget)
{
widget->hide();
}
revert(); revert();
@ -33,43 +29,26 @@ DialogTerrainPainting::~DialogTerrainPainting()
void DialogTerrainPainting::keyReleaseEvent(QKeyEvent* event) void DialogTerrainPainting::keyReleaseEvent(QKeyEvent* event)
{ {
QComboBox* input_brush_mode = findChild<QComboBox*>("input_brush_mode");
switch (event->key()) switch (event->key())
{ {
case Qt::Key_F2: case Qt::Key_F2:
if (input_brush_mode) ui->input_brush_mode->setCurrentIndex(0);
{
input_brush_mode->setCurrentIndex(0);
}
event->accept(); event->accept();
break; break;
case Qt::Key_F3: case Qt::Key_F3:
if (input_brush_mode) ui->input_brush_mode->setCurrentIndex(1);
{
input_brush_mode->setCurrentIndex(1);
}
event->accept(); event->accept();
break; break;
case Qt::Key_F4: case Qt::Key_F4:
if (input_brush_mode) ui->input_brush_mode->setCurrentIndex(2);
{
input_brush_mode->setCurrentIndex(2);
}
event->accept(); event->accept();
break; break;
case Qt::Key_F11: case Qt::Key_F11:
if (input_brush_mode) ui->input_brush_mode->setCurrentIndex(3);
{
input_brush_mode->setCurrentIndex(3);
}
event->accept(); event->accept();
break; break;
case Qt::Key_F12: case Qt::Key_F12:
if (input_brush_mode) ui->input_brush_mode->setCurrentIndex(4);
{
input_brush_mode->setCurrentIndex(4);
}
event->accept(); event->accept();
break; break;
default: default:
@ -79,32 +58,19 @@ void DialogTerrainPainting::keyReleaseEvent(QKeyEvent* event)
void DialogTerrainPainting::wheelEvent(QWheelEvent* event) void DialogTerrainPainting::wheelEvent(QWheelEvent* event)
{ {
QSlider* input_brush_size = findChild<QSlider*>("input_brush_size");
QSlider* input_brush_smoothing = findChild<QSlider*>("input_brush_smoothing");
QSlider* input_brush_strength = findChild<QSlider*>("input_brush_strength");
if (event->modifiers() & Qt::ControlModifier) if (event->modifiers() & Qt::ControlModifier)
{ {
if (input_brush_size) ui->input_brush_size->setValue(ui->input_brush_size->value() + (event->delta() > 0 ? 1 : -1));
{
input_brush_size->setValue(input_brush_size->value() + (event->delta() > 0 ? 1 : -1));
}
event->accept(); event->accept();
} }
else if (event->modifiers() & Qt::ShiftModifier) else if (event->modifiers() & Qt::ShiftModifier)
{ {
if (input_brush_strength) ui->input_brush_strength->setValue(ui->input_brush_strength->value() + (event->delta() > 0 ? 1 : -1));
{
input_brush_strength->setValue(input_brush_strength->value() + (event->delta() > 0 ? 1 : -1));
}
event->accept(); event->accept();
} }
else if (event->modifiers() & Qt::AltModifier) else if (event->modifiers() & Qt::AltModifier)
{ {
if (input_brush_smoothing) ui->input_brush_smoothing->setValue(ui->input_brush_smoothing->value() + (event->delta() > 0 ? 1 : -1));
{
input_brush_smoothing->setValue(input_brush_smoothing->value() + (event->delta() > 0 ? 1 : -1));
}
event->accept(); event->accept();
} }
else else
@ -123,75 +89,34 @@ void DialogTerrainPainting::revert()
{ {
TerrainDefinitionClass.copy(_terrain_original, _terrain_modified); TerrainDefinitionClass.copy(_terrain_original, _terrain_modified);
WidgetHeightMap* heightmap = findChild<WidgetHeightMap*>("widget_heightmap"); ui->widget_heightmap->setTerrain(_terrain_modified);
if (heightmap) ui->widget_heightmap->setBrush(&_brush);
{
heightmap->setTerrain(_terrain_modified);
heightmap->setBrush(&_brush);
}
} }
void DialogTerrainPainting::brushConfigChanged() void DialogTerrainPainting::brushConfigChanged()
{ {
QLabel* label;
QComboBox* combobox;
QSlider* slider;
// Fill brush object // Fill brush object
combobox = findChild<QComboBox*>("input_brush_mode"); _brush.setMode((PaintingBrushMode) ui->input_brush_mode->currentIndex());
if (combobox) _brush.setSize(ui->input_brush_size);
{ _brush.setSmoothing(ui->input_brush_smoothing);
_brush.setMode((PaintingBrushMode)combobox->currentIndex()); _brush.setStrength(ui->input_brush_strength);
}
slider = findChild<QSlider*>("input_brush_size");
if (slider)
{
_brush.setSize(slider);
}
slider = findChild<QSlider*>("input_brush_smoothing");
if (slider)
{
_brush.setSmoothing(slider);
}
slider = findChild<QSlider*>("input_brush_strength");
if (slider)
{
_brush.setStrength(slider);
}
// Update brush description // Update brush description
label = findChild<QLabel*>("label_brush_description"); ui->label_brush_description->setText(getHelpText());
if (label)
{
label->setText(getHelpText());
}
// Update brush preview // Update brush preview
// TODO
// Tell to 3D widget // Tell to 3D widget
WidgetHeightMap* heightmap = findChild<WidgetHeightMap*>("widget_heightmap"); ui->widget_heightmap->setBrush(&_brush);
if (heightmap)
{
heightmap->setBrush(&_brush);
}
} }
void DialogTerrainPainting::heightmapChanged() void DialogTerrainPainting::heightmapChanged()
{ {
QLabel* label = findChild<QLabel*>("label_memory_consumption"); qint64 memused = terrainGetMemoryStats(_terrain_modified);
if (label) ui->label_memory_consumption->setText(tr("Memory used: %1").arg(getHumanMemory(memused)));
{ ui->progress_memory_consumption->setMaximum(1024);
qint64 memused = terrainGetMemoryStats(_terrain_modified); ui->progress_memory_consumption->setValue(memused / 1024);
label->setText(tr("Memory used: %1").arg(getHumanMemory(memused)));
// TODO Find available memory
QProgressBar* progress = findChild<QProgressBar*>("progress_memory_consumption");
if (progress)
{
progress->setMaximum(1024);
progress->setValue(memused / 1024);
}
}
} }
QString DialogTerrainPainting::getHelpText() QString DialogTerrainPainting::getHelpText()

22
src/editing/terrain/mainterrainform.cpp
View file

@ -17,20 +17,20 @@ MainTerrainForm::MainTerrainForm(QWidget *parent) :
_form_helper = new FreeFormHelper(this); _form_helper = new FreeFormHelper(this);
_renderer_shape = new PreviewTerrainShape(_terrain); _renderer_shape = new PreviewTerrainShape(_terrain);
_form_helper->addPreview("preview_shape", _renderer_shape); _form_helper->addPreview(ui->preview_shape, _renderer_shape);
_form_helper->addDoubleInputSlider("input_scaling", &_terrain->scaling, 0.1, 3.0, 0.03, 0.3); _form_helper->addDoubleInputSlider(ui->input_scaling, &_terrain->scaling, 0.1, 3.0, 0.03, 0.3);
_form_helper->addDoubleInputSlider("input_height", &_terrain->height, 1.0, 45.0, 0.3, 3.0); _form_helper->addDoubleInputSlider(ui->input_height, &_terrain->height, 1.0, 45.0, 0.3, 3.0);
_form_helper->addDoubleInputSlider("input_shadow_smoothing", &_terrain->shadow_smoothing, 0.0, 0.3, 0.003, 0.03); _form_helper->addDoubleInputSlider(ui->input_shadow_smoothing, &_terrain->shadow_smoothing, 0.0, 0.3, 0.003, 0.03);
_form_helper->addDoubleInputSlider("input_water_height", &_terrain->water_height, -2.0, 2.0, 0.01, 0.1); _form_helper->addDoubleInputSlider(ui->input_water_height, &_terrain->water_height, -2.0, 2.0, 0.01, 0.1);
_form_helper->setApplyButton("button_apply"); _form_helper->setApplyButton(ui->button_apply);
_form_helper->setRevertButton("button_revert"); _form_helper->setRevertButton(ui->button_revert);
_form_helper->setExploreButton("button_explore"); _form_helper->setExploreButton(ui->button_explore);
_form_helper->setRenderButton("button_render"); _form_helper->setRenderButton(ui->button_render);
connect(findChild<QPushButton*>("button_dialog_painting"), SIGNAL(clicked()), this, SLOT(buttonPaintingPressed())); connect(ui->button_dialog_painting, SIGNAL(clicked()), this, SLOT(buttonPaintingPressed()));
connect(findChild<QPushButton*>("button_goto_textures"), SIGNAL(clicked()), this, SLOT(buttonTexturesPressed())); connect(ui->button_goto_textures, SIGNAL(clicked()), this, SLOT(buttonTexturesPressed()));
_form_helper->startManaging(); _form_helper->startManaging();
} }