VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-07 08:24:43 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'f4exb' into redesign

Browse Source
This commit is contained in:
f4exb
2015-08-09 11:12:43 +02:00
parent c5409e9b0f 018c477af0
commit 7c174c552d
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/dsp/filesink.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ bool FileSink::handleMessage(Message* message)
MsgConfigureFileSink* conf = (MsgConfigureFileSink*) message;
handleConfigure(conf->getFileName(), conf->getSampleRate(), conf->getCenterFrequency());
qDebug() << "FileSink::handleMessage:"
<< " fileName: " << m_fileName
<< " fileName: " << m_fileName.c_str()
<< " sampleRate: " << m_sampleRate
<< " centerFrequency: " << m_centerFrequency;
message->completed();
sdrbase/mainwindow.cpp
+2 -2
View File
@@ -198,7 +198,7 @@ void MainWindow::loadSettings()
void MainWindow::loadSettings(const Preset* preset)
{
qDebug() << "MainWindow::loadSettings(preset): " << preset->getSource().toStdString();
qDebug() << "MainWindow::loadSettings(preset): " << preset->getSource().toStdString().c_str();
ui->glSpectrumGUI->deserialize(preset->getSpectrumConfig());
ui->dcOffset->setChecked(preset->getDCOffsetCorrection());
@@ -221,7 +221,7 @@ void MainWindow::saveSettings()
void MainWindow::saveSettings(Preset* preset)
{
qDebug() << "MainWindow::saveSettings(preset): " << preset->getSource().toStdString();
qDebug() << "MainWindow::saveSettings(preset): " << preset->getSource().toStdString().c_str();
preset->setSpectrumConfig(ui->glSpectrumGUI->serialize());
preset->clearChannels();
sdrbase/plugin/pluginmanager.cpp
+6 -6
View File
@@ -72,8 +72,8 @@ void PluginManager::removeChannelInstance(PluginGUI* pluginGUI)
void PluginManager::registerSampleSource(const QString& sourceName, PluginInterface* plugin)
{
qDebug() << "PluginManager::registerSampleSource "
<< plugin->getPluginDescriptor().displayedName.toStdString()
<< " with source name " << sourceName.toStdString();
<< plugin->getPluginDescriptor().displayedName.toStdString().c_str()
<< " with source name " << sourceName.toStdString().c_str();
m_sampleSourceRegistrations.append(SampleSourceRegistration(sourceName, plugin));
}
@@ -124,7 +124,7 @@ void PluginManager::loadSettings(const Preset* preset)
renameChannelInstances();
if(m_sampleSourceInstance != NULL) {
qDebug() << "m_sampleSourceInstance->deserializeGeneral (" << m_sampleSourceInstance->getName().toStdString() << ")";
qDebug() << "m_sampleSourceInstance->deserializeGeneral (" << m_sampleSourceInstance->getName().toStdString().c_str() << ")";
m_sampleSourceInstance->deserializeGeneral(preset->getSourceGeneralConfig());
if(m_sampleSource == preset->getSource()) {
qDebug() << "m_sampleSourceInstance->deserialize";
@@ -244,14 +244,14 @@ int PluginManager::selectSampleSource(int index)
return -1;
m_sampleSource = m_sampleSourceDevices[index].m_sourceName;
qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString();
qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString().c_str();
m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address);
return index;
}
int PluginManager::selectSampleSource(const QString& source)
{
qDebug() << "PluginManager::selectSampleSource by name: " << source.toStdString();
qDebug() << "PluginManager::selectSampleSource by name: " << source.toStdString().c_str();
int index = -1;
@@ -281,7 +281,7 @@ int PluginManager::selectSampleSource(const QString& source)
return -1;
m_sampleSource = m_sampleSourceDevices[index].m_sourceName;
qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString();
qDebug() << "m_sampleSource at index " << index << " is " << m_sampleSource.toStdString().c_str();
m_sampleSourceInstance = m_sampleSourceDevices[index].m_plugin->createSampleSource(m_sampleSource, m_sampleSourceDevices[index].m_address);
return index;
}
sdrbase/settings/preset.cpp
+4 -4
View File
@@ -27,7 +27,7 @@ void Preset::resetToDefaults()
QByteArray Preset::serialize() const
{
qDebug() << "Preset::serialize (" << this->getSource().toStdString()<< ")";
qDebug() << "Preset::serialize (" << this->getSource().toStdString().c_str() << ")";
SimpleSerializer s(1);
s.writeString(1, m_group);
@@ -45,7 +45,7 @@ QByteArray Preset::serialize() const
s.writeS32(200, m_channelConfigs.size());
qDebug() << " m_group: " << m_group.toStdString();
qDebug() << " m_group: " << m_group.toStdString().c_str();
for(int i = 0; i < m_channelConfigs.size(); i++) {
s.writeString(201 + i * 2, m_channelConfigs[i].m_channel);
@@ -57,7 +57,7 @@ QByteArray Preset::serialize() const
bool Preset::deserialize(const QByteArray& data)
{
qDebug() << "Preset::deserialize (" << this->getSource().toStdString() << ")";
qDebug() << "Preset::deserialize (" << this->getSource().toStdString().c_str() << ")";
SimpleDeserializer d(data);
if(!d.isValid()) {
@@ -79,7 +79,7 @@ bool Preset::deserialize(const QByteArray& data)
d.readBlob(11, &m_sourceGeneralConfig);
d.readBlob(12, &m_sourceConfig);
qDebug() << " m_group: " << m_group.toStdString();
qDebug() << " m_group: " << m_group.toStdString().c_str();
qint32 channelCount = 0;
d.readS32(200, &channelCount, 0);