Print loading as text over opengl window
This commit is contained in:
parent
7b05a4faa3
commit
f49d27216e
2 changed files with 9 additions and 0 deletions
|
@ -62,6 +62,7 @@ void Canvas::paintEvent(QPaintEvent *event)
|
||||||
if (mesh) draw_mesh();
|
if (mesh) draw_mesh();
|
||||||
|
|
||||||
QPainter painter(this);
|
QPainter painter(this);
|
||||||
|
painter.setRenderHint(QPainter::Antialiasing);
|
||||||
if (!status.isNull())
|
if (!status.isNull())
|
||||||
painter.drawText(10, height() - 10, status);
|
painter.drawText(10, height() - 10, status);
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,16 +70,24 @@ void Window::on_about()
|
||||||
|
|
||||||
void Window::load_stl(const QString &filename)
|
void Window::load_stl(const QString &filename)
|
||||||
{
|
{
|
||||||
|
canvas->set_status("Loading " + filename);
|
||||||
|
|
||||||
Loader* loader = new Loader(this, filename);
|
Loader* loader = new Loader(this, filename);
|
||||||
connect(loader, &Loader::started,
|
connect(loader, &Loader::started,
|
||||||
[=](){ open_action->setEnabled(false); });
|
[=](){ open_action->setEnabled(false); });
|
||||||
|
|
||||||
connect(loader, &Loader::got_mesh,
|
connect(loader, &Loader::got_mesh,
|
||||||
canvas, &Canvas::load_mesh);
|
canvas, &Canvas::load_mesh);
|
||||||
|
|
||||||
connect(loader, &Loader::finished,
|
connect(loader, &Loader::finished,
|
||||||
loader, &Loader::deleteLater);
|
loader, &Loader::deleteLater);
|
||||||
connect(loader, &Loader::finished,
|
connect(loader, &Loader::finished,
|
||||||
[=](){ open_action->setEnabled(true); });
|
[=](){ open_action->setEnabled(true); });
|
||||||
|
connect(loader, &Loader::finished,
|
||||||
|
[=](){ canvas->set_status(""); });
|
||||||
|
|
||||||
connect(loader, &Loader::loaded_file,
|
connect(loader, &Loader::loaded_file,
|
||||||
this, &Window::setWindowTitle);
|
this, &Window::setWindowTitle);
|
||||||
|
|
||||||
loader->start();
|
loader->start();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue