HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r63:3581c05019b0

Ajout d'un paramètre à la fonction sendTimecodePeriodically()...

leroy -

r63:3581c05019b0 default

parent child

Context file:

r63:3581c05019b0

rmapplugin/rmapplugin.cpp +2 -6

                 // TIMECODES
                 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sig_sendOneTimecode()),
                          this->UI->starDundee, SLOT(sendOneTimecode()) );
-                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sig_sendTimecodePeriodically()),
+                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sig_sendTimecodePeriodically(unsigned char)),
-                         this->UI->starDundee, SLOT(sendTimecodePeriodically()) );
+                         this->UI->starDundee, SLOT(startSendingTimecodePeriodically(unsigned char)) );
-                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sig_sendOneTimePacketAndOneTimecode()),
-                         this->UI->starDundee, SLOT(sendOneTimePacketAndOneTimecode()) );
-                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sig_sendOneTimePacketAndTimecodePeriodically()),
-                         this->UI->starDundee, SLOT(sendOneTimePacketAndTimecodePeriodically()) );
             }

rmapplugin/rmappluginpythonwrapper.cpp +4 -2

                 emit sig_sendOneTimecode();
             }
-            void rmappluginPythonWrapper::sendTimecodePeriodically()
+            void rmappluginPythonWrapper::sendTimecodePeriodically( unsigned int onOff )
             {
-                emit sig_sendTimecodePeriodically();
+                unsigned char newOnOff;
+                newOnOff = (unsigned char) onOff;
+                emit sig_sendTimecodePeriodically( newOnOff );
             }

rmapplugin/rmappluginpythonwrapper.h +2 -2

                 //*******************
                 // TIMECODE SIGNALS
                 void sig_sendOneTimecode();
-                void sig_sendTimecodePeriodically();
+                void sig_sendTimecodePeriodically(unsigned char);
             public slots:
                 QList<QVariant> ReadSPW(unsigned int size=0);
                 //*******************
                 // TIMECODE FUNCTIONS
                 void sendOneTimecode();
-                void sendTimecodePeriodically();
+                void sendTimecodePeriodically(unsigned int onOff);
             };

rmapplugin/stardundee.cpp +23 0

@@ -1045,6 +1045,7 void StarDundee::sendTimecodePeriodicall
1045		1045
1046	flag_sendTimecodePeriodically = true;	1046	flag_sendTimecodePeriodically = true;
1047	this->starDundeeSendTimecodePeriodically->setText("stop timecodes at 1 Hz");	1047	this->starDundeeSendTimecodePeriodically->setText("stop timecodes at 1 Hz");
		1048	starDundeeSendOneTimePacketAndTimecodePeriodically->setEnabled( false );
1048	}	1049	}
1049	else	1050	else
1050	{	1051	{
@@ -1057,6 +1058,28 void StarDundee::sendTimecodePeriodicall
1057	}	1058	}
1058	}	1059	}
1059		1060
		1061	void StarDundee::startSendingTimecodePeriodically(unsigned char onOff)
		1062	{
		1063	if (onOff == 0)
		1064	{
		1065	if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 0, 0))
		1066	emit sendMessage("Could not disable auto tick-in");
		1067
		1068	flag_sendTimecodePeriodically = false;
		1069	this->starDundeeSendTimecodePeriodically->setText("start timecodes at 1 Hz");
		1070	starDundeeSendOneTimePacketAndTimecodePeriodically->setEnabled( true );
		1071	}
		1072	else
		1073	{
		1074	if (!USBSpaceWire_TC_EnableAutoTickIn(hDevice, 1, 1))
		1075	emit sendMessage("Could not enable auto tick-in");
		1076
		1077	flag_sendTimecodePeriodically = true;
		1078	this->starDundeeSendTimecodePeriodically->setText("stop timecodes at 1 Hz");
		1079	starDundeeSendOneTimePacketAndTimecodePeriodically->setEnabled( false );
		1080	}
		1081	}
		1082
1060	void StarDundee::sendUpdateTime(long time)	1083	void StarDundee::sendUpdateTime(long time)
1061	{	1084	{
1062	Packet_TC_LFR_UPDATE_TIME_t packet;	1085	Packet_TC_LFR_UPDATE_TIME_t packet;

rmapplugin/stardundee.h +1 0

                 // TIMECODES
                 void sendOneTimecode();
                 void sendTimecodePeriodically();
+                void startSendingTimecodePeriodically( unsigned char onOff );
                 void sendOneTimePacketAndOneTimecode();
                 void sendOneTimePacketAndTimecodePeriodically();
                 void updateTimeToSend(long timeToSend);

General Comments 0

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

No TODOs yet

	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