diff --git a/rigcommander.cpp b/rigcommander.cpp index bab57b4..be5ac0e 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -139,7 +139,8 @@ void rigCommander::commSetup(unsigned char rigCivAddr, udpPreferences prefs, aud connect(this, SIGNAL(discoveredRigID(rigCapabilities)), ptty, SLOT(receiveFoundRigID(rigCapabilities))); connect(udp, SIGNAL(requestRadioSelection(QList)), this, SLOT(radioSelection(QList))); - connect(udp, SIGNAL(setRadioUsage(int, QString, QString)), this, SLOT(radioUsage(int, QString, QString))); + connect(udp, SIGNAL(setRadioUsage(int, bool, QString, QString)), this, SLOT(radioUsage(int, bool, QString, QString))); + connect(this, SIGNAL(selectedRadio(int)), udp, SLOT(setCurrentRadio(int))); emit haveAfGain(rxSetup.localAFgain); localVolume = rxSetup.localAFgain; } @@ -4284,10 +4285,13 @@ void rigCommander::radioSelection(QList radios) emit requestRadioSelection(radios); } -void rigCommander::radioUsage(int radio, QString user, QString ip) { - emit setRadioUsage(radio, user, ip); +void rigCommander::radioUsage(int radio, bool busy, QString user, QString ip) { + emit setRadioUsage(radio, busy, user, ip); } +void rigCommander::setCurrentRadio(int radio) { + emit selectedRadio(radio); +} void rigCommander::stateUpdated() { diff --git a/rigcommander.h b/rigcommander.h index c22c7a3..d867341 100644 --- a/rigcommander.h +++ b/rigcommander.h @@ -274,7 +274,8 @@ public slots: // Housekeeping: void handleStatusUpdate(const QString text); void radioSelection(QList radios); - void radioUsage(int radio, QString name, QString ip); + void radioUsage(int radio, bool busy, QString name, QString ip); + void setCurrentRadio(int radio); void sendState(); void getDebug(); @@ -368,7 +369,8 @@ signals: // Housekeeping: void requestRadioSelection(QList radios); - void setRadioUsage(int radio, QString user, QString ip); + void setRadioUsage(int radio, bool busy, QString user, QString ip); + void selectedRadio(int radio); void getMoreDebug(); void finished(); diff --git a/selectradio.cpp b/selectradio.cpp index a815190..94c4429 100644 --- a/selectradio.cpp +++ b/selectradio.cpp @@ -18,16 +18,24 @@ selectRadio::~selectRadio() void selectRadio::populate(QList radios) { ui->table->clearContents(); + for (int row = ui->table->rowCount() - 1;row>=0; row--) { + ui->table->removeRow(row); + } + for (int row = 0; row < radios.count(); row++) { ui->table->insertRow(ui->table->rowCount()); - ui->table->setItem(ui->table->rowCount() - 1, 0, new QTableWidgetItem(QString(radios[row].name))); - ui->table->setItem(ui->table->rowCount() - 1, 1, new QTableWidgetItem(QString("%1").arg((unsigned char)radios[row].civ, 2, 16, QLatin1Char('0')).toUpper())); - ui->table->setItem(ui->table->rowCount() - 1, 2, new QTableWidgetItem(QString::number(qFromBigEndian(radios[row].baudrate)))); + ui->table->setItem(row, 0, new QTableWidgetItem(QString(radios[row].name))); + ui->table->setItem(row, 1, new QTableWidgetItem(QString("%1").arg((unsigned char)radios[row].civ, 2, 16, QLatin1Char('0')).toUpper())); + ui->table->setItem(row, 2, new QTableWidgetItem(QString::number(qFromBigEndian(radios[row].baudrate)))); } } -void selectRadio::setInUse(int radio, QString user, QString ip) +void selectRadio::setInUse(int radio, bool busy, QString user, QString ip) { + if ((radio > 0)&& !this->isVisible()) { + qInfo() << "setInUse: radio:" << radio <<"busy" << busy << "user" << user << "ip"<setVisible(true); + } ui->table->setItem(radio, 3, new QTableWidgetItem(user)); ui->table->setItem(radio, 4, new QTableWidgetItem(ip)); } @@ -36,7 +44,10 @@ void selectRadio::on_table_cellClicked(int row, int col) { qInfo() << "Clicked on " << row << "," << col; ui->table->selectRow(row); emit selectedRadio(row); + this->setVisible(false); } -void selectRadio::on_table_sectionClicked(int index) { - qInfo() << "Section Clicked" << index; + + +void selectRadio::on_cancelButton_clicked() { + this->setVisible(false); } diff --git a/selectradio.h b/selectradio.h index d823670..3175616 100644 --- a/selectradio.h +++ b/selectradio.h @@ -22,8 +22,8 @@ public: public slots: void on_table_cellClicked(int row, int col); - void on_table_sectionClicked(int index); - void setInUse(int radio, QString user, QString ip); + void setInUse(int radio, bool busy, QString user, QString ip); + void on_cancelButton_clicked(); signals: void selectedRadio(int radio); diff --git a/selectradio.ui b/selectradio.ui index e73b123..10e347a 100644 --- a/selectradio.ui +++ b/selectradio.ui @@ -49,7 +49,7 @@ true - true + false diff --git a/udphandler.cpp b/udphandler.cpp index 651322a..7795494 100644 --- a/udphandler.cpp +++ b/udphandler.cpp @@ -327,12 +327,12 @@ void udpHandler::dataReceived() conninfo_packet_t in = (conninfo_packet_t)r.constData(); QHostAddress ip = QHostAddress(qToBigEndian(in->ipaddress)); - qInfo(logUdp()) << "Got Connection status for:" << in->name << "Computer" << in->computer << "User" << in->username << "IP" << ip.toString() << "GUID" << in->guid; + qInfo(logUdp()) << "Got Connection status for:" << in->name << "Busy:" << in->busy << "Computer" << in->computer << "IP" << ip.toString() << "GUID" << in->guid; // First we need to find this radio in our capabilities packet, there aren't many so just step through for (int f = 0; f < radios.length(); f++) { - if ((radios[f].commoncap == 0x8010 && + if ((radios[f].commoncap == 0x8010 && radios[f].macaddress[0] == in->macaddress[0] && radios[f].macaddress[1] == in->macaddress[1] && radios[f].macaddress[2] == in->macaddress[2] && @@ -341,14 +341,12 @@ void udpHandler::dataReceived() radios[f].macaddress[5] == in->macaddress[5]) || (QUuid)radios[f].guid == (QUuid)in->guid) { - emit setRadioUsage(f,QString(in->computer),ip.toString()); + emit setRadioUsage(f, (bool)in->busy, QString(in->computer), ip.toString()); } } - if (in->type != 0x01 && numRadios == 1) { + if (in->type != 0x01 && !streamOpened) { - devName = in->name; - QHostAddress ip = QHostAddress(qToBigEndian(in->ipaddress)); - if (!streamOpened && in->busy) + if (!streamOpened && in->busy && numRadios == 1 ) { if (in->ipaddress != 0x00 && strcmp(in->computer, compName.toLocal8Bit())) { @@ -356,32 +354,7 @@ void udpHandler::dataReceived() sendControl(false, 0x00, in->seq); // Respond with an idle } else { - civ = new udpCivData(localIP, radioIP, civPort); - - // TX is not supported - if (txSampleRates <2 ) { - txSetup.samplerate = 0; - txSetup.codec = 0; - } - - audio = new udpAudio(localIP, radioIP, audioPort, rxSetup, txSetup); - - QObject::connect(civ, SIGNAL(receive(QByteArray)), this, SLOT(receiveFromCivStream(QByteArray))); - QObject::connect(audio, SIGNAL(haveAudioData(audioPacket)), this, SLOT(receiveAudioData(audioPacket))); - QObject::connect(this, SIGNAL(haveChangeLatency(quint16)), audio, SLOT(changeLatency(quint16))); - QObject::connect(this, SIGNAL(haveSetVolume(unsigned char)), audio, SLOT(setVolume(unsigned char))); - - streamOpened = true; - - emit haveNetworkStatus(devName); - - qInfo(logUdp()) << this->metaObject()->className() << "Got serial and audio request success, device name: " << devName; - - // Stuff can change in the meantime because of a previous login... - remoteId = in->sentid; - myId = in->rcvdid; - tokRequest = in->tokrequest; - token = in->token; + setCurrentRadio(0); } } else if (!streamOpened && !in->busy) @@ -389,7 +362,6 @@ void udpHandler::dataReceived() emit haveNetworkStatus(devName + " available"); memcpy(macaddress, in->macaddress, 6); - sendRequestStream(); } else if (streamOpened) @@ -411,7 +383,6 @@ void udpHandler::dataReceived() break; } - int baudrate = 0; capabilities_packet_t in = (capabilities_packet_t)r.constData(); numRadios = in->numradios; @@ -420,11 +391,6 @@ void udpHandler::dataReceived() radio_cap_packet rad; const char* tmpRad = r.constData(); memcpy(&rad, tmpRad+f, RADIO_CAP_SIZE); - devName = rad.name; - audioType = rad.audio; - civId = rad.civ; - rxSampleRates = rad.rxsample; - txSampleRates = rad.txsample; radios.append(rad); } for(const radio_cap_packet radio : radios) @@ -442,11 +408,8 @@ void udpHandler::dataReceived() // GUID not MAC address qInfo(logUdp()) << this->metaObject()->className() << "Radio GUID" << radio.guid; } - - baudrate = qFromBigEndian(radio.baudrate); } emit requestRadioSelection(radios); - emit haveBaudRate(baudrate); break; } @@ -460,6 +423,52 @@ void udpHandler::dataReceived() } +void udpHandler::setCurrentRadio(int radio) { + if (!streamOpened) { + qInfo(logUdp()) << "Got Radio" << radio; + int baudrate = qFromBigEndian(radios[radio].baudrate); + emit haveBaudRate(baudrate); + + if (radios[radio].commoncap == 0x8010) { + memcpy(macaddress, radios[radio].macaddress, 6); + useGuid = false; + } + else { + useGuid = true; + guid = radios[radio].guid; + } + + devName =radios[radio].name; + audioType = radios[radio].audio; + civId = radios[radio].civ; + rxSampleRates = radios[radio].rxsample; + txSampleRates = radios[radio].txsample; + + civ = new udpCivData(localIP, radioIP, civPort); + + // TX is not supported + if (txSampleRates < 2) { + txSetup.samplerate = 0; + txSetup.codec = 0; + } + + audio = new udpAudio(localIP, radioIP, audioPort, rxSetup, txSetup); + + QObject::connect(civ, SIGNAL(receive(QByteArray)), this, SLOT(receiveFromCivStream(QByteArray))); + QObject::connect(audio, SIGNAL(haveAudioData(audioPacket)), this, SLOT(receiveAudioData(audioPacket))); + QObject::connect(this, SIGNAL(haveChangeLatency(quint16)), audio, SLOT(changeLatency(quint16))); + QObject::connect(this, SIGNAL(haveSetVolume(unsigned char)), audio, SLOT(setVolume(unsigned char))); + + streamOpened = true; + emit haveNetworkStatus(devName); + + qInfo(logUdp()) << this->metaObject()->className() << "Got serial and audio request success, device name: " << devName; + + sendRequestStream(); + } +} + + void udpHandler::sendRequestStream() { @@ -473,8 +482,13 @@ void udpHandler::sendRequestStream() p.rcvdid = remoteId; p.code = 0x0180; p.res = 0x03; - p.commoncap = 0x8010; - memcpy(p.macaddress, macaddress, 6); + if (!useGuid) { + p.commoncap = 0x8010; + memcpy(p.macaddress, macaddress, 6); + } + else { + p.guid = guid; + } p.innerseq = authSeq++; p.tokrequest = tokRequest; p.token = token; diff --git a/udphandler.h b/udphandler.h index 28cbd8e..8f1e094 100644 --- a/udphandler.h +++ b/udphandler.h @@ -219,6 +219,8 @@ public slots: void changeLatency(quint16 value); void setVolume(unsigned char value); void init(); + void setCurrentRadio(int radio); + signals: void haveDataFromPort(QByteArray data); // emit this when we have data, connect to rigcommander @@ -229,7 +231,7 @@ signals: void haveNetworkStatus(QString); void haveBaudRate(quint32 baudrate); void requestRadioSelection(QList radios); - void setRadioUsage(int, QString name, QString mac); + void setRadioUsage(int, bool busy, QString name, QString mac); private: void sendAreYouThere(); @@ -265,7 +267,8 @@ private: quint32 token; // These are for stream ident info. quint8 macaddress[8]; - + GUID guid; + bool useGuid = false; QByteArray usernameEncoded; QByteArray passwordEncoded; diff --git a/wfmain.cpp b/wfmain.cpp index a3d866b..8ff92af 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -422,8 +422,8 @@ void wfmain::makeRig() connect(rig, SIGNAL(haveSerialPortError(QString, QString)), this, SLOT(receiveSerialPortError(QString, QString))); connect(rig, SIGNAL(haveStatusUpdate(QString)), this, SLOT(receiveStatusUpdate(QString))); connect(rig, SIGNAL(requestRadioSelection(QList)), this, SLOT(radioSelection(QList))); - connect(rig, SIGNAL(setRadioUsage(int, QString, QString)), selRad, SLOT(setInUse(int, QString, QString))); - + connect(rig, SIGNAL(setRadioUsage(int, bool, QString, QString)), selRad, SLOT(setInUse(int, bool, QString, QString))); + connect(selRad, SIGNAL(selectedRadio(int)), rig, SLOT(setCurrentRadio(int))); // Rig comm setup: connect(this, SIGNAL(sendCommSetup(unsigned char, udpPreferences, audioSetup, audioSetup, QString)), rig, SLOT(commSetup(unsigned char, udpPreferences, audioSetup, audioSetup, QString))); connect(this, SIGNAL(sendCommSetup(unsigned char, QString, quint32,QString)), rig, SLOT(commSetup(unsigned char, QString, quint32,QString))); @@ -5755,7 +5755,18 @@ void wfmain::on_setClockBtn_clicked() void wfmain::radioSelection(QList radios) { selRad->populate(radios); - selRad->setVisible(true); +} + +void wfmain::on_radioStatusBtn_clicked() +{ + if (selRad->isVisible()) + { + selRad->hide(); + } + else + { + selRad->show(); + } } // --- DEBUG FUNCTION --- diff --git a/wfmain.h b/wfmain.h index 23c8900..ec31871 100644 --- a/wfmain.h +++ b/wfmain.h @@ -523,6 +523,8 @@ private slots: void on_useRTSforPTTchk_clicked(bool checked); + void on_radioStatusBtn_clicked(); + private: Ui::wfmain *ui; void closeEvent(QCloseEvent *event); diff --git a/wfmain.ui b/wfmain.ui index a938ee3..ffd25f3 100644 --- a/wfmain.ui +++ b/wfmain.ui @@ -3634,6 +3634,13 @@ + + + + Radio Status + + + @@ -3671,7 +3678,7 @@ 0 0 946 - 22 + 21 diff --git a/wfview.pro b/wfview.pro index fe040fb..9128711 100644 --- a/wfview.pro +++ b/wfview.pro @@ -105,9 +105,9 @@ unix:target.path = $$PREFIX/bin INSTALLS += target # Why doesn't this seem to do anything? -DISTFILES += resources/wfview.png \ +unix:DISTFILES += resources/wfview.png \ resources/install.sh -DISTFILES += resources/wfview.desktop +unix:DISTFILES += resources/wfview.desktop unix:applications.files = resources/wfview.desktop unix:applications.path = $$PREFIX/share/applications diff --git a/wfview.sln b/wfview.sln index d1ee00c..ff4a8cd 100644 --- a/wfview.sln +++ b/wfview.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wfview", "wfview.vcxproj", "{326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wfserver", "wfserver.vcxproj", "{00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x86 = Debug|x86 @@ -17,10 +15,6 @@ Global {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Debug|x86.Build.0 = Debug|Win32 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x86.ActiveCfg = Release|Win32 {326108AD-FA9D-3AAF-8D3E-062C4DDC34E2}.Release|x86.Build.0 = Release|Win32 - {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Debug|x86.ActiveCfg = Debug|Win32 - {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Debug|x86.Build.0 = Debug|Win32 - {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|x86.ActiveCfg = Release|Win32 - {00E054F8-A1D4-3ECA-A8D6-DFC8A68AFD56}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/wfview.vcxproj b/wfview.vcxproj index 359ba8e..37ea711 100644 --- a/wfview.vcxproj +++ b/wfview.vcxproj @@ -16,8 +16,7 @@ QtVS_v304 10.0.19041.0 10.0.19041.0 - $(MSBuildProjectDirectory)\QtMsBuild - + $(MSBuildProjectDirectory)\QtMsBuild v142 @@ -37,10 +36,7 @@ debug\ wfview - - - - + @@ -48,34 +44,8 @@ - - - - - - debug\ - debug\ - wfview - true - - - release\ - release\ - wfview - true - false - - - msvc2019 - core;network;gui;multimedia;widgets;serialport;printsupport - - - msvc2019 - core;network;gui;multimedia;widgets;serialport;printsupport - - - - + debug\debug\wfviewtruerelease\release\wfviewtruefalsemsvc2019core;network;gui;multimedia;widgets;serialport;printsupportmsvc2019core;network;gui;multimedia;widgets;serialport;printsupport + .;..\qcustomplot;..\opus\include;resampler;release;/include;%(AdditionalIncludeDirectories) @@ -87,16 +57,14 @@ Sync release\ MaxSpeed - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="9f059c9";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="41e90bb";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions) false - - + MultiThreadedDLL true true Level3 - true - + true ..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies) ..\opus\win32\VS2015\Win32\Release;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) @@ -117,28 +85,9 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.2d\";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"9f059c9\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.2d\";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"41e90bb\";HOST=\"wfview.org\";UNAME=\"build\";NDEBUG;QT_NO_DEBUG;QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) - - msvc - ./$(Configuration)/moc_predefs.h - Moc'ing %(Identity)... - output - $(Configuration) - moc_%(Filename).cpp - - - default - Rcc'ing %(Identity)... - $(Configuration) - qrc_%(Filename).cpp - - - Uic'ing %(Identity)... - $(ProjectDir) - ui_%(Filename).h - - + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h .;..\qcustomplot;..\opus\include;resampler;debug;/include;%(AdditionalIncludeDirectories) @@ -150,14 +99,13 @@ Sync debug\ Disabled - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="9f059c9";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION="1.2d";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX="/usr/local";GITSHORT="41e90bb";HOST="wfview.org";UNAME="build";%(PreprocessorDefinitions) false MultiThreadedDebugDLL true true Level3 - true - + true ..\opus\win32\VS2015\Win32\Debug\opus.lib;shell32.lib;%(AdditionalDependencies) ..\opus\win32\VS2015\Win32\Debug;C:\opensslx86\lib;C:\Utils\my_sql\mysql-5.7.25-win32\lib;C:\Utils\postgresqlx86\pgsql\lib;%(AdditionalLibraryDirectories) @@ -176,28 +124,9 @@ 0 - _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.2d\";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"9f059c9\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WFVIEW_VERSION=\"1.2d\";BUILD_WFVIEW;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_COMPILE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;PREFIX=\"/usr/local\";GITSHORT=\"41e90bb\";HOST=\"wfview.org\";UNAME=\"build\";QT_MULTIMEDIA_LIB;QT_PRINTSUPPORT_LIB;QT_WIDGETS_LIB;QT_GUI_LIB;QT_SERIALPORT_LIB;QT_NETWORK_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) - - msvc - ./$(Configuration)/moc_predefs.h - Moc'ing %(Identity)... - output - $(Configuration) - moc_%(Filename).cpp - - - default - Rcc'ing %(Identity)... - $(Configuration) - qrc_%(Filename).cpp - - - Uic'ing %(Identity)... - $(ProjectDir) - ui_%(Filename).h - - + msvc./$(Configuration)/moc_predefs.hMoc'ing %(Identity)...output$(Configuration)moc_%(Filename).cppdefaultRcc'ing %(Identity)...$(Configuration)qrc_%(Filename).cppUic'ing %(Identity)...$(ProjectDir)ui_%(Filename).h @@ -225,51 +154,198 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + Document true @@ -286,22 +362,119 @@ release\moc_predefs.h;%(Outputs) true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + @@ -335,16 +508,30 @@ - resources - resources - + + + + + + + + + + resourcesresources - style - style - + + + + + + + + + + stylestyle @@ -355,17 +542,9 @@ - - - - - - - - - + \ No newline at end of file diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters index d28d498..a756bf0 100644 --- a/wfview.vcxproj.filters +++ b/wfview.vcxproj.filters @@ -45,16 +45,6 @@ {4FC737F1-C7A5-4376-A066-2A32D752A2FF} cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - {B83CAF91-C7BF-462F-B76C-EA11631F866C} - * - false - - - {B83CAF91-C7BF-462F-B76C-EA11631F866C} - * - false - @@ -111,6 +101,9 @@ Source Files + + Source Files + Source Files @@ -123,9 +116,6 @@ Source Files - - Generated Files - @@ -191,6 +181,9 @@ Header Files + + Header Files + Header Files @@ -209,17 +202,59 @@ Header Files - - Generated Files - + + + + + + + + + + Generated Files Generated Files + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -234,18 +269,15 @@ Form Files + + Form Files + Form Files - - Form Files - Form Files - - Form Files - @@ -377,21 +409,8 @@ Resource Files - - - - Distribution Files - - - Distribution Files - - - Distribution Files - - - - + \ No newline at end of file diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user index a638198..f5fbdbc 100644 --- a/wfview.vcxproj.user +++ b/wfview.vcxproj.user @@ -7,9 +7,9 @@ PATH=$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(QTDIR)\bin%3bC:\QT\5.15.2\MSVC2019\bin%3b$(PATH) - 2021-11-22T18:24:33.3752914Z + 2022-01-21T23:07:22.7167866Z - 2021-11-22T18:24:41.6960953Z + 2022-01-21T23:07:24.1030588Z \ No newline at end of file