Skip to content

Commit

Permalink
Readme: Add command line switch --useGLES explanation
Browse files Browse the repository at this point in the history
  • Loading branch information
David Graeff committed Jan 17, 2018
1 parent 40e9b28 commit 16dc684
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 5 additions & 4 deletions openhantek/src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 16dc684

Please sign in to comment.