Peter M. Groen / openhantek

Commit 16dc684e03fa0c1003d9eeaa826b8d9198ff731d

Authored by David Graeff
Committed by David Gräff
1 parent 40e9b288

Readme: Add command line switch --useGLES explanation

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
openhantek/src/mainwindow.cpp
  View file @16dc684
... ... @@ -27,9 +27,10 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, QWid
27 27  
28 28 // Window title
29 29 setWindowIcon(QIcon(":openhantek.png"));
30   - setWindowTitle(tr("OpenHantek - Device %1").arg(QString::fromStdString(dsoControl->getDevice()->getModel()->name)));
  30 + setWindowTitle(tr("OpenHantek - Device %1 - Renderer %2")
  31 + .arg(QString::fromStdString(dsoControl->getDevice()->getModel()->name))
  32 + .arg(QSurfaceFormat::defaultFormat().renderableType()==QSurfaceFormat::OpenGL?"OpenGL":"OpenGL ES"));
31 33  
32   -// Create dock windows before the dso widget, they fix messed up settings
33 34 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
34 35 setDockOptions(dockOptions() | QMainWindow::GroupedDragging);
35 36 #endif
... ... @@ -40,6 +41,7 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, QWid
40 41 registerDockMetaTypes();
41 42  
42 43 // Docking windows
  44 + // Create dock windows before the dso widget, they fix messed up settings
43 45 HorizontalDock *horizontalDock;
44 46 TriggerDock *triggerDock;
45 47 SpectrumDock *spectrumDock;
... ... @@ -135,8 +137,7 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, QWid
135 137 bool mathUsed = mSettings->scope.anyUsed(spec->channels);
136 138  
137 139 // Normal channel, check if voltage/spectrum or math channel is used
138   - if (channel < spec->channels)
139   - dsoControl->setChannelUsed(channel, mathUsed | mSettings->scope.anyUsed(channel));
  140 + if (channel < spec->channels) dsoControl->setChannelUsed(channel, mathUsed | mSettings->scope.anyUsed(channel));
140 141 // Math channel, update all channels
141 142 else if (channel == spec->channels) {
142 143 for (ChannelID c = 0; c < spec->channels; ++c)
... ...
readme.md
  View file @16dc684
... ... @@ -39,6 +39,8 @@ We have build instructions available for [Linux](docs/build.md#linux), [Apple Ma
39 39  
40 40 ## Run OpenHantek
41 41 You need an OpenGL 3.2+ or OpenGL ES 2.0+ capable graphics hardware for OpenHantek.
  42 +OpenGL is prefered, if available. Overwrite this behaviour by starting OpenHantek
  43 +from the command line like this: `OpenHantek --useGLES`.
42 44  
43 45 USB access for the device is required:
44 46 * As seen on the [Microsoft Windows build instructions](docs/build.md#windows) page, you need a
... ...