| @@ -34,7 +34,8 StarDundeeGUI::StarDundeeGUI(QWidget *pa | |||
|
|
34 | 34 | connect(this->ui->selectBrickCmbx,SIGNAL(currentIndexChanged(int)),this,SIGNAL(brickSelectionChanged(int))); |
|
|
35 | 35 | connect(this->ui->selectLinkCmbx,SIGNAL(currentIndexChanged(int)),this,SIGNAL(linkNumberSelectionChanged(int))); |
|
|
36 | 36 | connect(this->ui->setLinkSpeedCmbx,SIGNAL(currentIndexChanged(QString)),this,SIGNAL(linkSpeedSelectionChanged(QString))); |
|
|
37 | connect(this->ui->sourceAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(destinationKeyChanged(QString))); | |
|
|
37 | // connect(this->ui->sourceAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(destinationKeyChanged(QString))); | |
|
|
38 | connect(this->ui->sourceAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(sourceLogicalAddressChanged(QString))); | |
|
|
38 | 39 | connect(this->ui->destinationAddressLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapAddressChanged(QString))); |
|
|
39 | 40 | connect(this->ui->destinationKeyLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapKeyChanged(QString))); |
|
|
40 | 41 | connect(this->ui->RMAPTimeoutLineEdit,SIGNAL(textChanged(QString)),this,SIGNAL(rmapTimeoutChanged(QString))); |
| @@ -218,14 +219,9 void StarDundeeGUI::setDestinationKey(co | |||
|
|
218 | 219 | } |
|
|
219 | 220 | } |
|
|
220 | 221 | |
|
|
221 |
void StarDundeeGUI::setTimecodeFrequency( |
|
|
|
222 | void StarDundeeGUI::setTimecodeFrequency( double frequency ) | |
|
|
222 | 223 | { |
|
|
223 | bool ok; | |
|
|
224 | frequency.toDouble(&ok); | |
|
|
225 | if(ok) | |
|
|
226 | { | |
|
|
227 | this->ui->timecodeFrequencyLineEdit->setText(frequency); | |
|
|
228 | } | |
|
|
224 | this->ui->timecodeFrequencyLineEdit->setText( QString::number( frequency, 'g', 3 ) ); | |
|
|
229 | 225 | } |
|
|
230 | 226 | |
|
|
231 | 227 | void StarDundeeGUI::setStartSendingTimecodes( bool onOff ) |
| @@ -48,6 +48,7 signals: | |||
|
|
48 | 48 | void linkNumberSelectionChanged(int linkIndex); |
|
|
49 | 49 | void linkSpeedSelectionChanged(const QString & linkSpeed); |
|
|
50 | 50 | void destinationKeyChanged(const QString & destKey); |
|
|
51 | void sourceLogicalAddressChanged( QString ); | |
|
|
51 | 52 | void rmapAddressChanged(const QString & address); |
|
|
52 | 53 | void rmapKeyChanged(const QString & key); |
|
|
53 | 54 | void rmapTimeoutChanged(const QString & timeout); |
| @@ -64,7 +65,7 public slots: | |||
|
|
64 | 65 | void setDestinationKey(const QString & destKey); |
|
|
65 | 66 | void setSourceAddress(const QString & address); |
|
|
66 | 67 | void setDestinationAddress(const QString & address); |
|
|
67 |
void setTimecodeFrequency( |
|
|
|
68 | void setTimecodeFrequency(double frequency); | |
|
|
68 | 69 | void setStartSendingTimecodes( bool onOff ); |
|
|
69 | 70 | void setRmapTimeout(const QString & timeout); |
|
|
70 | 71 | int getAvailableBrickCount( void ); |
| @@ -366,7 +366,7 void stardundeeSPW_USB::makeGUI(socexplo | |||
|
|
366 | 366 | connect(this,SIGNAL(BytesReceivedFromSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbReceivedBytesFromSpw(uint))); |
|
|
367 | 367 | connect(this,SIGNAL(BytesTransmittedToSpw(uint)), ((StarDundeeGUI*)this->p_GUI),SLOT(updateNbTransmittedBytesToSpw(uint))); |
|
|
368 | 368 | connect(this,SIGNAL(CCSDSPacketTransmittedToSpw()), ((StarDundeeGUI*)this->p_GUI),SLOT(updateCCSDSPacketTransmittedToSpw())); |
|
|
369 |
connect(this,SIGNAL(SetTimecodeFrequency(double)), ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency( |
|
|
|
369 | connect(this,SIGNAL(SetTimecodeFrequency(double)), ((StarDundeeGUI*)this->p_GUI),SLOT(setTimecodeFrequency(double))); | |
|
|
370 | 370 | connect(this,SIGNAL(StartSendingTimecodes(bool)), ((StarDundeeGUI*)this->p_GUI),SLOT(setStartSendingTimecodes(bool))); |
|
|
371 | 371 | |
|
|
372 | 372 | connect(this,SIGNAL(SendOneTimecode(unsigned char)),this->manager, SLOT(sendOneTimecode(unsigned char))); |
| @@ -1066,7 +1066,8 void stardundeeSPW_USB_Manager::setTimec | |||
|
|
1066 | 1066 | if (!USBSpaceWire_TC_SetAutoTickInFrequency(hDevice, freqCount) ) |
|
|
1067 | 1067 | SocExplorerEngine::message(this->plugin,"Could not set the tick-in frequency"); |
|
|
1068 | 1068 | else |
|
|
1069 |
SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz" |
|
|
|
1069 | SocExplorerEngine::message(this->plugin,"tick frequency set to " + QString::number(currentFrequency) +" Hz" | |
|
|
1070 | + " (freqCount set to " + QString::number(freqCount) + ")" ); | |
|
|
1070 | 1071 | } |
|
|
1071 | 1072 | |
|
|
1072 | 1073 | void stardundeeSPW_USB_Manager::sendOneTimecode( unsigned char nTimein ) |
General Comments 0
You need to be logged in to leave comments.
Login now