diff --git a/openhantek/src/mainwindow.cpp b/openhantek/src/mainwindow.cpp index d6d4421..0049e67 100644 --- a/openhantek/src/mainwindow.cpp +++ b/openhantek/src/mainwindow.cpp @@ -27,9 +27,10 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, QWid // Window title setWindowIcon(QIcon(":openhantek.png")); - setWindowTitle(tr("OpenHantek - Device %1").arg(QString::fromStdString(dsoControl->getDevice()->getModel()->name))); + setWindowTitle(tr("OpenHantek - Device %1 - Renderer %2") + .arg(QString::fromStdString(dsoControl->getDevice()->getModel()->name)) + .arg(QSurfaceFormat::defaultFormat().renderableType()==QSurfaceFormat::OpenGL?"OpenGL":"OpenGL ES")); -// Create dock windows before the dso widget, they fix messed up settings #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) setDockOptions(dockOptions() | QMainWindow::GroupedDragging); #endif @@ -40,6 +41,7 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, QWid registerDockMetaTypes(); // Docking windows + // Create dock windows before the dso widget, they fix messed up settings HorizontalDock *horizontalDock; TriggerDock *triggerDock; SpectrumDock *spectrumDock; @@ -135,8 +137,7 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, QWid bool mathUsed = mSettings->scope.anyUsed(spec->channels); // Normal channel, check if voltage/spectrum or math channel is used - if (channel < spec->channels) - dsoControl->setChannelUsed(channel, mathUsed | mSettings->scope.anyUsed(channel)); + if (channel < spec->channels) dsoControl->setChannelUsed(channel, mathUsed | mSettings->scope.anyUsed(channel)); // Math channel, update all channels else if (channel == spec->channels) { for (ChannelID c = 0; c < spec->channels; ++c) diff --git a/readme.md b/readme.md index 811ef8d..301e592 100644 --- a/readme.md +++ b/readme.md @@ -39,6 +39,8 @@ We have build instructions available for [Linux](docs/build.md#linux), [Apple Ma ## Run OpenHantek You need an OpenGL 3.2+ or OpenGL ES 2.0+ capable graphics hardware for OpenHantek. +OpenGL is prefered, if available. Overwrite this behaviour by starting OpenHantek +from the command line like this: `OpenHantek --useGLES`. USB access for the device is required: * As seen on the [Microsoft Windows build instructions](docs/build.md#windows) page, you need a