HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r47:3bc627cdfd9c

Minor bugs corrected.

paul -

r47:3bc627cdfd9c default

parent child

Context file:

r47:3bc627cdfd9c

Collapse all files

spwplugin/StarDundee/stardundeegui.cpp +4 -8

                 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)));
                 }
             }
-            void StarDundeeGUI::setTimecodeFrequency(const QString &frequency)
+            void StarDundeeGUI::setTimecodeFrequency( double frequency )
             {
-                bool ok;
+                this->ui->timecodeFrequencyLineEdit->setText( QString::number( frequency, 'g', 3 ) );
-                frequency.toDouble(&ok);
-                if(ok)
-                    this->ui->timecodeFrequencyLineEdit->setText(frequency);
             }
             void StarDundeeGUI::setStartSendingTimecodes( bool onOff )

spwplugin/StarDundee/stardundeegui.h +2 -1

                 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);
                 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 );

spwplugin/StarDundee/stardundeespw_usb.cpp +3 -2

                 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)));
                 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 )

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages