Skip to content

Commit

Permalink
Added plugins support, GUIv2 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Tsukihime
Tsukihime committed Sep 26, 2014
1 parent 0a8be01 commit 46d28ee
Show file tree
Hide file tree
Showing 21 changed files with 722 additions and 1,358 deletions.
15 changes: 14 additions & 1 deletion Sources/ExpertSDR_vA2_1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1942,6 +1942,7 @@ bool ExpertSDR_vA2_1::writeSettings()
settings.endGroup();
settings.beginGroup("OptionsWindow");
settings.setValue("Position", pOpt->pos());
settings.setValue("SDRPluginIndex", pOpt->ui.cbSdrType->currentIndex());
settings.setValue("Audio_Driver", pOpt->ui.cbPaDriver->currentIndex());
settings.setValue("Audio_Input", pOpt->ui.cbPaIn->currentIndex());
settings.setValue("Audio_Output", pOpt->ui.cbPaOut->currentIndex());
Expand Down Expand Up @@ -3067,6 +3068,10 @@ void ExpertSDR_vA2_1::readSettings()

settings.beginGroup("OptionsWindow");
pOpt->move(settings.value("Position", QPoint(200, 200)).toPoint());

int SDRPluginIndex = settings.value("SDRPluginIndex", 0).toInt();
pOpt->ui.cbSdrType->setCurrentIndex(SDRPluginIndex);

