mirror of https://github.com/EspoTek/Labrador.git
Changed default search directory
functionGenControl and espoComboBox now use QCoreApplication:: applicationDirPath(). This is to fix deploys on Mac. It’s possible but unlikely that it broke Windows/Linux.
This commit is contained in:
EspoTek
parent
644359d1a2
commit
3bcf78e4c4
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE QtCreatorProject>
|
||||
<!-- Written by QtCreator 4.1.0, 2016-11-28T18:20:47. -->
|
||||
<!-- Written by QtCreator 4.1.0, 2016-11-30T10:43:19. -->
|
||||
<qtcreator>
|
||||
<data>
|
||||
<variable>EnvironmentId</variable>
|
||||
<value type="QByteArray">{5435f0c8-6711-4749-aed4-cbb8cc75428f}</value>
|
||||
<value type="QByteArray">{269d77a6-d907-430c-8ea8-15ecdb65537f}</value>
|
||||
</data>
|
||||
<data>
|
||||
<variable>ProjectExplorer.Project.ActiveTarget</variable>
|
||||
|
|
@ -59,14 +59,14 @@
|
|||
<data>
|
||||
<variable>ProjectExplorer.Project.Target.0</variable>
|
||||
<valuemap type="QVariantMap">
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 MSVC2013 64bit</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 MSVC2013 64bit</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.win64_msvc2013_64_kit</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 clang 64bit</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 clang 64bit</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.clang_64_kit</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
|
||||
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Esposch/Documents/GitHub/Labrador/Desktop Interface</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/esposch/Labrador/build-Labrador-Desktop_Qt_5_7_0_clang_64bit-Debug</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
|
||||
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments">-v</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.SeparateDebugInfo">false</value>
|
||||
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
|
||||
|
|
@ -84,7 +84,10 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
|
|
@ -100,7 +103,10 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
|
|
@ -120,7 +126,7 @@
|
|||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Esposch/Documents/GitHub/Labrador/Desktop Interface</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/esposch/Labrador/Desktop Interface</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
|
|
@ -138,7 +144,10 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
|
|
@ -154,7 +163,10 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
|
|
@ -174,7 +186,7 @@
|
|||
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
|
||||
</valuemap>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/Users/Esposch/Documents/GitHub/Labrador/build-Labrador-Desktop_Qt_5_7_0_MSVC2013_64bit-Profile</value>
|
||||
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/esposch/Labrador/build-Labrador-Desktop_Qt_5_7_0_clang_64bit-Profile</value>
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
|
||||
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
|
||||
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
|
||||
|
|
@ -192,7 +204,10 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
|
|
@ -208,7 +223,10 @@
|
|||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
|
||||
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
|
||||
<value type="QString">-w</value>
|
||||
<value type="QString">-r</value>
|
||||
</valuelist>
|
||||
<value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
|
||||
<value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
|
||||
|
|
@ -286,13 +304,13 @@
|
|||
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Labrador</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/Esposch/Documents/GitHub/Labrador/Desktop Interface/Labrador.pro</value>
|
||||
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/esposch/Labrador/Desktop Interface/Labrador.pro</value>
|
||||
<value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">Labrador.pro</value>
|
||||
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">C:/Users/Esposch/Documents/GitHub/Labrador/Desktop Interface/bin</value>
|
||||
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/Users/esposch/Labrador/Desktop Interface/bin/Labrador.app/Contents/MacOS</value>
|
||||
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
|
||||
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
|
|
@ -13,8 +13,10 @@ void functionGenControl::waveformName_CH1(QString newName)
|
|||
qDebug() << "newName = " << newName;
|
||||
newName.append(".tlw");
|
||||
|
||||
QDir *dir = new QDir();
|
||||
QString directory = dir->currentPath();
|
||||
//QDir *dir = new QDir();
|
||||
//QString directory = dir->currentPath();
|
||||
|
||||
QString directory = QCoreApplication::applicationDirPath();
|
||||
|
||||
directory.append("/waveforms/");
|
||||
directory.append(newName);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
#include <QDir>
|
||||
#include <QFile>
|
||||
#include "xmega.h"
|
||||
#include <QCoreApplication>
|
||||
|
||||
//functionGenControl is a centralised object to control all of the high-level function gen commands for both channels.
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -47,7 +47,7 @@ void isoDriver::setWindow(int newWindow){
|
|||
}
|
||||
|
||||
void isoDriver::timerTick(void){
|
||||
qDebug() << "isoDriver SEZ Tick!";
|
||||
//qDebug() << "isoDriver SEZ Tick!";
|
||||
if(firstFrame){
|
||||
autoGain();
|
||||
firstFrame = false;
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "buffercontrol.h"
|
||||
#include "ui_elements/buffercontrol.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "cursorenabler.h"
|
||||
#include "ui_elements/cursorenabler.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "deviceconnecteddisplay.h"
|
||||
#include "ui_elements/deviceconnecteddisplay.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "espocombobox.h"
|
||||
#include "ui_elements/espocombobox.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "esposlider.h"
|
||||
#include "ui_elements/esposlider.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "espospinbox.h"
|
||||
#include "ui_elements/espospinbox.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -42,57 +42,57 @@ QT_MOC_LITERAL(9, 191, 25), // "on_actionGain64_triggered"
|
|||
QT_MOC_LITERAL(10, 217, 27), // "on_actionGainAuto_triggered"
|
||||
QT_MOC_LITERAL(11, 245, 31), // "on_actionCursor_Stats_triggered"
|
||||
QT_MOC_LITERAL(12, 277, 7), // "checked"
|
||||
QT_MOC_LITERAL(13, 285, 21), // "connectDisplaySignals"
|
||||
QT_MOC_LITERAL(14, 307, 20), // "on_action300_toggled"
|
||||
QT_MOC_LITERAL(15, 328, 4), // "arg1"
|
||||
QT_MOC_LITERAL(16, 333, 20), // "on_action600_toggled"
|
||||
QT_MOC_LITERAL(17, 354, 21), // "on_action1200_toggled"
|
||||
QT_MOC_LITERAL(18, 376, 21), // "on_action2400_toggled"
|
||||
QT_MOC_LITERAL(19, 398, 21), // "on_action4800_toggled"
|
||||
QT_MOC_LITERAL(20, 420, 21), // "on_action9600_toggled"
|
||||
QT_MOC_LITERAL(21, 442, 22), // "on_action14400_toggled"
|
||||
QT_MOC_LITERAL(22, 465, 22), // "on_action19200_toggled"
|
||||
QT_MOC_LITERAL(23, 488, 22), // "on_action28800_toggled"
|
||||
QT_MOC_LITERAL(24, 511, 22), // "on_action38400_toggled"
|
||||
QT_MOC_LITERAL(25, 534, 22), // "on_action57600_toggled"
|
||||
QT_MOC_LITERAL(26, 557, 23), // "on_action115200_toggled"
|
||||
QT_MOC_LITERAL(27, 581, 22), // "on_action300_2_toggled"
|
||||
QT_MOC_LITERAL(28, 604, 22), // "on_action600_2_toggled"
|
||||
QT_MOC_LITERAL(29, 627, 23), // "on_action1200_2_toggled"
|
||||
QT_MOC_LITERAL(30, 651, 23), // "on_action2400_2_toggled"
|
||||
QT_MOC_LITERAL(31, 675, 23), // "on_action4800_2_toggled"
|
||||
QT_MOC_LITERAL(32, 699, 23), // "on_action9600_2_toggled"
|
||||
QT_MOC_LITERAL(33, 723, 24), // "on_action14400_2_toggled"
|
||||
QT_MOC_LITERAL(34, 748, 24), // "on_action19200_2_toggled"
|
||||
QT_MOC_LITERAL(35, 773, 24), // "on_action28800_2_toggled"
|
||||
QT_MOC_LITERAL(36, 798, 24), // "on_action38400_2_toggled"
|
||||
QT_MOC_LITERAL(37, 823, 24), // "on_action57600_2_toggled"
|
||||
QT_MOC_LITERAL(38, 848, 25), // "on_action115200_2_toggled"
|
||||
QT_MOC_LITERAL(39, 874, 17), // "cycleBaudRate_CH1"
|
||||
QT_MOC_LITERAL(40, 892, 26), // "cycleBaudRateBackwards_CH1"
|
||||
QT_MOC_LITERAL(41, 919, 17), // "cycleBaudRate_CH2"
|
||||
QT_MOC_LITERAL(42, 937, 26), // "cycleBaudRateBackwards_CH2"
|
||||
QT_MOC_LITERAL(43, 964, 21), // "timeBaseNeedsChanging"
|
||||
QT_MOC_LITERAL(44, 986, 8), // "positive"
|
||||
QT_MOC_LITERAL(45, 995, 31), // "on_actionForce_Square_triggered"
|
||||
QT_MOC_LITERAL(46, 1027, 16), // "arrowUpTriggered"
|
||||
QT_MOC_LITERAL(47, 1044, 18), // "arrowDownTriggered"
|
||||
QT_MOC_LITERAL(48, 1063, 20), // "ctrlArrowUpTriggered"
|
||||
QT_MOC_LITERAL(49, 1084, 22), // "ctrlArrowDownTriggered"
|
||||
QT_MOC_LITERAL(50, 1107, 14), // "cycleDelayLeft"
|
||||
QT_MOC_LITERAL(51, 1122, 15), // "cycleDelayRight"
|
||||
QT_MOC_LITERAL(52, 1138, 45), // "on_actionAutomatically_Enable..."
|
||||
QT_MOC_LITERAL(53, 1184, 22), // "on_action60FPS_toggled"
|
||||
QT_MOC_LITERAL(54, 1207, 7), // "enabled"
|
||||
QT_MOC_LITERAL(55, 1215, 22), // "on_action30FPS_toggled"
|
||||
QT_MOC_LITERAL(56, 1238, 22), // "on_action20FPS_toggled"
|
||||
QT_MOC_LITERAL(57, 1261, 22), // "on_action15FPS_toggled"
|
||||
QT_MOC_LITERAL(58, 1284, 22), // "on_action10FPS_toggled"
|
||||
QT_MOC_LITERAL(59, 1307, 21), // "on_action5FPS_toggled"
|
||||
QT_MOC_LITERAL(60, 1329, 26), // "on_actionAuto_Lock_toggled"
|
||||
QT_MOC_LITERAL(61, 1356, 34), // "on_actionSnap_to_Cursors_trig..."
|
||||
QT_MOC_LITERAL(62, 1391, 33), // "on_actionEnter_Manually_trigg..."
|
||||
QT_MOC_LITERAL(63, 1425, 10), // "helloWorld"
|
||||
QT_MOC_LITERAL(13, 285, 45), // "on_actionAutomatically_Enable..."
|
||||
QT_MOC_LITERAL(14, 331, 4), // "arg1"
|
||||
QT_MOC_LITERAL(15, 336, 22), // "on_action60FPS_toggled"
|
||||
QT_MOC_LITERAL(16, 359, 7), // "enabled"
|
||||
QT_MOC_LITERAL(17, 367, 22), // "on_action30FPS_toggled"
|
||||
QT_MOC_LITERAL(18, 390, 22), // "on_action20FPS_toggled"
|
||||
QT_MOC_LITERAL(19, 413, 22), // "on_action15FPS_toggled"
|
||||
QT_MOC_LITERAL(20, 436, 22), // "on_action10FPS_toggled"
|
||||
QT_MOC_LITERAL(21, 459, 21), // "on_action5FPS_toggled"
|
||||
QT_MOC_LITERAL(22, 481, 34), // "on_actionSnap_to_Cursors_trig..."
|
||||
QT_MOC_LITERAL(23, 516, 33), // "on_actionEnter_Manually_trigg..."
|
||||
QT_MOC_LITERAL(24, 550, 21), // "connectDisplaySignals"
|
||||
QT_MOC_LITERAL(25, 572, 20), // "on_action300_toggled"
|
||||
QT_MOC_LITERAL(26, 593, 20), // "on_action600_toggled"
|
||||
QT_MOC_LITERAL(27, 614, 21), // "on_action1200_toggled"
|
||||
QT_MOC_LITERAL(28, 636, 21), // "on_action2400_toggled"
|
||||
QT_MOC_LITERAL(29, 658, 21), // "on_action4800_toggled"
|
||||
QT_MOC_LITERAL(30, 680, 21), // "on_action9600_toggled"
|
||||
QT_MOC_LITERAL(31, 702, 22), // "on_action14400_toggled"
|
||||
QT_MOC_LITERAL(32, 725, 22), // "on_action19200_toggled"
|
||||
QT_MOC_LITERAL(33, 748, 22), // "on_action28800_toggled"
|
||||
QT_MOC_LITERAL(34, 771, 22), // "on_action38400_toggled"
|
||||
QT_MOC_LITERAL(35, 794, 22), // "on_action57600_toggled"
|
||||
QT_MOC_LITERAL(36, 817, 23), // "on_action115200_toggled"
|
||||
QT_MOC_LITERAL(37, 841, 22), // "on_action300_2_toggled"
|
||||
QT_MOC_LITERAL(38, 864, 22), // "on_action600_2_toggled"
|
||||
QT_MOC_LITERAL(39, 887, 23), // "on_action1200_2_toggled"
|
||||
QT_MOC_LITERAL(40, 911, 23), // "on_action2400_2_toggled"
|
||||
QT_MOC_LITERAL(41, 935, 23), // "on_action4800_2_toggled"
|
||||
QT_MOC_LITERAL(42, 959, 23), // "on_action9600_2_toggled"
|
||||
QT_MOC_LITERAL(43, 983, 24), // "on_action14400_2_toggled"
|
||||
QT_MOC_LITERAL(44, 1008, 24), // "on_action19200_2_toggled"
|
||||
QT_MOC_LITERAL(45, 1033, 24), // "on_action28800_2_toggled"
|
||||
QT_MOC_LITERAL(46, 1058, 24), // "on_action38400_2_toggled"
|
||||
QT_MOC_LITERAL(47, 1083, 24), // "on_action57600_2_toggled"
|
||||
QT_MOC_LITERAL(48, 1108, 25), // "on_action115200_2_toggled"
|
||||
QT_MOC_LITERAL(49, 1134, 17), // "cycleBaudRate_CH1"
|
||||
QT_MOC_LITERAL(50, 1152, 26), // "cycleBaudRateBackwards_CH1"
|
||||
QT_MOC_LITERAL(51, 1179, 17), // "cycleBaudRate_CH2"
|
||||
QT_MOC_LITERAL(52, 1197, 26), // "cycleBaudRateBackwards_CH2"
|
||||
QT_MOC_LITERAL(53, 1224, 21), // "timeBaseNeedsChanging"
|
||||
QT_MOC_LITERAL(54, 1246, 8), // "positive"
|
||||
QT_MOC_LITERAL(55, 1255, 31), // "on_actionForce_Square_triggered"
|
||||
QT_MOC_LITERAL(56, 1287, 10), // "helloWorld"
|
||||
QT_MOC_LITERAL(57, 1298, 16), // "arrowUpTriggered"
|
||||
QT_MOC_LITERAL(58, 1315, 18), // "arrowDownTriggered"
|
||||
QT_MOC_LITERAL(59, 1334, 20), // "ctrlArrowUpTriggered"
|
||||
QT_MOC_LITERAL(60, 1355, 22), // "ctrlArrowDownTriggered"
|
||||
QT_MOC_LITERAL(61, 1378, 14), // "cycleDelayLeft"
|
||||
QT_MOC_LITERAL(62, 1393, 15), // "cycleDelayRight"
|
||||
QT_MOC_LITERAL(63, 1409, 26), // "on_actionAuto_Lock_toggled"
|
||||
QT_MOC_LITERAL(64, 1436, 25), // "on_actionRecord_triggered"
|
||||
QT_MOC_LITERAL(65, 1462, 32), // "on_actionTake_Snapshot_triggered"
|
||||
QT_MOC_LITERAL(66, 1495, 9) // "reinitUsb"
|
||||
|
|
@ -108,16 +108,23 @@ QT_MOC_LITERAL(66, 1495, 9) // "reinitUsb"
|
|||
"on_actionGain64_triggered\0"
|
||||
"on_actionGainAuto_triggered\0"
|
||||
"on_actionCursor_Stats_triggered\0checked\0"
|
||||
"on_actionAutomatically_Enable_Cursors_toggled\0"
|
||||
"arg1\0on_action60FPS_toggled\0enabled\0"
|
||||
"on_action30FPS_toggled\0on_action20FPS_toggled\0"
|
||||
"on_action15FPS_toggled\0on_action10FPS_toggled\0"
|
||||
"on_action5FPS_toggled\0"
|
||||
"on_actionSnap_to_Cursors_triggered\0"
|
||||
"on_actionEnter_Manually_triggered\0"
|
||||
"connectDisplaySignals\0on_action300_toggled\0"
|
||||
"arg1\0on_action600_toggled\0"
|
||||
"on_action1200_toggled\0on_action2400_toggled\0"
|
||||
"on_action4800_toggled\0on_action9600_toggled\0"
|
||||
"on_action14400_toggled\0on_action19200_toggled\0"
|
||||
"on_action28800_toggled\0on_action38400_toggled\0"
|
||||
"on_action57600_toggled\0on_action115200_toggled\0"
|
||||
"on_action300_2_toggled\0on_action600_2_toggled\0"
|
||||
"on_action1200_2_toggled\0on_action2400_2_toggled\0"
|
||||
"on_action4800_2_toggled\0on_action9600_2_toggled\0"
|
||||
"on_action600_toggled\0on_action1200_toggled\0"
|
||||
"on_action2400_toggled\0on_action4800_toggled\0"
|
||||
"on_action9600_toggled\0on_action14400_toggled\0"
|
||||
"on_action19200_toggled\0on_action28800_toggled\0"
|
||||
"on_action38400_toggled\0on_action57600_toggled\0"
|
||||
"on_action115200_toggled\0on_action300_2_toggled\0"
|
||||
"on_action600_2_toggled\0on_action1200_2_toggled\0"
|
||||
"on_action2400_2_toggled\0on_action4800_2_toggled\0"
|
||||
"on_action9600_2_toggled\0"
|
||||
"on_action14400_2_toggled\0"
|
||||
"on_action19200_2_toggled\0"
|
||||
"on_action28800_2_toggled\0"
|
||||
|
|
@ -128,17 +135,11 @@ QT_MOC_LITERAL(66, 1495, 9) // "reinitUsb"
|
|||
"cycleBaudRateBackwards_CH2\0"
|
||||
"timeBaseNeedsChanging\0positive\0"
|
||||
"on_actionForce_Square_triggered\0"
|
||||
"arrowUpTriggered\0arrowDownTriggered\0"
|
||||
"ctrlArrowUpTriggered\0ctrlArrowDownTriggered\0"
|
||||
"cycleDelayLeft\0cycleDelayRight\0"
|
||||
"on_actionAutomatically_Enable_Cursors_toggled\0"
|
||||
"on_action60FPS_toggled\0enabled\0"
|
||||
"on_action30FPS_toggled\0on_action20FPS_toggled\0"
|
||||
"on_action15FPS_toggled\0on_action10FPS_toggled\0"
|
||||
"on_action5FPS_toggled\0on_actionAuto_Lock_toggled\0"
|
||||
"on_actionSnap_to_Cursors_triggered\0"
|
||||
"on_actionEnter_Manually_triggered\0"
|
||||
"helloWorld\0on_actionRecord_triggered\0"
|
||||
"helloWorld\0arrowUpTriggered\0"
|
||||
"arrowDownTriggered\0ctrlArrowUpTriggered\0"
|
||||
"ctrlArrowDownTriggered\0cycleDelayLeft\0"
|
||||
"cycleDelayRight\0on_actionAuto_Lock_toggled\0"
|
||||
"on_actionRecord_triggered\0"
|
||||
"on_actionTake_Snapshot_triggered\0"
|
||||
"reinitUsb"
|
||||
};
|
||||
|
|
@ -168,54 +169,54 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
9, 0, 326, 2, 0x08 /* Private */,
|
||||
10, 0, 327, 2, 0x08 /* Private */,
|
||||
11, 1, 328, 2, 0x08 /* Private */,
|
||||
13, 0, 331, 2, 0x08 /* Private */,
|
||||
14, 1, 332, 2, 0x08 /* Private */,
|
||||
16, 1, 335, 2, 0x08 /* Private */,
|
||||
17, 1, 338, 2, 0x08 /* Private */,
|
||||
18, 1, 341, 2, 0x08 /* Private */,
|
||||
19, 1, 344, 2, 0x08 /* Private */,
|
||||
20, 1, 347, 2, 0x08 /* Private */,
|
||||
21, 1, 350, 2, 0x08 /* Private */,
|
||||
22, 1, 353, 2, 0x08 /* Private */,
|
||||
23, 1, 356, 2, 0x08 /* Private */,
|
||||
24, 1, 359, 2, 0x08 /* Private */,
|
||||
25, 1, 362, 2, 0x08 /* Private */,
|
||||
26, 1, 365, 2, 0x08 /* Private */,
|
||||
27, 1, 368, 2, 0x08 /* Private */,
|
||||
28, 1, 371, 2, 0x08 /* Private */,
|
||||
29, 1, 374, 2, 0x08 /* Private */,
|
||||
30, 1, 377, 2, 0x08 /* Private */,
|
||||
31, 1, 380, 2, 0x08 /* Private */,
|
||||
32, 1, 383, 2, 0x08 /* Private */,
|
||||
33, 1, 386, 2, 0x08 /* Private */,
|
||||
34, 1, 389, 2, 0x08 /* Private */,
|
||||
35, 1, 392, 2, 0x08 /* Private */,
|
||||
36, 1, 395, 2, 0x08 /* Private */,
|
||||
37, 1, 398, 2, 0x08 /* Private */,
|
||||
38, 1, 401, 2, 0x08 /* Private */,
|
||||
39, 0, 404, 2, 0x08 /* Private */,
|
||||
40, 0, 405, 2, 0x08 /* Private */,
|
||||
41, 0, 406, 2, 0x08 /* Private */,
|
||||
42, 0, 407, 2, 0x08 /* Private */,
|
||||
43, 1, 408, 2, 0x08 /* Private */,
|
||||
45, 1, 411, 2, 0x08 /* Private */,
|
||||
46, 0, 414, 2, 0x08 /* Private */,
|
||||
47, 0, 415, 2, 0x08 /* Private */,
|
||||
48, 0, 416, 2, 0x08 /* Private */,
|
||||
49, 0, 417, 2, 0x08 /* Private */,
|
||||
50, 0, 418, 2, 0x08 /* Private */,
|
||||
51, 0, 419, 2, 0x08 /* Private */,
|
||||
52, 1, 420, 2, 0x08 /* Private */,
|
||||
53, 1, 423, 2, 0x08 /* Private */,
|
||||
55, 1, 426, 2, 0x08 /* Private */,
|
||||
56, 1, 429, 2, 0x08 /* Private */,
|
||||
57, 1, 432, 2, 0x08 /* Private */,
|
||||
58, 1, 435, 2, 0x08 /* Private */,
|
||||
59, 1, 438, 2, 0x08 /* Private */,
|
||||
60, 1, 441, 2, 0x08 /* Private */,
|
||||
61, 0, 444, 2, 0x08 /* Private */,
|
||||
62, 0, 445, 2, 0x08 /* Private */,
|
||||
63, 0, 446, 2, 0x08 /* Private */,
|
||||
13, 1, 331, 2, 0x08 /* Private */,
|
||||
15, 1, 334, 2, 0x08 /* Private */,
|
||||
17, 1, 337, 2, 0x08 /* Private */,
|
||||
18, 1, 340, 2, 0x08 /* Private */,
|
||||
19, 1, 343, 2, 0x08 /* Private */,
|
||||
20, 1, 346, 2, 0x08 /* Private */,
|
||||
21, 1, 349, 2, 0x08 /* Private */,
|
||||
22, 0, 352, 2, 0x08 /* Private */,
|
||||
23, 0, 353, 2, 0x08 /* Private */,
|
||||
24, 0, 354, 2, 0x08 /* Private */,
|
||||
25, 1, 355, 2, 0x08 /* Private */,
|
||||
26, 1, 358, 2, 0x08 /* Private */,
|
||||
27, 1, 361, 2, 0x08 /* Private */,
|
||||
28, 1, 364, 2, 0x08 /* Private */,
|
||||
29, 1, 367, 2, 0x08 /* Private */,
|
||||
30, 1, 370, 2, 0x08 /* Private */,
|
||||
31, 1, 373, 2, 0x08 /* Private */,
|
||||
32, 1, 376, 2, 0x08 /* Private */,
|
||||
33, 1, 379, 2, 0x08 /* Private */,
|
||||
34, 1, 382, 2, 0x08 /* Private */,
|
||||
35, 1, 385, 2, 0x08 /* Private */,
|
||||
36, 1, 388, 2, 0x08 /* Private */,
|
||||
37, 1, 391, 2, 0x08 /* Private */,
|
||||
38, 1, 394, 2, 0x08 /* Private */,
|
||||
39, 1, 397, 2, 0x08 /* Private */,
|
||||
40, 1, 400, 2, 0x08 /* Private */,
|
||||
41, 1, 403, 2, 0x08 /* Private */,
|
||||
42, 1, 406, 2, 0x08 /* Private */,
|
||||
43, 1, 409, 2, 0x08 /* Private */,
|
||||
44, 1, 412, 2, 0x08 /* Private */,
|
||||
45, 1, 415, 2, 0x08 /* Private */,
|
||||
46, 1, 418, 2, 0x08 /* Private */,
|
||||
47, 1, 421, 2, 0x08 /* Private */,
|
||||
48, 1, 424, 2, 0x08 /* Private */,
|
||||
49, 0, 427, 2, 0x08 /* Private */,
|
||||
50, 0, 428, 2, 0x08 /* Private */,
|
||||
51, 0, 429, 2, 0x08 /* Private */,
|
||||
52, 0, 430, 2, 0x08 /* Private */,
|
||||
53, 1, 431, 2, 0x08 /* Private */,
|
||||
55, 1, 434, 2, 0x08 /* Private */,
|
||||
56, 0, 437, 2, 0x08 /* Private */,
|
||||
57, 0, 438, 2, 0x08 /* Private */,
|
||||
58, 0, 439, 2, 0x08 /* Private */,
|
||||
59, 0, 440, 2, 0x08 /* Private */,
|
||||
60, 0, 441, 2, 0x08 /* Private */,
|
||||
61, 0, 442, 2, 0x08 /* Private */,
|
||||
62, 0, 443, 2, 0x08 /* Private */,
|
||||
63, 1, 444, 2, 0x08 /* Private */,
|
||||
64, 1, 447, 2, 0x08 /* Private */,
|
||||
65, 0, 450, 2, 0x08 /* Private */,
|
||||
66, 0, 451, 2, 0x08 /* Private */,
|
||||
|
|
@ -231,36 +232,45 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 12,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 16,
|
||||
QMetaType::Void, QMetaType::Bool, 16,
|
||||
QMetaType::Void, QMetaType::Bool, 16,
|
||||
QMetaType::Void, QMetaType::Bool, 16,
|
||||
QMetaType::Void, QMetaType::Bool, 16,
|
||||
QMetaType::Void, QMetaType::Bool, 16,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 44,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 12,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
|
|
@ -268,17 +278,8 @@ static const uint qt_meta_data_MainWindow[] = {
|
|||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 54,
|
||||
QMetaType::Void, QMetaType::Bool, 15,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void, QMetaType::Bool, 14,
|
||||
QMetaType::Void, QMetaType::Bool, 12,
|
||||
QMetaType::Void,
|
||||
QMetaType::Void,
|
||||
|
|
@ -302,54 +303,54 @@ void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id,
|
|||
case 7: _t->on_actionGain64_triggered(); break;
|
||||
case 8: _t->on_actionGainAuto_triggered(); break;
|
||||
case 9: _t->on_actionCursor_Stats_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 10: _t->connectDisplaySignals(); break;
|
||||
case 11: _t->on_action300_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 12: _t->on_action600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 13: _t->on_action1200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 14: _t->on_action2400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 15: _t->on_action4800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 16: _t->on_action9600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 17: _t->on_action14400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 18: _t->on_action19200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 19: _t->on_action28800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 20: _t->on_action38400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 21: _t->on_action57600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 22: _t->on_action115200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 23: _t->on_action300_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 24: _t->on_action600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 25: _t->on_action1200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 26: _t->on_action2400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 27: _t->on_action4800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 28: _t->on_action9600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 29: _t->on_action14400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 30: _t->on_action19200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 31: _t->on_action28800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 32: _t->on_action38400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 33: _t->on_action57600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 34: _t->on_action115200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 35: _t->cycleBaudRate_CH1(); break;
|
||||
case 36: _t->cycleBaudRateBackwards_CH1(); break;
|
||||
case 37: _t->cycleBaudRate_CH2(); break;
|
||||
case 38: _t->cycleBaudRateBackwards_CH2(); break;
|
||||
case 39: _t->timeBaseNeedsChanging((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 40: _t->on_actionForce_Square_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 41: _t->arrowUpTriggered(); break;
|
||||
case 42: _t->arrowDownTriggered(); break;
|
||||
case 43: _t->ctrlArrowUpTriggered(); break;
|
||||
case 44: _t->ctrlArrowDownTriggered(); break;
|
||||
case 45: _t->cycleDelayLeft(); break;
|
||||
case 46: _t->cycleDelayRight(); break;
|
||||
case 47: _t->on_actionAutomatically_Enable_Cursors_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 48: _t->on_action60FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 49: _t->on_action30FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 50: _t->on_action20FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 51: _t->on_action15FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 52: _t->on_action10FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 53: _t->on_action5FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 54: _t->on_actionAuto_Lock_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 55: _t->on_actionSnap_to_Cursors_triggered(); break;
|
||||
case 56: _t->on_actionEnter_Manually_triggered(); break;
|
||||
case 57: _t->helloWorld(); break;
|
||||
case 10: _t->on_actionAutomatically_Enable_Cursors_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 11: _t->on_action60FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 12: _t->on_action30FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 13: _t->on_action20FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 14: _t->on_action15FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 15: _t->on_action10FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 16: _t->on_action5FPS_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 17: _t->on_actionSnap_to_Cursors_triggered(); break;
|
||||
case 18: _t->on_actionEnter_Manually_triggered(); break;
|
||||
case 19: _t->connectDisplaySignals(); break;
|
||||
case 20: _t->on_action300_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 21: _t->on_action600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 22: _t->on_action1200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 23: _t->on_action2400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 24: _t->on_action4800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 25: _t->on_action9600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 26: _t->on_action14400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 27: _t->on_action19200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 28: _t->on_action28800_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 29: _t->on_action38400_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 30: _t->on_action57600_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 31: _t->on_action115200_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 32: _t->on_action300_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 33: _t->on_action600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 34: _t->on_action1200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 35: _t->on_action2400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 36: _t->on_action4800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 37: _t->on_action9600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 38: _t->on_action14400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 39: _t->on_action19200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 40: _t->on_action28800_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 41: _t->on_action38400_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 42: _t->on_action57600_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 43: _t->on_action115200_2_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 44: _t->cycleBaudRate_CH1(); break;
|
||||
case 45: _t->cycleBaudRateBackwards_CH1(); break;
|
||||
case 46: _t->cycleBaudRate_CH2(); break;
|
||||
case 47: _t->cycleBaudRateBackwards_CH2(); break;
|
||||
case 48: _t->timeBaseNeedsChanging((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 49: _t->on_actionForce_Square_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 50: _t->helloWorld(); break;
|
||||
case 51: _t->arrowUpTriggered(); break;
|
||||
case 52: _t->arrowDownTriggered(); break;
|
||||
case 53: _t->ctrlArrowUpTriggered(); break;
|
||||
case 54: _t->ctrlArrowDownTriggered(); break;
|
||||
case 55: _t->cycleDelayLeft(); break;
|
||||
case 56: _t->cycleDelayRight(); break;
|
||||
case 57: _t->on_actionAuto_Lock_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 58: _t->on_actionRecord_triggered((*reinterpret_cast< bool(*)>(_a[1]))); break;
|
||||
case 59: _t->on_actionTake_Snapshot_triggered(); break;
|
||||
case 60: _t->reinitUsb(); break;
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "noclosemenu.h"
|
||||
#include "ui_elements/noclosemenu.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "qcustomplot.h"
|
||||
#include "ui_elements/qcustomplot.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#include <QtCore/QList>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "timedtickbox.h"
|
||||
#include "ui_elements/timedtickbox.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
#include "voltagespinbox.h"
|
||||
#include "ui_elements/voltagespinbox.h"
|
||||
#include <QtCore/qbytearray.h>
|
||||
#include <QtCore/qmetatype.h>
|
||||
#if !defined(Q_MOC_OUTPUT_REVISION)
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ void espoComboBox::readWaveformList(void)
|
|||
{
|
||||
//This code gets the name of the current directory, regardless of platform.
|
||||
//This is so the interface knows where to find the waveform data
|
||||
QDir *dir = new QDir();
|
||||
qDebug() << dir->currentPath();
|
||||
QString dirString = dir->currentPath();
|
||||
//QDir *dir = new QDir();
|
||||
//qDebug() << dir->currentPath();
|
||||
QString dirString = QCoreApplication::applicationDirPath();
|
||||
dirString.append("/waveforms/_list.wfl");
|
||||
QByteArray array = dirString.toLocal8Bit();
|
||||
char* buffer = array.data();
|
||||
|
|
|
|||
|
|
@ -68,11 +68,11 @@ unsigned char unixUsbDriver::usbInit(unsigned long VIDin, unsigned long PIDin){
|
|||
}
|
||||
|
||||
void unixUsbDriver::usbSendControl(uint8_t RequestType, uint8_t Request, uint16_t Value, uint16_t Index, uint16_t Length, unsigned char *LDATA){
|
||||
qDebug("Sending Control packet! 0x%x,\t0x%x,\t%u,\t%u,\t%d,\t%u", RequestType, Request, Value, Index, LDATA, Length);
|
||||
//qDebug("Sending Control packet! 0x%x,\t0x%x,\t%u,\t%u,\t%d,\t%u", RequestType, Request, Value, Index, LDATA, Length);
|
||||
int error = libusb_control_transfer(handle, RequestType, Request, Value, Index, LDATA, Length, 4000);
|
||||
if(error){
|
||||
qDebug("unixUsbDriver::usbSendControl FAILED with error %s", libusb_error_name(error));
|
||||
} else qDebug() << "unixUsbDriver::usbSendControl SUCCESS";
|
||||
} //else qDebug() << "unixUsbDriver::usbSendControl SUCCESS";
|
||||
if(error == LIBUSB_ERROR_NO_DEVICE){
|
||||
qDebug() << "Device not found. Becoming an hero.";
|
||||
killMe();
|
||||
|
|
@ -176,7 +176,7 @@ void unixUsbDriver::isoTimerTick(void){
|
|||
char *unixUsbDriver::isoRead(unsigned int *newLength){
|
||||
//*(newLength) = 0;
|
||||
//return (char*) NULL;
|
||||
qDebug() << "unixUsbDriver::isoRead";
|
||||
//qDebug() << "unixUsbDriver::isoRead";
|
||||
*(newLength) = bufferLengths[!currentWriteBuffer];
|
||||
return (char*) outBuffers[(unsigned char) !currentWriteBuffer];
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue