diff --git a/spwplugin/StarDundee/stardundeegui.cpp b/spwplugin/StarDundee/stardundeegui.cpp --- a/spwplugin/StarDundee/stardundeegui.cpp +++ b/spwplugin/StarDundee/stardundeegui.cpp @@ -34,7 +34,8 @@ StarDundeeGUI::StarDundeeGUI(QWidget *pa connect(this->ui->selectBrickCmbx,SIGNAL(currentIndexChanged(int)),this,SIGNAL(brickSelectionChanged(int))); connect(this->ui->selectLinkCmbx,SIGNAL(currentIndexChanged(int)),this,SIGNAL(linkNumberSelectionChanged(int))); connect(this->ui->setLinkSpeedCmbx,SIGNAL(currentIndexChanged(QString)),this,SIGNAL(linkSpeedSelectionChanged(QString))); - connect(this->ui->sourceAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(destinationKeyChanged(QString))); +// connect(this->ui->sourceAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(destinationKeyChanged(QString))); + connect(this->ui->sourceAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(sourceLogicalAddressChanged(QString))); connect(this->ui->destinationAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapAddressChanged(QString))); connect(this->ui->destinationKeyLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapKeyChanged(QString))); connect(this->ui->RMAPTimeoutLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapTimeoutChanged(QString))); @@ -218,14 +219,9 @@ void StarDundeeGUI::setDestinationKey(co } } -void StarDundeeGUI::setTimecodeFrequency(const QString &frequency) +void StarDundeeGUI::setTimecodeFrequency( double frequency ) { - bool ok; - frequency.toDouble(&ok); - if(ok) - { - this->ui->timecodeFrequencyLineEdit->setText(frequency); - } + this->ui->timecodeFrequencyLineEdit->setText( QString::number( frequency, 'g', 3 ) ); } void StarDundeeGUI::setStartSendingTimecodes( bool onOff ) diff --git a/spwplugin/StarDundee/stardundeegui.h b/spwplugin/StarDundee/stardundeegui.h --- a/spwplugin/StarDundee/stardundeegui.h +++ b/spwplugin/StarDundee/stardundeegui.h @@ -48,6 +48,7 @@ signals: void linkNumberSelectionChanged(int linkIndex); void linkSpeedSelectionChanged(const QString & linkSpeed); void destinationKeyChanged(const QString & destKey); + void sourceLogicalAddressChanged( QString ); void rmapAddressChanged(const QString & address); void rmapKeyChanged(const QString & key); void rmapTimeoutChanged(const QString & timeout); @@ -64,7 +65,7 @@ public slots: void setDestinationKey(const QString & destKey); void setSourceAddress(const QString & address); void setDestinationAddress(const QString & address); - void setTimecodeFrequency(const QString &frequency); + void setTimecodeFrequency(double frequency); void setStartSendingTimecodes( bool onOff ); void setRmapTimeout(const QString & timeout); int getAvailableBrickCount( void ); diff --git a/spwplugin/StarDundee/stardundeespw_usb.cpp b/spwplugin/StarDundee/stardundeespw_usb.cpp --- a/spwplugin/StarDundee/stardundeespw_usb.cpp +++ b/spwplugin/StarDundee/stardundeespw_usb.cpp @@ -366,7 +366,7 @@ void stardundeeSPW_USB::makeGUI(socexplo connect(this,SIGNAL(BytesReceivedFromSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint))); connect(this,SIGNAL(BytesTransmittedToSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint))); connect(this,SIGNAL(CCSDSPacketTransmittedToSpw()), ((StarDundeeGUI*)this->p_GUI),SLOT(updateCCSDSPacketTransmittedToSpw())); - connect(this,SIGNAL(SetTimecodeFrequency(double)), ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(QString))); + connect(this,SIGNAL(SetTimecodeFrequency(double)), ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(double))); connect(this,SIGNAL(StartSendingTimecodes(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setStartSendingTimecodes(bool))); connect(this,SIGNAL(SendOneTimecode(unsigned char)),this->manager, SLOT(sendOneTimecode(unsigned char))); @@ -1066,7 +1066,8 @@ void stardundeeSPW_USB_Manager::setTimec if (!USBSpaceWire_TC_SetAutoTickInFrequency(hDevice, freqCount) ) SocExplorerEngine::message(this->plugin,"Could not set the tick-in frequency"); else - SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz"); + SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz" + + " (freqCount set to " + QString::number(freqCount) + ")" ); } void stardundeeSPW_USB_Manager::sendOneTimecode( unsigned char nTimein )