tmpIValue = settings.value("Audio_Driver", 0).toInt();
if(tmpIValue < 0 || tmpIValue > 1)
{
Expand Down Expand Up @@ -4521,14 +4526,19 @@ void ExpertSDR_vA2_1::OnOptChangeWindow(int Window)

void ExpertSDR_vA2_1::OnStart(bool Start)
{
if(pOpt->ui.cbSdrType->currentIndex() == 0)
if(/*pOpt->ui.cbSdrType->currentIndex() == 0*/ true)
{
if(Start)
{
if(isStarted == true)
return;
isStarted = true;
pOpt->ui.cbSdrType->setEnabled(false);

int plugidx = pOpt->ui.cbSdrType->currentIndex();
QString plugpath = pOpt->ui.cbSdrType->itemData(plugidx).toString();
pSdrCtrl->onSdrPluginChanged(plugpath);

OnLock(ui.pbLock->isChecked());
if(pMem->isWavPlay())
{
Expand Down Expand Up @@ -4563,6 +4573,9 @@ void ExpertSDR_vA2_1::OnStart(bool Start)
pDsp->SetRxOsc((float)(-pGraph->pGl->GetFilter()));
pDsp->SetTxLevelerTop(3.162278);

SetVhfOsc(pOpt->ui.sbVhfOsc->value());
SetUhfOsc(pOpt->ui.sbUhfOsc->value());

pSdrCtrl->SetSdrType((SDR_DEVICE)pOpt->ui.cbSdrType->currentIndex());
pSdrCtrl->setMute(ui.pbMute->isChecked());
if(pSdrCtrl->Start() != 0)
Expand Down
284 changes: 142 additions & 142 deletions Sources/ExpertSDR_vA2_1.pro
View file
Original file line number Diff line number Diff line change
@@ -1,142 +1,142 @@
TEMPLATE = app
TARGET = ExpertSDR

VERSION = 2.1.4.21

TRANSLATIONS = ExpertSDR_ru.ts
QT += core \
gui \
network \
opengl

HEADERS += CalibrateSC/Calibrator/CalibrProc.h \
CalibrateSC/Calibrator/Calibrator.h \
Wav/fileList.h \
Wav/wavSample.h \
WavReader.h \
SmeterGUI/ColorWgt.h \
SmeterGUI/SMeterOptions.h \
SmeterGUI/SMeterSDR.h \
AudioThread.h \
scale/Scale.h \
scale/ScaleNum.h \
CW/CwCore.h \
CW/CwMacro.h \
CW/CwTimer.h \
CW/correctIQ.h \
Vac.h \
ringBuf.h \
Cat/ExtSerialPort/qextserialbase.h \
Cat/ExtSerialPort/qextserialenumerator.h \
Cat/ExtSerialPort/qextserialport.h \
Cat/ExtSerialPort/win_qextserialport.h \
SdrPlugin/PortAudio/pa19.h \
SdrPlugin/PortAudio/portaudio.h \
Valcoder/HID/Ea1dev.h \
Valcoder/Panel.h \
S-Meter/Number2.h \
S-Meter/Number.h \
S-Meter/Draw.h \
S-Meter/S_Meter.h \
PanaramDefines.h \
Panarama.h \
PanoramOpt.h \
ThreadFunc.h \
About.h \
CalibrateSC/progresscalibrate.h \
Cat/CatManager.h \
Defines.h \
DttSP.h \
ExpertSDR_vA2_1.h \
FreqScale/Didgit.h \
Options.h \
SMeter.h \
SdrPlugin/SdrPlugin.h \
SdrPlugin/SunSDR/sunCtrl.h \
WdgAddStation.h \
WdgGraph.h \
WdgMem.h \
Wav/VoiceRecorderWave.h \
Logger/VLogger.h \
Resampler.h \
Timer/Timer.h \
RingResampler/RingResampler.h \
RingResampler/RingBuffer.h
SOURCES += CalibrateSC/Calibrator/CalibrProc.cpp \
CalibrateSC/Calibrator/Calibrator.cpp \
Wav/fileList.cpp \
Wav/wavSample.cpp \
WavReader.cpp \
SmeterGUI/ColorWgt.cpp \
SmeterGUI/SMeterOptions.cpp \
SmeterGUI/SMeterSDR.cpp \
AudioThread.cpp \
scale/Scale.cpp \
scale/ScaleNum.cpp \
CW/CwCore.cpp \
CW/CwMacro.cpp \
CW/CwTimer.cpp \
CW/correctIQ.cpp \
Vac.cpp \
ringBuf.cpp \
Cat/ExtSerialPort/qextserialbase.cpp \
Cat/ExtSerialPort/qextserialenumerator.cpp \
Cat/ExtSerialPort/qextserialport.cpp \
Cat/ExtSerialPort/win_qextserialport.cpp \
SdrPlugin/PortAudio/pa19.cpp \
Valcoder/HID/Ea1dev.cpp \
Valcoder/Panel.cpp \
S-Meter/Number2.cpp \
S-Meter/Number.cpp \
S-Meter/Draw.cpp \
S-Meter/S_Meter.cpp \
ExpertSDR_vA2_1.cpp \
Panarama.cpp \
PanoramOpt.cpp \
ThreadFunc.cpp \
About.cpp \
CalibrateSC/progresscalibrate.cpp \
Cat/CatManager.cpp \
DttSP.cpp \
FreqScale/Didgit.cpp \
Options.cpp \
SMeter.cpp \
SdrPlugin/SdrPlugin.cpp \
SdrPlugin/SunSDR/sunCtrl.cpp \
WdgAddStation.cpp \
WdgGraph.cpp \
WdgMem.cpp \
main.cpp \
Wav/VoiceRecorderWave.cpp \
Logger/VLogger.cpp \
Resampler.cpp \
Timer/Timer.cpp \
RingResampler/RingResampler.cpp \
RingResampler/RingBuffer.cpp
RESOURCES += images.qrc
FORMS += CalibrateSC/Calibrator/Calibrator.ui \
Wav/fileList.ui \
Wav/wavSample.ui \
SmeterGUI/SMeterOptions.ui \
scale/Scale.ui \
CW/CwMacro.ui \
Valcoder/Panel.ui \
S-Meter/Number2.ui \
S-Meter/Number.ui \
S-Meter/S_Meter.ui \
PanoramOpt.ui \
About.ui \
CalibrateSC/progresscalibrate.ui \
ExpertSDR_vA2_1.ui \
Options.ui \
SMeter.ui \
WdgAddStation.ui \
WdgGraph.ui \
WdgMem.ui
RC_FILE = browser.rc
LIBS += -lhid \
-lwinmm \
-lsetupapi \
portaudio_x86.lib \
libwsock32
LIBS += -lglu32
TEMPLATE = app
TARGET = ExpertSDR

VERSION = 2.1.4.21

TRANSLATIONS = ExpertSDR_ru.ts
QT += core \
gui \
network \
opengl

HEADERS += CalibrateSC/Calibrator/CalibrProc.h \
CalibrateSC/Calibrator/Calibrator.h \
Wav/fileList.h \
Wav/wavSample.h \
WavReader.h \
SmeterGUI/ColorWgt.h \
SmeterGUI/SMeterOptions.h \
SmeterGUI/SMeterSDR.h \
AudioThread.h \
scale/Scale.h \
scale/ScaleNum.h \
CW/CwCore.h \
CW/CwMacro.h \
CW/CwTimer.h \
CW/correctIQ.h \
Vac.h \
ringBuf.h \
Cat/ExtSerialPort/qextserialbase.h \
Cat/ExtSerialPort/qextserialenumerator.h \
Cat/ExtSerialPort/qextserialport.h \
Cat/ExtSerialPort/win_qextserialport.h \
SdrPlugin/PortAudio/pa19.h \
SdrPlugin/PortAudio/portaudio.h \
Valcoder/HID/Ea1dev.h \
Valcoder/Panel.h \
S-Meter/Number2.h \
S-Meter/Number.h \
S-Meter/Draw.h \
S-Meter/S_Meter.h \
PanaramDefines.h \
Panarama.h \
PanoramOpt.h \
ThreadFunc.h \
About.h \
CalibrateSC/progresscalibrate.h \
Cat/CatManager.h \
Defines.h \
DttSP.h \
ExpertSDR_vA2_1.h \
FreqScale/Didgit.h \
Options.h \
SMeter.h \
SdrPlugin/SdrPlugin.h \
WdgAddStation.h \
WdgGraph.h \
WdgMem.h \
Wav/VoiceRecorderWave.h \
Logger/VLogger.h \
Resampler.h \
Timer/Timer.h \
RingResampler/RingResampler.h \
RingResampler/RingBuffer.h \
SdrPlugin/PluginCtrl.h
SOURCES += CalibrateSC/Calibrator/CalibrProc.cpp \
CalibrateSC/Calibrator/Calibrator.cpp \
Wav/fileList.cpp \
Wav/wavSample.cpp \
WavReader.cpp \
SmeterGUI/ColorWgt.cpp \
SmeterGUI/SMeterOptions.cpp \
SmeterGUI/SMeterSDR.cpp \
AudioThread.cpp \
scale/Scale.cpp \
scale/ScaleNum.cpp \
CW/CwCore.cpp \
CW/CwMacro.cpp \
CW/CwTimer.cpp \
CW/correctIQ.cpp \
Vac.cpp \
ringBuf.cpp \
Cat/ExtSerialPort/qextserialbase.cpp \
Cat/ExtSerialPort/qextserialenumerator.cpp \
Cat/ExtSerialPort/qextserialport.cpp \
Cat/ExtSerialPort/win_qextserialport.cpp \
SdrPlugin/PortAudio/pa19.cpp \
Valcoder/HID/Ea1dev.cpp \
Valcoder/Panel.cpp \
S-Meter/Number2.cpp \
S-Meter/Number.cpp \
S-Meter/Draw.cpp \
S-Meter/S_Meter.cpp \
ExpertSDR_vA2_1.cpp \
Panarama.cpp \
PanoramOpt.cpp \
ThreadFunc.cpp \
About.cpp \
CalibrateSC/progresscalibrate.cpp \
Cat/CatManager.cpp \
DttSP.cpp \
FreqScale/Didgit.cpp \
Options.cpp \
SMeter.cpp \
SdrPlugin/SdrPlugin.cpp \
WdgAddStation.cpp \
WdgGraph.cpp \
WdgMem.cpp \
main.cpp \
Wav/VoiceRecorderWave.cpp \
Logger/VLogger.cpp \
Resampler.cpp \
Timer/Timer.cpp \
RingResampler/RingResampler.cpp \
RingResampler/RingBuffer.cpp \
SdrPlugin/PluginCtrl.cpp
RESOURCES += images.qrc
FORMS += CalibrateSC/Calibrator/Calibrator.ui \
Wav/fileList.ui \
Wav/wavSample.ui \
SmeterGUI/SMeterOptions.ui \
scale/Scale.ui \
CW/CwMacro.ui \
Valcoder/Panel.ui \
S-Meter/Number2.ui \
S-Meter/Number.ui \
S-Meter/S_Meter.ui \
PanoramOpt.ui \
About.ui \
CalibrateSC/progresscalibrate.ui \
ExpertSDR_vA2_1.ui \
Options.ui \
SMeter.ui \
WdgAddStation.ui \
WdgGraph.ui \
WdgMem.ui
RC_FILE = browser.rc
LIBS += -lhid \
-lwinmm \
-lsetupapi \
portaudio_x86.lib \
libwsock32
LIBS += -lglu32
Loading

0 comments on commit 46d28ee

Please sign in to comment.