##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » LPPMON_PLUGINS_PAUL
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/LPPMON_GROUP/LPPMON_PLUGINS_PAUL

waveform display added for the normal mode...
leroy -
r19:7f565009af54 default
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 #############################################################################
2 2 # Makefile for building: PAULs_LPPMON_PLUGINS
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Apr 22 17:27:12 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Apr 25 14:28:34 2013
4 4 # Project: PAULs_LPPMON_PLUGINS.pro
5 5 # Template: subdirs
6 6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <!DOCTYPE QtCreatorProject>
3 <!-- Written by Qt Creator 2.4.1, 2013-04-23T11:06:46. -->
3 <!-- Written by Qt Creator 2.4.1, 2013-04-26T15:28:06. -->
4 4 <qtcreator>
5 5 <data>
6 6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
Show file before | Show file after | Hide comments
@@ -1,6 +1,6
1 1 #############################################################################
2 2 # Makefile for building: librmapplugin.so.1.0.0
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Apr 22 17:27:12 2013
3 # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 26 08:31:53 2013
4 4 # Project: rmapplugin.pro
5 5 # Template: lib
6 6 # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
@@ -49,24 +49,30 SOURCES = rmapplugin.cpp \
49 49 ccsds.cpp \
50 50 ../common_PLE/qipdialogbox.cpp \
51 51 ../common_PLE/gresbstatusenquiry.cpp \
52 spectralmatricesdmasimulator.cpp \
53 52 rmappluginpythonwrapper.cpp \
54 53 stardundee.cpp \
55 54 gresb.cpp \
56 55 tcpackettosend.cpp \
57 56 tmpackettoread.cpp \
58 57 wfdisplay.cpp \
58 tmstatistics.cpp \
59 wfplot.cpp \
60 wfpage.cpp \
61 wfpacket.cpp \
59 62 /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp moc/moc_rmappluginui.cpp \
60 63 moc/moc_rmapplugin.cpp \
61 64 moc/moc_qipdialogbox.cpp \
62 65 moc/moc_gresbstatusenquiry.cpp \
63 moc/moc_spectralmatricesdmasimulator.cpp \
64 66 moc/moc_rmappluginpythonwrapper.cpp \
65 67 moc/moc_stardundee.cpp \
66 68 moc/moc_gresb.cpp \
67 69 moc/moc_tcpackettosend.cpp \
68 70 moc/moc_tmpackettoread.cpp \
69 71 moc/moc_wfdisplay.cpp \
72 moc/moc_tmstatistics.cpp \
73 moc/moc_wfplot.cpp \
74 moc/moc_wfpage.cpp \
75 moc/moc_wfpacket.cpp \
70 76 moc/moc_genericPySysdriver.cpp \
71 77 moc/moc_lppmonplugin.cpp
72 78 OBJECTS = obj/rmapplugin.o \
@@ -75,25 +81,31 OBJECTS = obj/rmapplugin.o \
75 81 obj/ccsds.o \
76 82 obj/qipdialogbox.o \
77 83 obj/gresbstatusenquiry.o \
78 obj/spectralmatricesdmasimulator.o \
79 84 obj/rmappluginpythonwrapper.o \
80 85 obj/stardundee.o \
81 86 obj/gresb.o \
82 87 obj/tcpackettosend.o \
83 88 obj/tmpackettoread.o \
84 89 obj/wfdisplay.o \
90 obj/tmstatistics.o \
91 obj/wfplot.o \
92 obj/wfpage.o \
93 obj/wfpacket.o \
85 94 obj/lppmonplugininterface.o \
86 95 obj/moc_rmappluginui.o \
87 96 obj/moc_rmapplugin.o \
88 97 obj/moc_qipdialogbox.o \
89 98 obj/moc_gresbstatusenquiry.o \
90 obj/moc_spectralmatricesdmasimulator.o \
91 99 obj/moc_rmappluginpythonwrapper.o \
92 100 obj/moc_stardundee.o \
93 101 obj/moc_gresb.o \
94 102 obj/moc_tcpackettosend.o \
95 103 obj/moc_tmpackettoread.o \
96 104 obj/moc_wfdisplay.o \
105 obj/moc_tmstatistics.o \
106 obj/moc_wfplot.o \
107 obj/moc_wfpage.o \
108 obj/moc_wfpacket.o \
97 109 obj/moc_genericPySysdriver.o \
98 110 obj/moc_lppmonplugin.o
99 111 DIST = /usr/lib64/qt4/mkspecs/common/unix.conf \
@@ -243,7 +255,7 qmake: FORCE
243 255
244 256 dist:
245 257 @$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0
246 $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h spectralmatricesdmasimulator.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h tmpackettoread.h wfdisplay.h /usr/include/lppmon/genericPySysdriver.h /usr/include/lppmon/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp spectralmatricesdmasimulator.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp tcpackettosend.cpp tmpackettoread.cpp wfdisplay.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0
258 $(COPY_FILE) --parents $(SOURCES) $(DIST) obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmappluginui.h rmapplugin.h rmapoperations.h ccsds.h ../common_PLE/qipdialogbox.h ../common_PLE/gresbstatusenquiry.h rmappluginpythonwrapper.h stardundee.h ../spw_usb_driver_v2.61/inc/spw_usb_api.h ../spw_usb_driver_v2.61/inc/spw_config_library.h gresb.h tcpackettosend.h tmpackettoread.h wfdisplay.h tmstatistics.h wfplot.h wfpage.h wfpacket.h params.h /usr/include/lppmon/genericPySysdriver.h /usr/include/lppmon/lppmonplugin.h obj/rmapplugin1.0.0/ && $(COPY_FILE) --parents rmapplugin.cpp rmappluginui.cpp rmapoperations.cpp ccsds.cpp ../common_PLE/qipdialogbox.cpp ../common_PLE/gresbstatusenquiry.cpp rmappluginpythonwrapper.cpp stardundee.cpp gresb.cpp tcpackettosend.cpp tmpackettoread.cpp wfdisplay.cpp tmstatistics.cpp wfplot.cpp wfpage.cpp wfpacket.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp obj/rmapplugin1.0.0/ && (cd `dirname obj/rmapplugin1.0.0` && $(TAR) rmapplugin1.0.0.tar rmapplugin1.0.0 && $(COMPRESS) rmapplugin1.0.0.tar) && $(MOVE) `dirname obj/rmapplugin1.0.0`/rmapplugin1.0.0.tar.gz . && $(DEL_FILE) -r obj/rmapplugin1.0.0
247 259
248 260
249 261 clean:compiler_clean
@@ -265,27 +277,34 mocclean: compiler_moc_header_clean comp
265 277
266 278 mocables: compiler_moc_header_make_all compiler_moc_source_make_all
267 279
268 compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_wfdisplay.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
280 compiler_moc_header_make_all: moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_wfdisplay.cpp moc/moc_tmstatistics.cpp moc/moc_wfplot.cpp moc/moc_wfpage.cpp moc/moc_wfpacket.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
269 281 compiler_moc_header_clean:
270 -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_spectralmatricesdmasimulator.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_wfdisplay.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
282 -$(DEL_FILE) moc/moc_rmappluginui.cpp moc/moc_rmapplugin.cpp moc/moc_qipdialogbox.cpp moc/moc_gresbstatusenquiry.cpp moc/moc_rmappluginpythonwrapper.cpp moc/moc_stardundee.cpp moc/moc_gresb.cpp moc/moc_tcpackettosend.cpp moc/moc_tmpackettoread.cpp moc/moc_wfdisplay.cpp moc/moc_tmstatistics.cpp moc/moc_wfplot.cpp moc/moc_wfpage.cpp moc/moc_wfpacket.cpp moc/moc_genericPySysdriver.cpp moc/moc_lppmonplugin.cpp
271 283 moc/moc_rmappluginui.cpp: rmapoperations.h \
272 spectralmatricesdmasimulator.h \
273 284 stardundee.h \
274 285 ccsds.h \
275 286 tmpackettoread.h \
276 287 gresb.h \
277 288 wfdisplay.h \
289 wfplot.h \
290 params.h \
291 wfpage.h \
292 tmstatistics.h \
278 293 rmappluginui.h
279 294 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp
280 295
281 296 moc/moc_rmapplugin.cpp: rmappluginui.h \
282 297 rmapoperations.h \
283 spectralmatricesdmasimulator.h \
284 298 stardundee.h \
285 299 ccsds.h \
286 300 tmpackettoread.h \
287 301 gresb.h \
288 302 wfdisplay.h \
303 wfplot.h \
304 params.h \
305 wfpage.h \
306 tmstatistics.h \
307 wfpacket.h \
289 308 rmapplugin.h
290 309 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmapplugin.h -o moc/moc_rmapplugin.cpp
291 310
@@ -295,9 +314,6 moc/moc_qipdialogbox.cpp: ../common_PLE/
295 314 moc/moc_gresbstatusenquiry.cpp: ../common_PLE/gresbstatusenquiry.h
296 315 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../common_PLE/gresbstatusenquiry.h -o moc/moc_gresbstatusenquiry.cpp
297 316
298 moc/moc_spectralmatricesdmasimulator.cpp: spectralmatricesdmasimulator.h
299 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) spectralmatricesdmasimulator.h -o moc/moc_spectralmatricesdmasimulator.cpp
300
301 317 moc/moc_rmappluginpythonwrapper.cpp: rmapoperations.h \
302 318 ccsds.h \
303 319 tcpackettosend.h \
@@ -323,9 +339,28 moc/moc_tcpackettosend.cpp: tcpackettose
323 339 moc/moc_tmpackettoread.cpp: tmpackettoread.h
324 340 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmpackettoread.h -o moc/moc_tmpackettoread.cpp
325 341
326 moc/moc_wfdisplay.cpp: wfdisplay.h
342 moc/moc_wfdisplay.cpp: wfplot.h \
343 params.h \
344 wfpage.h \
345 wfdisplay.h
327 346 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfdisplay.h -o moc/moc_wfdisplay.cpp
328 347
348 moc/moc_tmstatistics.cpp: tmstatistics.h
349 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmstatistics.h -o moc/moc_tmstatistics.cpp
350
351 moc/moc_wfplot.cpp: params.h \
352 wfplot.h
353 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfplot.h -o moc/moc_wfplot.cpp
354
355 moc/moc_wfpage.cpp: wfplot.h \
356 params.h \
357 wfpage.h
358 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpage.h -o moc/moc_wfpage.cpp
359
360 moc/moc_wfpacket.cpp: params.h \
361 wfpacket.h
362 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpacket.h -o moc/moc_wfpacket.cpp
363
329 364 moc/moc_genericPySysdriver.cpp: /usr/include/lppmon/genericPySysdriver.h
330 365 /usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp
331 366
@@ -354,12 +389,16 compiler_clean: compiler_moc_header_clea
354 389 obj/rmapplugin.o: rmapplugin.cpp rmapplugin.h \
355 390 rmappluginui.h \
356 391 rmapoperations.h \
357 spectralmatricesdmasimulator.h \
358 392 stardundee.h \
359 393 ccsds.h \
360 394 tmpackettoread.h \
361 395 gresb.h \
362 396 wfdisplay.h \
397 wfplot.h \
398 params.h \
399 wfpage.h \
400 tmstatistics.h \
401 wfpacket.h \
363 402 rmappluginpythonwrapper.h \
364 403 tcpackettosend.h
365 404 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapplugin.o rmapplugin.cpp
@@ -367,12 +406,16 obj/rmapplugin.o: rmapplugin.cpp rmapplu
367 406 obj/rmappluginui.o: rmappluginui.cpp rmapplugin.h \
368 407 rmappluginui.h \
369 408 rmapoperations.h \
370 spectralmatricesdmasimulator.h \
371 409 stardundee.h \
372 410 ccsds.h \
373 411 tmpackettoread.h \
374 412 gresb.h \
375 wfdisplay.h
413 wfdisplay.h \
414 wfplot.h \
415 params.h \
416 wfpage.h \
417 tmstatistics.h \
418 wfpacket.h
376 419 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp
377 420
378 421 obj/rmapoperations.o: rmapoperations.cpp rmapoperations.h
@@ -387,9 +430,6 obj/qipdialogbox.o: ../common_PLE/qipdia
387 430 obj/gresbstatusenquiry.o: ../common_PLE/gresbstatusenquiry.cpp ../common_PLE/gresbstatusenquiry.h
388 431 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresbstatusenquiry.o ../common_PLE/gresbstatusenquiry.cpp
389 432
390 obj/spectralmatricesdmasimulator.o: spectralmatricesdmasimulator.cpp spectralmatricesdmasimulator.h
391 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/spectralmatricesdmasimulator.o spectralmatricesdmasimulator.cpp
392
393 433 obj/rmappluginpythonwrapper.o: rmappluginpythonwrapper.cpp rmappluginpythonwrapper.h \
394 434 rmapoperations.h \
395 435 ccsds.h \
@@ -415,9 +455,28 obj/tcpackettosend.o: tcpackettosend.cpp
415 455 obj/tmpackettoread.o: tmpackettoread.cpp tmpackettoread.h
416 456 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmpackettoread.o tmpackettoread.cpp
417 457
418 obj/wfdisplay.o: wfdisplay.cpp wfdisplay.h
458 obj/wfdisplay.o: wfdisplay.cpp wfdisplay.h \
459 wfplot.h \
460 params.h \
461 wfpage.h
419 462 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfdisplay.o wfdisplay.cpp
420 463
464 obj/tmstatistics.o: tmstatistics.cpp tmstatistics.h
465 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmstatistics.o tmstatistics.cpp
466
467 obj/wfplot.o: wfplot.cpp wfplot.h \
468 params.h
469 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfplot.o wfplot.cpp
470
471 obj/wfpage.o: wfpage.cpp wfpage.h \
472 wfplot.h \
473 params.h
474 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpage.o wfpage.cpp
475
476 obj/wfpacket.o: wfpacket.cpp wfpacket.h \
477 params.h
478 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpacket.o wfpacket.cpp
479
421 480 obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \
422 481 /usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h
423 482 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lppmonplugininterface.o /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp
@@ -434,9 +493,6 obj/moc_qipdialogbox.o: moc/moc_qipdialo
434 493 obj/moc_gresbstatusenquiry.o: moc/moc_gresbstatusenquiry.cpp
435 494 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresbstatusenquiry.o moc/moc_gresbstatusenquiry.cpp
436 495
437 obj/moc_spectralmatricesdmasimulator.o: moc/moc_spectralmatricesdmasimulator.cpp
438 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_spectralmatricesdmasimulator.o moc/moc_spectralmatricesdmasimulator.cpp
439
440 496 obj/moc_rmappluginpythonwrapper.o: moc/moc_rmappluginpythonwrapper.cpp
441 497 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmappluginpythonwrapper.o moc/moc_rmappluginpythonwrapper.cpp
442 498
@@ -455,6 +511,18 obj/moc_tmpackettoread.o: moc/moc_tmpack
455 511 obj/moc_wfdisplay.o: moc/moc_wfdisplay.cpp
456 512 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfdisplay.o moc/moc_wfdisplay.cpp
457 513
514 obj/moc_tmstatistics.o: moc/moc_tmstatistics.cpp
515 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmstatistics.o moc/moc_tmstatistics.cpp
516
517 obj/moc_wfplot.o: moc/moc_wfplot.cpp
518 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfplot.o moc/moc_wfplot.cpp
519
520 obj/moc_wfpage.o: moc/moc_wfpage.cpp
521 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpage.o moc/moc_wfpage.cpp
522
523 obj/moc_wfpacket.o: moc/moc_wfpacket.cpp
524 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpacket.o moc/moc_wfpacket.cpp
525
458 526 obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp
459 527 $(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp
460 528
Show file before | Show file after | Hide comments
@@ -27,6 +27,8 public:
27 27 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
28 28
29 29 unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
30
31 gresbStatusEnquiry* spwLinkStatusEnquiry;
30 32
31 33 signals:
32 34 void sendMessage(QString message);
@@ -93,8 +95,6 private:
93 95 QTcpSocket *RMAPReceive_SOCKET;
94 96 QTcpSocket *GRESBStatusQuery_SOCKET;
95 97
96 gresbStatusEnquiry* spwLinkStatusEnquiry;
97
98 98 // Packet receiver
99 99 QSemaphore *rmapPacketSEMAPHORE;
100 100 QSemaphore *ccsdsPacketSEMAPHORE;
Show file before | Show file after | Hide comments
@@ -59,6 +59,9 rmapplugin::rmapplugin(QWidget *parent)
59 59 //**
60 60 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(fetchPacketSig()),
61 61 this, SLOT(fetchPacket()), Qt::DirectConnection );
62 //***
63 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(nbPacketHasChanged(int)),
64 this, SLOT(nbPacketHasChanged(int)));
62 65 //**************
63 66
64 67 //**************
@@ -74,16 +77,12 rmapplugin::rmapplugin(QWidget *parent)
74 77
75 78 connect(UI->rmapOpenCommunicationButton, SIGNAL(clicked()), this, SLOT(openBridge()));
76 79 connect(UI->rmapCloseCommunicationButton, SIGNAL(clicked()), this, SLOT(closeBridge()));
77
78 // CCSDS
79 connect(this->UI->sendCCSDSCommandButton, SIGNAL(clicked()), this, SLOT(sendCCSDS()));
80 connect(this->UI->send_TC_LFR_UPDATE_TIME_Button, SIGNAL(clicked()), this, SLOT(send_TC_LFR_UPDATE_TIME()));
81 connect(this->UI->reset_TC_LFR_UPDATE_TIME_Button, SIGNAL(clicked()), this, SLOT(reset_TC_LFR_UPDATE_TIME()));
82
83 // spectralMAtricesDMASimulator
84 connect(this->UI->spectralMatricesDMASimulator, SIGNAL(rmapplugginRead(uint*,uint,uint)), this, SLOT(Read(uint*,uint,uint)));
85 connect(this->UI->spectralMatricesDMASimulator, SIGNAL(rmapplugginWrite(uint*,uint,uint)), this, SLOT(Write(uint*,uint,uint)));
86 connect(this->UI->spectralMatricesDMASimulator, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
80 connect(this, SIGNAL(
81 updateStatistics(unsigned char,unsigned char,unsigned char,unsigned char,uint,uint,uint,uint)
82 ),
83 this->UI->tmStatistics, SLOT(
84 updateStatistics(unsigned char,unsigned char,unsigned char,unsigned char,uint,uint,uint,uint)
85 ));
87 86
88 87 //******
89 88 // GRESB
@@ -191,51 +190,6 unsigned int rmapplugin::WriteSPW(char *
191 190 return result;
192 191 }
193 192
194 void rmapplugin::sendCCSDS() // SLOT
195 {
196 unsigned int nbBYTES_application_data = 8;
197 unsigned int count;
198 char *tab;
199 unsigned char packetErrorControl1 = 0xaa;
200 unsigned char packetErrorControl0 = 0xbb;
201
202 ccsds_command = new ccsds(1, 0, 0, nbBYTES_application_data+12, 0, 0, 0, 0, 0); // +12 => packet header 6 bytes + data field header 4 bytes + packet error control 2 bytes
203 /* unsigned char data_field_header,
204 unsigned char processID,
205 unsigned int sequence_count,
206 unsigned int packet_length,
207 unsigned char acceptance,
208 unsigned int completion,
209 unsigned char service_type,
210 unsigned char service_subtype,
211 unsigned char sourceID*/
212
213 count = nbBYTES_application_data+12; // 12 is the size in bytes of the header
214 tab = (char*) malloc(count);
215 tab[0] = ccsds_command->ccsds_header->packetId1;
216 tab[1] = ccsds_command->ccsds_header->packetId0;
217 tab[2] = ccsds_command->ccsds_header->packetSequenceControl1;
218 tab[3] = ccsds_command->ccsds_header->packetSequenceControl0;
219 tab[4] = ccsds_command->ccsds_header->packetLength1;
220 tab[5] = ccsds_command->ccsds_header->packetLength0;
221 tab[6] = ccsds_command->ccsds_header->dataFieldHeader3;
222 tab[7] = ccsds_command->ccsds_header->dataFieldHeader2;
223 tab[8] = ccsds_command->ccsds_header->dataFieldHeader1;
224 tab[9] = ccsds_command->ccsds_header->dataFieldHeader0;
225 tab[10]=0x00;
226 tab[11]=0x00;
227 tab[12]=0x00;
228 tab[13]=0x00;
229 tab[14]=0x00;
230 tab[15]=0x00;
231 tab[nbBYTES_application_data+10] = packetErrorControl1;
232 tab[nbBYTES_application_data+11] = packetErrorControl0;
233
234 WriteSPW(tab, count, UI->CCSDSTargetLogicalAddressSpinBox->value(), 0x00);
235
236 free(tab);
237 }
238
239 193 void rmapplugin::openBridge()
240 194 {
241 195 switch(currentBridge)
@@ -266,59 +220,6 void rmapplugin::closeBridge()
266 220 }
267 221 }
268 222
269 void rmapplugin::send_TC_LFR_UPDATE_TIME()
270 {
271 unsigned int nbBYTES_application_data = 6; // Time at CUC format is on 48 bits / 6 bytes
272 unsigned int count;
273 char *tab;
274 unsigned char packetErrorControl1 = 0xaa;
275 unsigned char packetErrorControl0 = 0xbb;
276
277 ccsds_command = new ccsds(1, 11, 0, nbBYTES_application_data, 1, 1, 9, 129, 0);
278 /* unsigned char data_field_header,
279 unsigned char processID,
280 unsigned int sequence_count,
281 unsigned int packet_length,
282 unsigned char acceptance,
283 unsigned int completion,
284 unsigned char service_type,
285 unsigned char service_subtype,
286 unsigned char sourceID*/
287
288 count = nbBYTES_application_data+12; // +12 => packet header 6 bytes + data field header 4 bytes + packet error control 2 bytes
289 tab = (char*) malloc(count);
290 tab[0] = ccsds_command->ccsds_header->packetId1;
291 tab[1] = ccsds_command->ccsds_header->packetId0;
292 tab[2] = ccsds_command->ccsds_header->packetSequenceControl1;
293 tab[3] = ccsds_command->ccsds_header->packetSequenceControl0;
294 tab[4] = ccsds_command->ccsds_header->packetLength1;
295 tab[5] = ccsds_command->ccsds_header->packetLength0;
296 tab[6] = ccsds_command->ccsds_header->dataFieldHeader3;
297 tab[7] = ccsds_command->ccsds_header->dataFieldHeader2;
298 tab[8] = ccsds_command->ccsds_header->dataFieldHeader1;
299 tab[9] = ccsds_command->ccsds_header->dataFieldHeader0;
300 tab[10] = (unsigned char) (time_COARSE>>24);
301 tab[11] = (unsigned char) (time_COARSE>>18);
302 tab[12] = (unsigned char) (time_COARSE>>8);
303 tab[13] = (unsigned char) (time_COARSE);
304 tab[14] = (unsigned char) (time_FINE>>8);
305 tab[15] = (unsigned char) (time_FINE);
306 tab[nbBYTES_application_data+10] = packetErrorControl1;
307 tab[nbBYTES_application_data+11] = packetErrorControl0;
308
309 WriteSPW(tab, count, UI->CCSDSTargetLogicalAddressSpinBox->value(), 0x00);
310
311 time_COARSE = time_COARSE+1;
312
313 free(tab);
314 }
315
316 void rmapplugin::reset_TC_LFR_UPDATE_TIME()
317 {
318 time_COARSE = 0;
319 time_FINE = 0;
320 }
321
322 223 void rmapplugin::RMAP_write_reply_setText(QString text)
323 224 {
324 225 this->UI->RMAP_write_reply->setText(text);
@@ -343,63 +244,102 void rmapplugin::receivePacketFromBridge
343 244 {
344 245 preProcessPacket(packet);
345 246 this->generalCCSDSPacketStore.append(packet);
346 this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(generalCCSDSPacketStore.count()));
247 this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(generalCCSDSPacketStore.size()));
347 248 processPacketStore();
348 249 }
349 250
350 251 void rmapplugin::preProcessPacket(TMPacketToRead *packet)
351 252 {
253 unsigned char pid = 0;
254 unsigned char cat = 0;
352 255 unsigned char typ = 0;
353 256 unsigned char sub = 0;
354 unsigned char sid = 0;
355 unsigned char pkt_nr = 0;
356 unsigned int blk_nr = 0;
357 unsigned int i = 0;
358 unsigned int j = 0;
359 unsigned char *data;
257 unsigned int sid = 0;
258 unsigned int length = 0;
259 unsigned int coarse_t = 0;
260 unsigned int fine_t = 0;
360 261
361 typ = packet->Value[11]; // TYPE
362 sub = packet->Value[12]; // SUBTYPE
262 //*********************************
263 // get the parameters of the packet
264 pid = ((packet->Value[4] & 0x07) << 4) + ((packet->Value[5] & 0xf0) >> 4);
265 cat = packet->Value[5] & 0x0f;
266 typ = packet->Value[11]; // TYPE
267 sub = packet->Value[12]; // SUBTYPE
268 sid = 0;
269 length = packet->Value[8] * 256 + packet->Value[9];
270 coarse_t = packet->Value[14] * pow(2, 24) + packet->Value[15] * pow(2, 16)
271 + packet->Value[16] * pow(2, 8) + packet->Value[17];
272 fine_t = packet->Value[18] * pow(2, 8) + packet->Value[19];
273
274 if ((pid == 76) & (cat == 1) & (typ == 1) & (sub == 8))
275 sid = packet->Value[20] * 256 + packet->Value[21];
276 else if ((pid == 76) & (cat == 12) & (typ == 21) & (sub == 3))
277 sid = packet->Value[20];
278 else if ((pid == 76) & (cat == 4) & (typ == 3) & (sub == 25))
279 sid = 1;
280
281 emit updateStatistics(pid, cat, typ, sub, sid, length, coarse_t, fine_t);
282
283
284 //****************************************
285 // if the packet is a waveform, display it
363 286 if ( (typ == 21) & (sub == 3) )
364 287 {
365 288 sid = packet->Value[20]; // SID
366 pkt_nr = packet->Value[23]; // PKT_NR
367 blk_nr = packet->Value[24] * 256 + packet->Value[25];
368 289 switch (sid){
369 290 case SID_NORMAL_SWF_F0:
370 emit displayOnConsole("wf packet received, sid: " + QString::number(sid)
371 + ", pkt_nr: " + QString::number(pkt_nr)
372 + ", blk_nr: " + QString::number(blk_nr)
373 );
374 data = &packet->Value[26]; // start of the first data block;
375 j = (pkt_nr-1) * 340;
376 for ( i=0; i<blk_nr; i++ ){
377 normal_swf_f0_v[j + i] = (short) ( (data[i * BLK_SIZE ] << 8) + (data[i*BLK_SIZE + 1]) );
378 normal_swf_f0_e1[j + i] = (short) ( (data[i * BLK_SIZE + 2] << 8) + (data[i*BLK_SIZE + 3]) );
379 normal_swf_f0_e2[j + i] = (short) ( (data[i * BLK_SIZE + 4] << 8) + (data[i*BLK_SIZE + 5]) );
380 normal_swf_f0_b1[j + i] = (short) ( (data[i * BLK_SIZE + 6] << 8) + (data[i*BLK_SIZE + 7]) );
381 normal_swf_f0_b2[j + i] = (short) ( (data[i * BLK_SIZE + 8] << 8) + (data[i*BLK_SIZE + 9]) );
382 normal_swf_f0_b3[j + i] = (short) ( (data[i * BLK_SIZE + 10] << 8) + (data[i*BLK_SIZE + 11]) );
383 }
384 if (pkt_nr == 7)
385 {
386 emit displayOnConsole("all packets received, display waveform");
387 this->UI->wfDisplay->displayOnPlot(normal_swf_f0_v, 0);
388 this->UI->wfDisplay->displayOnPlot(normal_swf_f0_e1, 1);
389 this->UI->wfDisplay->displayOnPlot(normal_swf_f0_e2, 2);
390 this->UI->wfDisplay->displayOnPlot(normal_swf_f0_b1, 3);
391 }
291 buildWFAndDisplay(packet, &wfPacketNormal[0], 0);
392 292 break;
393 293 case SID_NORMAL_SWF_F1:
294 buildWFAndDisplay(packet, &wfPacketNormal[1], 1);
394 295 break;
395 296 case SID_NORMAL_SWF_F2:
297 buildWFAndDisplay(packet, &wfPacketNormal[2], 2);
396 298 break;
397 299 case SID_NORMAL_CWF_F3:
300 buildWFAndDisplay(packet, &wfPacketNormal[3], 3);
398 301 break;
399 302 }
400 303 }
401 304 }
402 305
306 void rmapplugin::nbPacketHasChanged(int nb)
307 {
308 this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(nb));
309 }
310
311 void rmapplugin::buildWFAndDisplay(TMPacketToRead *packet, WFPacket *wfPacket, unsigned char num_page)
312 {
313 unsigned int i = 0;
314 unsigned int j = 0;
315 unsigned char *data;
316 unsigned char pkt_nr = 0;
317 unsigned int blk_nr = 0;
318
319 pkt_nr = packet->Value[23]; // PKT_NR
320 blk_nr = packet->Value[24] * 256 + packet->Value[25];
321 data = &packet->Value[26]; // start of the first data block;
322 j = (pkt_nr-1) * 340;
323 for ( i=0; i<blk_nr; i++ ){
324 wfPacket->wf_v[j + i] = (short) ( (data[i * BLK_SIZE ] << 8) + (data[i*BLK_SIZE + 1]) );
325 wfPacket->wf_e1[j + i] = (short) ( (data[i * BLK_SIZE + 2] << 8) + (data[i*BLK_SIZE + 3]) );
326 wfPacket->wf_e2[j + i] = (short) ( (data[i * BLK_SIZE + 4] << 8) + (data[i*BLK_SIZE + 5]) );
327 wfPacket->wf_b1[j + i] = (short) ( (data[i * BLK_SIZE + 6] << 8) + (data[i*BLK_SIZE + 7]) );
328 wfPacket->wf_b2[j + i] = (short) ( (data[i * BLK_SIZE + 8] << 8) + (data[i*BLK_SIZE + 9]) );
329 wfPacket->wf_b3[j + i] = (short) ( (data[i * BLK_SIZE + 10] << 8) + (data[i*BLK_SIZE + 11]) );
330 }
331 if (pkt_nr == 7)
332 {
333 emit displayOnConsole("all packets received, display waveform f" + QString::number(num_page));
334 this->UI->wfDisplay->displayOnPlot(wfPacket->wf_v, num_page, 0);
335 this->UI->wfDisplay->displayOnPlot(wfPacket->wf_e1, num_page, 1);
336 this->UI->wfDisplay->displayOnPlot(wfPacket->wf_e2, num_page, 2);
337 this->UI->wfDisplay->displayOnPlot(wfPacket->wf_b1, num_page, 3);
338 this->UI->wfDisplay->displayOnPlot(wfPacket->wf_b2, num_page, 4);
339 this->UI->wfDisplay->displayOnPlot(wfPacket->wf_b3, num_page, 5);
340 }
341 }
342
403 343 /////////////////////
404 344 // INTERNAL FUNCTIONS
405 345
Show file before | Show file after | Hide comments
@@ -31,6 +31,7
31 31 #include <QTime>
32 32 #include <ccsds.h>
33 33 #include <QSemaphore>
34 #include <wfpacket.h>
34 35
35 36 #include <lppmonplugin.h>
36 37
@@ -53,12 +54,8 public:
53 54 ~rmapplugin();
54 55 QList<TMPacketToRead*> generalCCSDSPacketStore;
55 56 void preProcessPacket(TMPacketToRead *packet);
56 short normal_swf_f0_v[2048];
57 short normal_swf_f0_e1[2048];
58 short normal_swf_f0_e2[2048];
59 short normal_swf_f0_b1[2048];
60 short normal_swf_f0_b2[2048];
61 short normal_swf_f0_b3[2048];
57 WFPacket wfPacketNormal[4];
58 void buildWFAndDisplay(TMPacketToRead *packet, WFPacket *wfPacket, unsigned char num_page);
62 59
63 60 public slots:
64 61 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
@@ -71,12 +68,10 public slots:
71 68 void processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
72 69 void processPacketStore();
73 70 void updatePacketStore(selectedBridge bridge);
71 void nbPacketHasChanged(int nb);
74 72 int fetchPacket();
75 73 void receivePacketFromBridge(TMPacketToRead* packet);
76 74 //
77 void sendCCSDS();
78 void send_TC_LFR_UPDATE_TIME();
79 void reset_TC_LFR_UPDATE_TIME();
80 75 void displayOnConsole(QString message) {this->UI->console->append(message);}
81 76 //
82 77 void RMAP_write_reply_setText(QString text);
@@ -87,6 +82,10 public slots:
87 82
88 83 signals:
89 84 void ccsdsPacketIsProcessed();
85 void updateStatistics(unsigned char pid, unsigned char cat,
86 unsigned char typ, unsigned char sub,
87 unsigned int sid, unsigned int length,
88 unsigned int coarse_t, unsigned int fine_t);
90 89
91 90 private:
92 91 selectedBridge currentBridge;
Show file before | Show file after | Hide comments
@@ -37,7 +37,6 HEADERS += \
37 37 ccsds.h \
38 38 ../common_PLE/qipdialogbox.h \
39 39 ../common_PLE/gresbstatusenquiry.h \
40 spectralmatricesdmasimulator.h \
41 40 rmappluginpythonwrapper.h \
42 41 stardundee.h \
43 42 ../spw_usb_driver_v2.61/inc/spw_usb_api.h \
@@ -45,7 +44,12 HEADERS += \
45 44 gresb.h \
46 45 tcpackettosend.h \
47 46 tmpackettoread.h \
48 wfdisplay.h
47 wfdisplay.h \
48 tmstatistics.h \
49 wfplot.h \
50 wfpage.h \
51 wfpacket.h \
52 params.h
49 53
50 54
51 55 SOURCES += \
@@ -55,13 +59,16 SOURCES += \
55 59 ccsds.cpp \
56 60 ../common_PLE/qipdialogbox.cpp \
57 61 ../common_PLE/gresbstatusenquiry.cpp \
58 spectralmatricesdmasimulator.cpp \
59 62 rmappluginpythonwrapper.cpp \
60 63 stardundee.cpp \
61 64 gresb.cpp \
62 65 tcpackettosend.cpp \
63 66 tmpackettoread.cpp \
64 wfdisplay.cpp
67 wfdisplay.cpp \
68 tmstatistics.cpp \
69 wfplot.cpp \
70 wfpage.cpp \
71 wfpacket.cpp
65 72
66 73
67 74
Show file before | Show file after | Hide comments
@@ -25,7 +25,7 QList<QVariant> rmappluginPythonWrapper:
25 25 }
26 26 delete(ccsdsPacket);
27 27 }
28
28 emit nbPacketHasChanged(ccsdsPacketStore->size());
29 29 return result;
30 30 }
31 31
Show file before | Show file after | Hide comments
@@ -34,6 +34,7 signals:
34 34 void processPacketStoreNowSig();
35 35 void sendMessage(QString message);
36 36 int fetchPacketSig();
37 void nbPacketHasChanged(int nb);
37 38
38 39 public slots:
39 40 QList<QVariant> ReadSPW(unsigned int size=0);
Show file before | Show file after | Hide comments
@@ -24,14 +24,14
24 24 rmapPluginUI::rmapPluginUI(QWidget *parent) :
25 25 QWidget(parent)
26 26 {
27 spectralMatricesDMASimulator = new SpectralMatricesDMASimulator;
28 27 spwTabWidget = new QTabWidget;
28 //
29 29 QWidget* spwTabWidgetPage0 = new QWidget;
30 QWidget* spwTabWidgetPage1 = new QWidget;
31 30 QWidget* spwTabWidgetPage2 = new QWidget;
32 31 QWidget* spwTabWidgetPage3 = new QWidget;
33 32 QWidget* spwTabWidgetPage4 = new QWidget;
34 33 QWidget* spwTabWidgetPage5 = new QWidget;
34 //
35 35 bridgeWidget = new QWidget;
36 36 mainLayout = new QVBoxLayout;
37 37 ccsdsLayout = new QVBoxLayout;
@@ -55,7 +55,6 rmapPluginUI::rmapPluginUI(QWidget *pare
55 55 logFileName = new QLabel;
56 56 gresbStatusQueryLabel = new QLabel(tr("Status query socket (port 3010): waiting for connection"));
57 57 gresbStatusQueryDialogLabel = new QLabel(tr("sockets opened but SpaceWire link not running"));
58 sendCCSDSCommandLabel = new QLabel(tr("Address of the target"));
59 58 nbPacketInStore = new QLabel(tr("nb packets in store: -"));
60 59
61 60 //*** QPUSHBUTTON ***//
@@ -66,9 +65,6 rmapPluginUI::rmapPluginUI(QWidget *pare
66 65 logFileChooseButton = new QPushButton(tr("Choose file"));
67 66 gresbStatusQueryRetryButton = new QPushButton(tr("Retry"));
68 67 gresbStatusQueryAbortButton = new QPushButton(tr("Abort"));
69 sendCCSDSCommandButton = new QPushButton(tr("Send CCSDS Command"));
70 send_TC_LFR_UPDATE_TIME_Button = new QPushButton(tr("Send TC_LFR_UPDATE_TIME Packet"));
71 reset_TC_LFR_UPDATE_TIME_Button = new QPushButton(tr("reset the TC_LFR_UPDATE_TIME Packet coarse and fine times"));
72 68 clearConsoleButton = new QPushButton(tr("Clear"));
73 69
74 70 selectGRESB_BUTTON = new QRadioButton(tr("GRESB"));
@@ -83,25 +79,22 rmapPluginUI::rmapPluginUI(QWidget *pare
83 79 gresbVirtualLinkSpinBox->setRange(0, 4);
84 80 gresbVirtualLinkSpinBox->setValue(1);
85 81 rmapSourceLogicalAddressSpinBox->setRange(0, 255);
86 rmapSourceLogicalAddressSpinBox->setValue(0);
82 rmapSourceLogicalAddressSpinBox->setValue(RMAP_DEFAULT_SOURCE_ADDRESS);
87 83 rmapTargetLogicalAddressSpinBox->setRange(0, 255);
88 84 spwLinkSpinBox->setRange(0, 2);
89 85 spwLinkSpinBox->setValue(0);
90 CCSDSTargetLogicalAddressSpinBox->setRange(0,255);
91 CCSDSTargetLogicalAddressSpinBox->setValue(0);
92 86
93 87 //*** MISC **//
94 88 starDundee = new StarDundee;
95 89 gresbBridge = new gresb;
96 90 console = new QTextEdit;
97 //gresbBridgeIPDialogBox = new QIPDialogBox;
98 91 gresbStatusQueryDialog = new QDialog;
99 92 logEnableCheckBox = new QCheckBox(tr("Enable Logs"));
100 93 RMAP_write_verify = new QCheckBox(tr("data checked before write\nlimited to 4 bytes\nNOT IMPLEMENTED"));
101 94 RMAP_write_reply = new QCheckBox(tr("reply to the write command required\nlast reply status: unavailable"));
102 spwLinkStatusEnquiry = new gresbStatusEnquiry;
103 95 logFile = new QFile();
104 96 wfDisplay = new WFDisplay();
97 tmStatistics = new TMStatistics();
105 98
106 99 logFileEn = false;
107 100
@@ -110,8 +103,6 rmapPluginUI::rmapPluginUI(QWidget *pare
110 103
111 104 bridgeSelection_LAYOUT->addWidget(selectGRESB_BUTTON, 0, 0, 1, 1);
112 105 bridgeSelection_LAYOUT->addWidget(selectStarDundee_BUTTON, 0, 1, 1, 1);
113 bridgeSelection_LAYOUT->setRowStretch(1, 1);
114 bridgeSelection_LAYOUT->setColumnStretch(2, 1);
115 106
116 107 generalParameters_LAYOUT->addWidget(logEnableCheckBox, 0, 0, 1, 1);
117 108 generalParameters_LAYOUT->addWidget(logFileChooseButton, 0, 1, 1, 1);
@@ -138,14 +129,6 rmapPluginUI::rmapPluginUI(QWidget *pare
138 129 selectionLayout->addWidget(gresb_GROUPBOX);
139 130 selectionLayout->addWidget(stardundee_GROUPBOX);
140 131
141 //******
142 // CCSDS
143 ccsdsLayout->addWidget(sendCCSDSCommandButton);
144 ccsdsLayout->addWidget(send_TC_LFR_UPDATE_TIME_Button);
145 ccsdsLayout->addWidget(reset_TC_LFR_UPDATE_TIME_Button);
146 ccsdsLayout->addWidget(sendCCSDSCommandLabel);
147 ccsdsLayout->addWidget(CCSDSTargetLogicalAddressSpinBox);
148
149 132 //********
150 133 // CONSOLE
151 134 consoleLayout->addWidget(console);
@@ -157,17 +140,15 rmapPluginUI::rmapPluginUI(QWidget *pare
157 140 connect(this->logEnableCheckBox, SIGNAL(stateChanged(int)), this, SLOT(logFileEnDisable(int)));
158 141
159 142 spwTabWidget->addTab(spwTabWidgetPage0, tr("connection"));
160 spwTabWidget->addTab(spwTabWidgetPage1, tr("ccsds"));
161 143 spwTabWidget->addTab(spwTabWidgetPage2, tr("status"));
162 144 spwTabWidget->addTab(spwTabWidgetPage3, tr("console"));
163 spwTabWidget->addTab(spwTabWidgetPage4, tr("DMA"));
145 spwTabWidget->addTab(spwTabWidgetPage4, tr("TM statistics"));
164 146 spwTabWidget->addTab(spwTabWidgetPage5, tr("waveforms"));
165 147
166 148 spwTabWidgetPage0->setLayout(selectionLayout);
167 spwTabWidgetPage1->setLayout(ccsdsLayout);
168 spwTabWidgetPage2->setLayout(this->spwLinkStatusEnquiry->mainLayout);
149 spwTabWidgetPage2->setLayout(this->gresbBridge->spwLinkStatusEnquiry->mainLayout);
169 150 spwTabWidgetPage3->setLayout(consoleLayout);
170 spwTabWidgetPage4->setLayout(spectralMatricesDMASimulator->mainLayout);
151 spwTabWidgetPage4->setLayout(tmStatistics->layout());
171 152 spwTabWidgetPage5->setLayout(wfDisplay->layout());
172 153
173 154 mainLayout->addWidget(spwTabWidget);
Show file before | Show file after | Hide comments
@@ -40,12 +40,12
40 40 #include <rmapoperations.h>
41 41 #include <gresbstatusenquiry.h>
42 42 #include <QTextEdit>
43 #include "spectralmatricesdmasimulator.h"
44 43 #include <stardundee.h>
45 44 #include <gresb.h>
46 45 #include <QRadioButton>
47 46 #include <QGroupBox>
48 47 #include "wfdisplay.h"
48 #include "tmstatistics.h"
49 49
50 50 enum selectedBridge{
51 51 selectedBridgeIsUnknown,
@@ -82,8 +82,6 public:
82 82 QSpinBox* rmapTargetLogicalAddressSpinBox;
83 83 QSpinBox* CCSDSTargetLogicalAddressSpinBox;
84 84
85 //QIPDialogBox* gresbBridgeIPDialogBox;
86
87 85 QCheckBox *logEnableCheckBox;
88 86 QCheckBox *RMAP_write_verify;
89 87 QCheckBox *RMAP_write_reply;
@@ -97,14 +95,12 public:
97 95
98 96 QDialog* gresbStatusQueryDialog;
99 97
100 gresbStatusEnquiry* spwLinkStatusEnquiry;
101
102 SpectralMatricesDMASimulator *spectralMatricesDMASimulator;
103
104 98 QTextEdit* console;
105 99
106 100 WFDisplay* wfDisplay;
107 101
102 TMStatistics* tmStatistics;
103
108 104 // SPACEWIRE BRIDGES
109 105 StarDundee *starDundee;
110 106 gresb *gresbBridge;
General Comments 0
You need to be logged in to leave comments. Login now