chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows ANGLE compatability warnings

Browse Source
This commit is contained in:
Mark Watkins 2014-06-02 16:40:00 +10:00
parent b71ef45a3e
commit 42d29ae75c
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleepyhead/SleepLib/loader_plugins/md300w1_loader.cpp
View File

@ -177,6 +177,13 @@ bool MD300W1Loader::readDATFile(QString path)
// Number of records // Number of records
int n = ((unsigned char)data.at(2) << 8) | (unsigned char)data.at(1); int n = ((unsigned char)data.at(2) << 8) | (unsigned char)data.at(1);
// CHECKME:
if (size < (n*11)+3) {
qDebug() << "Short MD300W1 .dat file" << path;
return false;
}
unsigned char o2, pr; unsigned char o2, pr;
qint32 lasttime=0, ts=0; qint32 lasttime=0, ts=0;

28
sleepyhead/main.cpp
View File

@ -24,6 +24,7 @@
#include <QPushButton> #include <QPushButton>
#include <QSettings> #include <QSettings>
#include <QFileDialog> #include <QFileDialog>
#include <QSysInfo>
#include "SleepLib/schema.h" #include "SleepLib/schema.h"
#include "mainwindow.h" #include "mainwindow.h"
@ -142,6 +143,7 @@ void sDelay(int s)
int compareVersion(QString version); int compareVersion(QString version);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef Q_WS_X11 #ifdef Q_WS_X11
@ -177,6 +179,32 @@ int main(int argc, char *argv[])
initializeStrings(); // Important, call this AFTER translator is installed. initializeStrings(); // Important, call this AFTER translator is installed.
a.setApplicationName(STR_TR_SleepyHead); a.setApplicationName(STR_TR_SleepyHead);
#if defined(Q_OS_WIN)
#ifndef BROKEN_OPENGL_BUILD
QString glversion = (char *)glGetString(GL_VERSION);
qDebug() << "OpenGL Version detected:" << glversion;
// if (QSysInfo::windowsVersion() < QSysInfo::WV_VISTA) {
if (glversion.contains("ANGLE")) {
QMessageBox::warning(nullptr, QObject::tr("You have the wrong version of SleepyHead"),
QObject::tr("This build of SleepyHead was designed to work with computers lacking full OpenGL 2.0 support, and only runs on (native) Windows Vista or higher.") + "<br/><br/>"+
QObject::tr("There is another special build available for computers that do not support OpenGL 2.0 via ANGLE, tagged '-BrokenGL', that has been designed to work with Windows XP, Virtual Box, VMware, etc.")+"<br/><br/>"+
QObject::tr("Because graphs will not render correctly, this version will now exit."), QMessageBox::Ok, QMessageBox::Ok);
exit(1);
}
// }
#else
if (QSysInfo::windowsVersion() > QSysInfo::WV_VISTA) {
QMessageBox::information(nullptr, QObject::tr("A faster build may be available"),
QObject::tr("This special build of SleepyHead was designed to work with computers lacking OpenGL 2.0 support.") + "<br/><br/>"+
QObject::tr("There is another special build available for computers running Windows Vista or higher that do not support OpenGL 2.0, tagged 'ANGLE', which will work faster on your computer.")+"<br/><br/>"+
QObject::tr("If your running Windows in a Virutal machine, disregard this message, because the version you are running works best.")
QMessageBox::Ok, QMessageBox::Ok);
}
#endif
#endif
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////
// Datafolder location Selection // Datafolder location Selection
//////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////