HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/LPPMON_PLUGINS_PAUL Commit - r19:7f565009af54

waveform display added for the normal mode...

leroy -

r19:7f565009af54 default

parent child

Context file:

r19:7f565009af54

Makefile +1 -1

             #############################################################################
             # Makefile for building: PAULs_LPPMON_PLUGINS
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Apr 22 17:27:12 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Apr 25 14:28:34 2013
             # Project:  PAULs_LPPMON_PLUGINS.pro
             # Template: subdirs
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
             #############################################################################
             first: make_default
             MAKEFILE      = Makefile
             QMAKE         = /usr/bin/qmake-qt4
             DEL_FILE      = rm -f
             CHK_DIR_EXISTS= test -d
             MKDIR         = mkdir -p
             COPY          = cp -f
             COPY_FILE     = $(COPY)
             COPY_DIR      = $(COPY) -r
             INSTALL_FILE  = install -m 644 -p
             INSTALL_PROGRAM = install -m 755 -p
             INSTALL_DIR   = $(COPY_DIR)
             DEL_FILE      = rm -f
             SYMLINK       = ln -f -s
             DEL_DIR       = rmdir
             MOVE          = mv -f
             CHK_DIR_EXISTS= test -d
             MKDIR         = mkdir -p
             SUBTARGETS    =  \
             		sub-rmapplugin
             rmapplugin/$(MAKEFILE):
             	@$(CHK_DIR_EXISTS) rmapplugin/ || $(MKDIR) rmapplugin/
             	cd rmapplugin/ && $(QMAKE) /opt/LPPMON_PLUGINS_PAUL/rmapplugin/rmapplugin.pro -spec /usr/lib64/qt4/mkspecs/linux-g++ -o $(MAKEFILE)
             sub-rmapplugin-qmake_all:  FORCE
             	@$(CHK_DIR_EXISTS) rmapplugin/ || $(MKDIR) rmapplugin/
             	cd rmapplugin/ && $(QMAKE) /opt/LPPMON_PLUGINS_PAUL/rmapplugin/rmapplugin.pro -spec /usr/lib64/qt4/mkspecs/linux-g++ -o $(MAKEFILE)
             sub-rmapplugin: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE)
             sub-rmapplugin-make_default-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE)
             sub-rmapplugin-make_default: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE)
             sub-rmapplugin-make_first-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) first
             sub-rmapplugin-make_first: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) first
             sub-rmapplugin-all-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) all
             sub-rmapplugin-all: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) all
             sub-rmapplugin-clean-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) clean
             sub-rmapplugin-clean: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) clean
             sub-rmapplugin-distclean-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) distclean
             sub-rmapplugin-distclean: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) distclean
             sub-rmapplugin-install_subtargets-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) install
             sub-rmapplugin-install_subtargets: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) install
             sub-rmapplugin-uninstall_subtargets-ordered: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) uninstall
             sub-rmapplugin-uninstall_subtargets: rmapplugin/$(MAKEFILE) FORCE
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) uninstall
             Makefile: PAULs_LPPMON_PLUGINS.pro  /usr/lib64/qt4/mkspecs/linux-g++/qmake.conf /usr/lib64/qt4/mkspecs/common/unix.conf \
             		/usr/lib64/qt4/mkspecs/common/linux.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
             		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             		/usr/lib64/qt4/mkspecs/features/default_pre.prf \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/thread.prf \
             		/usr/lib64/qt4/mkspecs/features/moc.prf \
             		/usr/lib64/qt4/mkspecs/features/resources.prf \
             		/usr/lib64/qt4/mkspecs/features/uic.prf \
             		/usr/lib64/qt4/mkspecs/features/yacc.prf \
             		/usr/lib64/qt4/mkspecs/features/lex.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf
             	$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
             /usr/lib64/qt4/mkspecs/common/unix.conf:
             /usr/lib64/qt4/mkspecs/common/linux.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf:
             /usr/lib64/qt4/mkspecs/common/g++-base.conf:
             /usr/lib64/qt4/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt4/mkspecs/qconfig.pri:
             /usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri:
             /usr/lib64/qt4/mkspecs/features/qt_functions.prf:
             /usr/lib64/qt4/mkspecs/features/qt_config.prf:
             /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf:
             /usr/lib64/qt4/mkspecs/features/default_pre.prf:
             /usr/lib64/qt4/mkspecs/features/release.prf:
             /usr/lib64/qt4/mkspecs/features/default_post.prf:
             /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
             /usr/lib64/qt4/mkspecs/features/warn_on.prf:
             /usr/lib64/qt4/mkspecs/features/qt.prf:
             /usr/lib64/qt4/mkspecs/features/unix/thread.prf:
             /usr/lib64/qt4/mkspecs/features/moc.prf:
             /usr/lib64/qt4/mkspecs/features/resources.prf:
             /usr/lib64/qt4/mkspecs/features/uic.prf:
             /usr/lib64/qt4/mkspecs/features/yacc.prf:
             /usr/lib64/qt4/mkspecs/features/lex.prf:
             /usr/lib64/qt4/mkspecs/features/include_source_dir.prf:
             qmake: qmake_all FORCE
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile PAULs_LPPMON_PLUGINS.pro
             qmake_all: sub-rmapplugin-qmake_all FORCE
             make_default: sub-rmapplugin-make_default-ordered FORCE
             make_first: sub-rmapplugin-make_first-ordered FORCE
             all: sub-rmapplugin-all-ordered FORCE
             clean: sub-rmapplugin-clean-ordered FORCE
             distclean: sub-rmapplugin-distclean-ordered FORCE
             	-$(DEL_FILE) Makefile
             install_subtargets: sub-rmapplugin-install_subtargets-ordered FORCE
             uninstall_subtargets: sub-rmapplugin-uninstall_subtargets-ordered FORCE
             sub-rmapplugin-check_ordered: rmapplugin/$(MAKEFILE)
             	cd rmapplugin/ && $(MAKE) -f $(MAKEFILE) check
             check: sub-rmapplugin-check_ordered
             mocclean: compiler_moc_header_clean compiler_moc_source_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
             install: install_subtargets  FORCE
             uninstall:  uninstall_subtargets FORCE
             FORCE:

PAULs_LPPMON_PLUGINS.pro.user +1 -1

             <?xml version="1.0" encoding="UTF-8"?>
             <!DOCTYPE QtCreatorProject>
-            <!-- Written by Qt Creator 2.4.1, 2013-04-23T11:06:46. -->
+            <!-- Written by Qt Creator 2.4.1, 2013-04-26T15:28:06. -->
             <qtcreator>
              <data>
               <variable>ProjectExplorer.Project.ActiveTarget</variable>
               <value type="int">0</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.EditorSettings</variable>
               <valuemap type="QVariantMap">
                <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
                <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
                <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
                 <value type="QString" key="language">Cpp</value>
                 <valuemap type="QVariantMap" key="value">
                  <value type="QString" key="CurrentPreferences">CppGlobal</value>
                 </valuemap>
                </valuemap>
                <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
                 <value type="QString" key="language">QmlJS</value>
                 <valuemap type="QVariantMap" key="value">
                  <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
                 </valuemap>
                </valuemap>
                <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
                <value type="QByteArray" key="EditorConfiguration.Codec">System</value>
                <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
                <value type="int" key="EditorConfiguration.IndentSize">4</value>
                <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
                <value type="int" key="EditorConfiguration.PaddingMode">1</value>
                <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
                <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
                <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
                <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
                <value type="int" key="EditorConfiguration.TabSize">8</value>
                <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
                <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
                <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
                <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
                <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
                <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.PluginSettings</variable>
               <valuemap type="QVariantMap"/>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Target.0</variable>
               <valuemap type="QVariantMap">
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
                <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value>
                <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
                <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
                 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
                   <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
                  </valuemap>
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
                 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) Release</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
                </valuemap>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
                 <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-64bit./usr/bin/gdb</value>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
                   <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
                   <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
                  </valuemap>
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
                 </valuemap>
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
                  <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
                   <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
                   <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
                  </valuemap>
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
                 <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.2 in PATH (System) Debug</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/opt/LPPMON_PLUGINS_PAUL</value>
                 <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
                 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
                  <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                  <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
                 </valuemap>
                 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">No deployment</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
                 <value type="int" key="ProjectExplorer.CustomExecutableRunConfiguration.BaseEnvironmentBase">2</value>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable">lppmon</value>
                 <value type="bool" key="ProjectExplorer.CustomExecutableRunConfiguration.UseTerminal">false</value>
                 <valuelist type="QVariantList" key="ProjectExplorer.CustomExecutableRunConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run lppmon</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
                 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
                 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
                </valuemap>
                <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
                  <value type="int">0</value>
                  <value type="int">1</value>
                  <value type="int">2</value>
                  <value type="int">3</value>
                  <value type="int">4</value>
                  <value type="int">5</value>
                  <value type="int">6</value>
                  <value type="int">7</value>
                  <value type="int">8</value>
                  <value type="int">9</value>
                  <value type="int">10</value>
                  <value type="int">11</value>
                  <value type="int">12</value>
                  <value type="int">13</value>
                  <value type="int">14</value>
                 </valuelist>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">spwtimegenerator</value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
                 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration</value>
                 <value type="int" key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase">2</value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">spwtimegenerator/spwtimegenerator/spwtimegenerator.pro</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
                 <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
                 <valuelist type="QVariantList" key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges"/>
                 <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
                 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
                 <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
                 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
                </valuemap>
                <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
               </valuemap>
              </data>
              <data>
               <variable>ProjectExplorer.Project.TargetCount</variable>
               <value type="int">1</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
               <value type="QString">{2e58a81f-9962-4bba-ae6b-760177f0656c}</value>
              </data>
              <data>
               <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
               <value type="int">10</value>
              </data>
             </qtcreator>

rmapplugin/Makefile +92 -24

             #############################################################################
             # Makefile for building: librmapplugin.so.1.0.0
-            # Generated by qmake (2.01a) (Qt 4.8.4) on: Mon Apr 22 17:27:12 2013
+            # Generated by qmake (2.01a) (Qt 4.8.4) on: Fri Apr 26 08:31:53 2013
             # Project:  rmapplugin.pro
             # Template: lib
             # Command: /usr/bin/qmake-qt4 -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             #############################################################################
             ####### Compiler, tools and options
             CC            = gcc
             CXX           = g++
             DEFINES       = -DPLUGIN=rmapplugin -DPLUGINHEADER="\"rmapplugin.h\"" -Ddriver_Name="\"RMAPPlugin\"" -Ddriver_Author="\"Paul Leroy paul.leroy@lpp.polytechnique.fr\"" -Ddriver_Version="\"1.1.2\"" -Ddriver_Description="\"AHB bus controler, works with Gaisler's AHB plugn' play bus.\"" -Ddriver_can_be_root=1 -Ddriver_can_be_child=0 -Ddriver_VID=0 -Ddriver_PID=0 -DLPPMON_VERSION="\"0.0.1\"" -DUNIXTRANSLATIONPATH -DLPPMON_PLUGINS_INSTALL_PATH="QDir::homePath()+\"/.lppmon/plugins\"" -DLPPMON_CONFIG_PATH="QDir::homePath()+\"/.lppmon/config\"" -DLPPMON_TRANSLATION_PATH="\"/etc/lppmon/translations\"" -DLPPMONPLUGIN_LIBRARY -DQT_NO_DEBUG -DQT_XML_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
             CFLAGS        = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
             CXXFLAGS      = -pipe -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector --param=ssp-buffer-size=4 -m64 -mtune=generic -O2 -I/usr/include/python2.7 -I/usr/include/python2.7 -Wall -W -D_REENTRANT -fPIC $(DEFINES)
             INCPATH       = -I/usr/lib64/qt4/mkspecs/linux-g++ -I. -I/usr/include/QtCore -I/usr/include/QtNetwork -I/usr/include/QtGui -I/usr/include/QtXml -I/usr/include -I. -I../common_PLE -I../spw_usb_driver_v2.63/inc -I/usr/include/lppmon/common -I/usr/include/lppmon -I/usr/include/lppmon/pluginsInterface -I/usr/include/PythonQt -Imoc
             LINK          = g++
             LFLAGS        = -Wl,-O1 -Wl,-z,relro -shared -Wl,-soname,librmapplugin.so.1
             LIBS          = $(SUBLIBS)  -L/usr/lib64 ../spw_usb_driver_v2.63/lib/x86_64/libSpaceWireUSBAPI.so ../spw_usb_driver_v2.63/lib/x86_64/libConfigLibraryUSB.so -ldl -lutil -lm -lpython2.7 -lPythonQt_QtAll -lPythonQt -lQtXml -lQtGui -lQtNetwork -lQtCore -lpthread
             AR            = ar cqs
             RANLIB        =
             QMAKE         = /usr/bin/qmake-qt4
             TAR           = tar -cf
             COMPRESS      = gzip -9f
             COPY          = cp -f
             SED           = sed
             COPY_FILE     = $(COPY)
             COPY_DIR      = $(COPY) -r
             STRIP         =
             INSTALL_FILE  = install -m 644 -p
             INSTALL_DIR   = $(COPY_DIR)
             INSTALL_PROGRAM = install -m 755 -p
             DEL_FILE      = rm -f
             SYMLINK       = ln -f -s
             DEL_DIR       = rmdir
             MOVE          = mv -f
             CHK_DIR_EXISTS= test -d
             MKDIR         = mkdir -p
             ####### Output directory
             OBJECTS_DIR   = obj/
             ####### Files
             SOURCES       = 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 \
+            		tmstatistics.cpp \
+            		wfplot.cpp \
+            		wfpage.cpp \
+            		wfpacket.cpp \
             		/usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp 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_tmstatistics.cpp \
+            		moc/moc_wfplot.cpp \
+            		moc/moc_wfpage.cpp \
+            		moc/moc_wfpacket.cpp \
             		moc/moc_genericPySysdriver.cpp \
             		moc/moc_lppmonplugin.cpp
             OBJECTS       = obj/rmapplugin.o \
             		obj/rmappluginui.o \
             		obj/rmapoperations.o \
             		obj/ccsds.o \
             		obj/qipdialogbox.o \
             		obj/gresbstatusenquiry.o \
-            		obj/spectralmatricesdmasimulator.o \
             		obj/rmappluginpythonwrapper.o \
             		obj/stardundee.o \
             		obj/gresb.o \
             		obj/tcpackettosend.o \
             		obj/tmpackettoread.o \
             		obj/wfdisplay.o \
+            		obj/tmstatistics.o \
+            		obj/wfplot.o \
+            		obj/wfpage.o \
+            		obj/wfpacket.o \
             		obj/lppmonplugininterface.o \
             		obj/moc_rmappluginui.o \
             		obj/moc_rmapplugin.o \
             		obj/moc_qipdialogbox.o \
             		obj/moc_gresbstatusenquiry.o \
-            		obj/moc_spectralmatricesdmasimulator.o \
             		obj/moc_rmappluginpythonwrapper.o \
             		obj/moc_stardundee.o \
             		obj/moc_gresb.o \
             		obj/moc_tcpackettosend.o \
             		obj/moc_tmpackettoread.o \
             		obj/moc_wfdisplay.o \
+            		obj/moc_tmstatistics.o \
+            		obj/moc_wfplot.o \
+            		obj/moc_wfpage.o \
+            		obj/moc_wfpacket.o \
             		obj/moc_genericPySysdriver.o \
             		obj/moc_lppmonplugin.o
             DIST          = /usr/lib64/qt4/mkspecs/common/unix.conf \
             		/usr/lib64/qt4/mkspecs/common/linux.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
             		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             		/usr/lib64/qt4/mkspecs/features/default_pre.prf \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
             		/usr/lib64/qt4/mkspecs/features/lppmonplugin.prf \
             		/usr/lib64/qt4/mkspecs/features/pythonqt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/thread.prf \
             		/usr/lib64/qt4/mkspecs/features/moc.prf \
             		/usr/lib64/qt4/mkspecs/features/resources.prf \
             		/usr/lib64/qt4/mkspecs/features/uic.prf \
             		/usr/lib64/qt4/mkspecs/features/yacc.prf \
             		/usr/lib64/qt4/mkspecs/features/lex.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf \
             		rmapplugin.pro
             QMAKE_TARGET  = rmapplugin
             DESTDIR       = bin/
             TARGET        = librmapplugin.so.1.0.0
             TARGETA       = bin/librmapplugin.a
             TARGETD       = librmapplugin.so.1.0.0
             TARGET0       = librmapplugin.so
             TARGET1       = librmapplugin.so.1
             TARGET2       = librmapplugin.so.1.0
             first: all
             ####### Implicit rules
             .SUFFIXES: .o .c .cpp .cc .cxx .C
             .cpp.o:
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
             .cc.o:
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
             .cxx.o:
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
             .C.o:
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o "$@" "$<"
             .c.o:
             	$(CC) -c $(CFLAGS) $(INCPATH) -o "$@" "$<"
             ####### Build rules
             all: Makefile  bin/$(TARGET)
             bin/$(TARGET):  $(OBJECTS) $(SUBLIBS) $(OBJCOMP)
             	@$(CHK_DIR_EXISTS) bin/ || $(MKDIR) bin/
             	-$(DEL_FILE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2)
             	$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS) $(OBJCOMP)
             	-ln -s $(TARGET) $(TARGET0)
             	-ln -s $(TARGET) $(TARGET1)
             	-ln -s $(TARGET) $(TARGET2)
             	-$(DEL_FILE) bin/$(TARGET)
             	-$(DEL_FILE) bin/$(TARGET0)
             	-$(DEL_FILE) bin/$(TARGET1)
             	-$(DEL_FILE) bin/$(TARGET2)
             	-$(MOVE) $(TARGET) $(TARGET0) $(TARGET1) $(TARGET2) bin/
             staticlib: $(TARGETA)
             $(TARGETA):  $(OBJECTS) $(OBJCOMP)
             	-$(DEL_FILE) $(TARGETA)
             	$(AR) $(TARGETA) $(OBJECTS)
             Makefile: rmapplugin.pro  /usr/lib64/qt4/mkspecs/linux-g++/qmake.conf /usr/lib64/qt4/mkspecs/common/unix.conf \
             		/usr/lib64/qt4/mkspecs/common/linux.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base.conf \
             		/usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-base.conf \
             		/usr/lib64/qt4/mkspecs/common/g++-unix.conf \
             		/usr/lib64/qt4/mkspecs/qconfig.pri \
             		/usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri \
             		/usr/lib64/qt4/mkspecs/features/qt_functions.prf \
             		/usr/lib64/qt4/mkspecs/features/qt_config.prf \
             		/usr/lib64/qt4/mkspecs/features/exclusive_builds.prf \
             		/usr/lib64/qt4/mkspecs/features/default_pre.prf \
             		/usr/lib64/qt4/mkspecs/features/release.prf \
             		/usr/lib64/qt4/mkspecs/features/default_post.prf \
             		/usr/lib64/qt4/mkspecs/features/lppmonplugin.prf \
             		/usr/lib64/qt4/mkspecs/features/pythonqt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf \
             		/usr/lib64/qt4/mkspecs/features/warn_on.prf \
             		/usr/lib64/qt4/mkspecs/features/qt.prf \
             		/usr/lib64/qt4/mkspecs/features/unix/thread.prf \
             		/usr/lib64/qt4/mkspecs/features/moc.prf \
             		/usr/lib64/qt4/mkspecs/features/resources.prf \
             		/usr/lib64/qt4/mkspecs/features/uic.prf \
             		/usr/lib64/qt4/mkspecs/features/yacc.prf \
             		/usr/lib64/qt4/mkspecs/features/lex.prf \
             		/usr/lib64/qt4/mkspecs/features/include_source_dir.prf \
             		/usr/lib64/libQtXml.prl \
             		/usr/lib64/libQtCore.prl \
             		/usr/lib64/libQtGui.prl \
             		/usr/lib64/libQtNetwork.prl
             	$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             /usr/lib64/qt4/mkspecs/common/unix.conf:
             /usr/lib64/qt4/mkspecs/common/linux.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base.conf:
             /usr/lib64/qt4/mkspecs/common/gcc-base-unix.conf:
             /usr/lib64/qt4/mkspecs/common/g++-base.conf:
             /usr/lib64/qt4/mkspecs/common/g++-unix.conf:
             /usr/lib64/qt4/mkspecs/qconfig.pri:
             /usr/lib64/qt4/mkspecs/modules/qt_webkit_version.pri:
             /usr/lib64/qt4/mkspecs/features/qt_functions.prf:
             /usr/lib64/qt4/mkspecs/features/qt_config.prf:
             /usr/lib64/qt4/mkspecs/features/exclusive_builds.prf:
             /usr/lib64/qt4/mkspecs/features/default_pre.prf:
             /usr/lib64/qt4/mkspecs/features/release.prf:
             /usr/lib64/qt4/mkspecs/features/default_post.prf:
             /usr/lib64/qt4/mkspecs/features/lppmonplugin.prf:
             /usr/lib64/qt4/mkspecs/features/pythonqt.prf:
             /usr/lib64/qt4/mkspecs/features/unix/gdb_dwarf_index.prf:
             /usr/lib64/qt4/mkspecs/features/warn_on.prf:
             /usr/lib64/qt4/mkspecs/features/qt.prf:
             /usr/lib64/qt4/mkspecs/features/unix/thread.prf:
             /usr/lib64/qt4/mkspecs/features/moc.prf:
             /usr/lib64/qt4/mkspecs/features/resources.prf:
             /usr/lib64/qt4/mkspecs/features/uic.prf:
             /usr/lib64/qt4/mkspecs/features/yacc.prf:
             /usr/lib64/qt4/mkspecs/features/lex.prf:
             /usr/lib64/qt4/mkspecs/features/include_source_dir.prf:
             /usr/lib64/libQtXml.prl:
             /usr/lib64/libQtCore.prl:
             /usr/lib64/libQtGui.prl:
             /usr/lib64/libQtNetwork.prl:
             qmake:  FORCE
             	@$(QMAKE) -spec /usr/lib64/qt4/mkspecs/linux-g++ -o Makefile rmapplugin.pro
             dist:
             	@$(CHK_DIR_EXISTS) obj/rmapplugin1.0.0 || $(MKDIR) obj/rmapplugin1.0.0
-            	$(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
+            	$(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
             clean:compiler_clean
             	-$(DEL_FILE) $(OBJECTS)
             	-$(DEL_FILE) *~ core *.core
             ####### Sub-libraries
             distclean: clean
             	-$(DEL_FILE) bin/$(TARGET)
             	-$(DEL_FILE) bin/$(TARGET0) bin/$(TARGET1) bin/$(TARGET2) $(TARGETA)
             	-$(DEL_FILE) Makefile
             check: first
             mocclean: compiler_moc_header_clean compiler_moc_source_clean
             mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-            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
+            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
             compiler_moc_header_clean:
-            	-$(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
+            	-$(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
             moc/moc_rmappluginui.cpp: rmapoperations.h \
-            		spectralmatricesdmasimulator.h \
             		stardundee.h \
             		ccsds.h \
             		tmpackettoread.h \
             		gresb.h \
             		wfdisplay.h \
+            		wfplot.h \
+            		params.h \
+            		wfpage.h \
+            		tmstatistics.h \
             		rmappluginui.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginui.h -o moc/moc_rmappluginui.cpp
             moc/moc_rmapplugin.cpp: rmappluginui.h \
             		rmapoperations.h \
-            		spectralmatricesdmasimulator.h \
             		stardundee.h \
             		ccsds.h \
             		tmpackettoread.h \
             		gresb.h \
             		wfdisplay.h \
+            		wfplot.h \
+            		params.h \
+            		wfpage.h \
+            		tmstatistics.h \
+            		wfpacket.h \
             		rmapplugin.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmapplugin.h -o moc/moc_rmapplugin.cpp
             moc/moc_qipdialogbox.cpp: ../common_PLE/qipdialogbox.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../common_PLE/qipdialogbox.h -o moc/moc_qipdialogbox.cpp
             moc/moc_gresbstatusenquiry.cpp: ../common_PLE/gresbstatusenquiry.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) ../common_PLE/gresbstatusenquiry.h -o moc/moc_gresbstatusenquiry.cpp
-            moc/moc_spectralmatricesdmasimulator.cpp: spectralmatricesdmasimulator.h
-            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) spectralmatricesdmasimulator.h -o moc/moc_spectralmatricesdmasimulator.cpp
             moc/moc_rmappluginpythonwrapper.cpp: rmapoperations.h \
             		ccsds.h \
             		tcpackettosend.h \
             		tmpackettoread.h \
             		rmappluginpythonwrapper.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) rmappluginpythonwrapper.h -o moc/moc_rmappluginpythonwrapper.cpp
             moc/moc_stardundee.cpp: rmapoperations.h \
             		ccsds.h \
             		tmpackettoread.h \
             		stardundee.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) stardundee.h -o moc/moc_stardundee.cpp
             moc/moc_gresb.cpp: rmapoperations.h \
             		ccsds.h \
             		tmpackettoread.h \
             		gresb.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) gresb.h -o moc/moc_gresb.cpp
             moc/moc_tcpackettosend.cpp: tcpackettosend.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tcpackettosend.h -o moc/moc_tcpackettosend.cpp
             moc/moc_tmpackettoread.cpp: tmpackettoread.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmpackettoread.h -o moc/moc_tmpackettoread.cpp
-            moc/moc_wfdisplay.cpp: wfdisplay.h
+            moc/moc_wfdisplay.cpp: wfplot.h \
+            		params.h \
+            		wfpage.h \
+            		wfdisplay.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfdisplay.h -o moc/moc_wfdisplay.cpp
+            moc/moc_tmstatistics.cpp: tmstatistics.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) tmstatistics.h -o moc/moc_tmstatistics.cpp
+            moc/moc_wfplot.cpp: params.h \
+            		wfplot.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfplot.h -o moc/moc_wfplot.cpp
+            moc/moc_wfpage.cpp: wfplot.h \
+            		params.h \
+            		wfpage.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpage.h -o moc/moc_wfpage.cpp
+            moc/moc_wfpacket.cpp: params.h \
+            		wfpacket.h
+            	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) wfpacket.h -o moc/moc_wfpacket.cpp
             moc/moc_genericPySysdriver.cpp: /usr/include/lppmon/genericPySysdriver.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/genericPySysdriver.h -o moc/moc_genericPySysdriver.cpp
             moc/moc_lppmonplugin.cpp: /usr/include/lppmon/lppmonplugin.h
             	/usr/lib64/qt4/bin/moc $(DEFINES) $(INCPATH) /usr/include/lppmon/lppmonplugin.h -o moc/moc_lppmonplugin.cpp
             compiler_rcc_make_all:
             compiler_rcc_clean:
             compiler_image_collection_make_all: qmake_image_collection.cpp
             compiler_image_collection_clean:
             	-$(DEL_FILE) qmake_image_collection.cpp
             compiler_moc_source_make_all:
             compiler_moc_source_clean:
             compiler_uic_make_all:
             compiler_uic_clean:
             compiler_yacc_decl_make_all:
             compiler_yacc_decl_clean:
             compiler_yacc_impl_make_all:
             compiler_yacc_impl_clean:
             compiler_lex_make_all:
             compiler_lex_clean:
             compiler_clean: compiler_moc_header_clean
             ####### Compile
             obj/rmapplugin.o: rmapplugin.cpp rmapplugin.h \
             		rmappluginui.h \
             		rmapoperations.h \
-            		spectralmatricesdmasimulator.h \
             		stardundee.h \
             		ccsds.h \
             		tmpackettoread.h \
             		gresb.h \
             		wfdisplay.h \
+            		wfplot.h \
+            		params.h \
+            		wfpage.h \
+            		tmstatistics.h \
+            		wfpacket.h \
             		rmappluginpythonwrapper.h \
             		tcpackettosend.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapplugin.o rmapplugin.cpp
             obj/rmappluginui.o: rmappluginui.cpp rmapplugin.h \
             		rmappluginui.h \
             		rmapoperations.h \
-            		spectralmatricesdmasimulator.h \
             		stardundee.h \
             		ccsds.h \
             		tmpackettoread.h \
             		gresb.h \
-            		wfdisplay.h
+            		wfdisplay.h \
+            		wfplot.h \
+            		params.h \
+            		wfpage.h \
+            		tmstatistics.h \
+            		wfpacket.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginui.o rmappluginui.cpp
             obj/rmapoperations.o: rmapoperations.cpp rmapoperations.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmapoperations.o rmapoperations.cpp
             obj/ccsds.o: ccsds.cpp ccsds.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/ccsds.o ccsds.cpp
             obj/qipdialogbox.o: ../common_PLE/qipdialogbox.cpp ../common_PLE/qipdialogbox.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/qipdialogbox.o ../common_PLE/qipdialogbox.cpp
             obj/gresbstatusenquiry.o: ../common_PLE/gresbstatusenquiry.cpp ../common_PLE/gresbstatusenquiry.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresbstatusenquiry.o ../common_PLE/gresbstatusenquiry.cpp
-            obj/spectralmatricesdmasimulator.o: spectralmatricesdmasimulator.cpp spectralmatricesdmasimulator.h
-            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/spectralmatricesdmasimulator.o spectralmatricesdmasimulator.cpp
             obj/rmappluginpythonwrapper.o: rmappluginpythonwrapper.cpp rmappluginpythonwrapper.h \
             		rmapoperations.h \
             		ccsds.h \
             		tcpackettosend.h \
             		tmpackettoread.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/rmappluginpythonwrapper.o rmappluginpythonwrapper.cpp
             obj/stardundee.o: stardundee.cpp stardundee.h \
             		rmapoperations.h \
             		ccsds.h \
             		tmpackettoread.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/stardundee.o stardundee.cpp
             obj/gresb.o: gresb.cpp gresb.h \
             		rmapoperations.h \
             		ccsds.h \
             		tmpackettoread.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/gresb.o gresb.cpp
             obj/tcpackettosend.o: tcpackettosend.cpp tcpackettosend.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tcpackettosend.o tcpackettosend.cpp
             obj/tmpackettoread.o: tmpackettoread.cpp tmpackettoread.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmpackettoread.o tmpackettoread.cpp
-            obj/wfdisplay.o: wfdisplay.cpp wfdisplay.h
+            obj/wfdisplay.o: wfdisplay.cpp wfdisplay.h \
+            		wfplot.h \
+            		params.h \
+            		wfpage.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfdisplay.o wfdisplay.cpp
+            obj/tmstatistics.o: tmstatistics.cpp tmstatistics.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/tmstatistics.o tmstatistics.cpp
+            obj/wfplot.o: wfplot.cpp wfplot.h \
+            		params.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfplot.o wfplot.cpp
+            obj/wfpage.o: wfpage.cpp wfpage.h \
+            		wfplot.h \
+            		params.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpage.o wfpage.cpp
+            obj/wfpacket.o: wfpacket.cpp wfpacket.h \
+            		params.h
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/wfpacket.o wfpacket.cpp
             obj/lppmonplugininterface.o: /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp /usr/include/lppmon/pluginsInterface/lppmonplugininterface.h \
             		/usr/include/lppmon/pluginsInterface/lppmonplugininterface_global.h
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/lppmonplugininterface.o /usr/include/lppmon/pluginsInterface/lppmonplugininterface.cpp
             obj/moc_rmappluginui.o: moc/moc_rmappluginui.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmappluginui.o moc/moc_rmappluginui.cpp
             obj/moc_rmapplugin.o: moc/moc_rmapplugin.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmapplugin.o moc/moc_rmapplugin.cpp
             obj/moc_qipdialogbox.o: moc/moc_qipdialogbox.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_qipdialogbox.o moc/moc_qipdialogbox.cpp
             obj/moc_gresbstatusenquiry.o: moc/moc_gresbstatusenquiry.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresbstatusenquiry.o moc/moc_gresbstatusenquiry.cpp
-            obj/moc_spectralmatricesdmasimulator.o: moc/moc_spectralmatricesdmasimulator.cpp
-            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_spectralmatricesdmasimulator.o moc/moc_spectralmatricesdmasimulator.cpp
             obj/moc_rmappluginpythonwrapper.o: moc/moc_rmappluginpythonwrapper.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_rmappluginpythonwrapper.o moc/moc_rmappluginpythonwrapper.cpp
             obj/moc_stardundee.o: moc/moc_stardundee.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_stardundee.o moc/moc_stardundee.cpp
             obj/moc_gresb.o: moc/moc_gresb.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_gresb.o moc/moc_gresb.cpp
             obj/moc_tcpackettosend.o: moc/moc_tcpackettosend.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tcpackettosend.o moc/moc_tcpackettosend.cpp
             obj/moc_tmpackettoread.o: moc/moc_tmpackettoread.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmpackettoread.o moc/moc_tmpackettoread.cpp
             obj/moc_wfdisplay.o: moc/moc_wfdisplay.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfdisplay.o moc/moc_wfdisplay.cpp
+            obj/moc_tmstatistics.o: moc/moc_tmstatistics.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_tmstatistics.o moc/moc_tmstatistics.cpp
+            obj/moc_wfplot.o: moc/moc_wfplot.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfplot.o moc/moc_wfplot.cpp
+            obj/moc_wfpage.o: moc/moc_wfpage.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpage.o moc/moc_wfpage.cpp
+            obj/moc_wfpacket.o: moc/moc_wfpacket.cpp
+            	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_wfpacket.o moc/moc_wfpacket.cpp
             obj/moc_genericPySysdriver.o: moc/moc_genericPySysdriver.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_genericPySysdriver.o moc/moc_genericPySysdriver.cpp
             obj/moc_lppmonplugin.o: moc/moc_lppmonplugin.cpp
             	$(CXX) -c $(CXXFLAGS) $(INCPATH) -o obj/moc_lppmonplugin.o moc/moc_lppmonplugin.cpp
             ####### Install
             install_target: first FORCE
             	@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/ || $(MKDIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/
             	-$(INSTALL_PROGRAM) "bin/$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
             	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
             	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
             	-$(SYMLINK) "$(TARGET)" "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
             uninstall_target:  FORCE
             	-$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET)"
             	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET0)"
             	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET1)"
             	 -$(DEL_FILE) "$(INSTALL_ROOT)/home/paul/.lppmon/plugins/$(TARGET2)"
             	-$(DEL_DIR) $(INSTALL_ROOT)/home/paul/.lppmon/plugins/
             install:  install_target  FORCE
             uninstall: uninstall_target   FORCE
             FORCE:

rmapplugin/gresb.h +2 -2

             #ifndef GRESB_H
             #define GRESB_H
             #include <QWidget>
             #include <QLabel>
             #include <QPushButton>
             #include <QSpinBox>
             #include <QGridLayout>
             #include <QTcpSocket>
             #include <QDialog>
             #include <QSemaphore>
             #include "gresbstatusenquiry.h"
             #include "rmapoperations.h"
             #include "qipdialogbox.h"
             #include "ccsds.h"
             #include "tmpackettoread.h"
             class gresb : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit gresb(QWidget *parent = 0);
                 ~gresb();
                 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
                 unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
+                gresbStatusEnquiry* spwLinkStatusEnquiry;
             signals:
                 void sendMessage(QString message);
                 void sendPacket(TMPacketToRead*);
                 void isOpen(bool);
                 void RMAP_write_reply_setText(QString);
                 void appendToLog(QString);
             public slots:
                 void Open();
                 void Close();
                 int receiveSPWPacketLoop(unsigned char requestID=0);
                 int receiveSPWPacket(unsigned char requestID=0);
                 void commandCodeHasChanged(RMAP_command_codes code) {this->commandCode = code;}
                 void targetHasChanged(int target) {rmapTargetLogicalAddress = (unsigned char) target;}
                 void sourceHasChanged(int source) {rmapSourceLogicalAddress = (unsigned char) source;}
                 void ccsdsPacketIsProcessed() {ccsdsPacketSEMAPHORE->tryAcquire();}
                 void reTestSPWLink();
                 //
                 void RMAPSendConnectionState(QAbstractSocket::SocketState socketState);
                 void RMAPReceiveConnectionState(QAbstractSocket::SocketState socketState);
                 void GRESBConnectionState(QAbstractSocket::SocketState socketState);
                 //
                 void setIP(unsigned char address1, unsigned char address2, unsigned char address3, unsigned char address4)
                     {this->gresbBridgeIPDialogBox->setIP(address1, address2, address3, address4);}
             private slots:
                 int GRESBStatusQuery();
             private:
                 unsigned int WriteBLOCK(char *data,unsigned int nbBytes,unsigned int address=0);
                 unsigned int ReadBLOCK(unsigned int nbBytes,unsigned int address=0);
                 void acquireRMAPSemaphore() {rmapPacketSEMAPHORE->tryAcquire();}
                 void acquireCCSDSSemaphore() {ccsdsPacketSEMAPHORE->tryAcquire();}
                 int GRESBStatusQueryRequest(GresbStatusQueryOption option, char link);
                 unsigned char rmapTargetLogicalAddress ;
                 unsigned char rmapSourceLogicalAddress ;
                 RMAP_command_codes commandCode;
                 QPushButton *gresbStatusQueryRetryButton;
                 QPushButton *gresbStatusQueryAbortButton;
                 QLabel *gresbBridgeIPLabel;
                 QLabel *gresbVirtualLinkLabel;
                 QLabel *spwLinkLabel;
                 QLabel *rmapSendStateLabel;
                 QLabel *rmapReceiveStateLabel;
                 QLabel *gresbStatusQueryLabel;
                 QLabel *gresbStatusQueryDialogLabel;
                 QDialog *gresbStatusQueryDialog;
                 QIPDialogBox* gresbBridgeIPDialogBox;
                 QSpinBox *gresbVirtualLinkSpinBox;
                 QSpinBox *spwLinkSpinBox;
                 QGridLayout *connectionLayout;
                 QGridLayout *gresbStatusQueryDialogLayout;
                 QTcpSocket *RMAPSend_SOCKET;
                 QTcpSocket *RMAPReceive_SOCKET;
                 QTcpSocket *GRESBStatusQuery_SOCKET;
-                gresbStatusEnquiry* spwLinkStatusEnquiry;
                 // Packet receiver
                 QSemaphore *rmapPacketSEMAPHORE;
                 QSemaphore *ccsdsPacketSEMAPHORE;
                 char* rmapPacket;      // The buffer to receive RMAP READ packets
                 unsigned char *ccsdsPacket;
                 char *spwPacket;
                 unsigned int rmapPacketSize;
                 unsigned int ccsdsPacketSize;
             };
             #endif // GRESB_H

rmapplugin/rmapplugin.cpp +81 -141

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 2012, Laboratory of Plasma Physics - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Paul LEROY
             --                     Mail : paul.leroy@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "rmapplugin.h"
             #include <QHostAddress>
             #include <QIODevice>
             #include <QApplication>
             #include <rmappluginpythonwrapper.h>
             #include <PythonQt.h>
             #include <QTimer>
             rmapplugin::rmapplugin(QWidget *parent)
               :lppmonplugin(parent,false)
             {
                 this->UI = new rmapPluginUI();
                 this->setWindowTitle(tr("RMAP and SPW Communication"));
                 this->setWidget((QWidget*)this->UI);
                 timeCode = 0;
                 time_COARSE = 0;
                 time_FINE = 0;
                 currentBridge = selectedBridgeIsUnknown;
                 //**************
                 //Python wrapper
                 this->pyObject = new rmappluginPythonWrapper();
                 connect(this->pyObject,SIGNAL(ReadSig(uint*,uint,uint)),this,SLOT(Read(uint*,uint,uint)));
                 connect(this->pyObject,SIGNAL(WriteSig(uint*,uint,uint)),this,SLOT(Write(uint*,uint,uint)));
                 //**
                 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL( WriteSPWSig(char*,uint,char,char) ),
                         this, SLOT( WriteSPW(char*,uint,char,char)), Qt::DirectConnection );
                 //**
                 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL( updateTargetAddress(unsigned char) ),
                         this, SLOT( setValueTargetAddress(unsigned char)) );
                 //**
                 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL( updateSourceAddress(unsigned char) ),
                         this, SLOT( setValueSourceAddress(unsigned char)) );
                 //**
                 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(sendMessage(QString)),
                          this, SLOT(displayOnConsole(QString)) );
                 //**
                 connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(fetchPacketSig()),
                          this, SLOT(fetchPacket()), Qt::DirectConnection );
+                //***
+                connect( (rmappluginPythonWrapper*)this->pyObject, SIGNAL(nbPacketHasChanged(int)),
+                         this, SLOT(nbPacketHasChanged(int)));
                 //**************
                 //**************
                 // get a smart pointer to the __main__ module of the Python interpreter
                 PythonQtObjectPtr context = PythonQt::self()->getMainModule();
                 // add a QObject as variable of name "BUTTON_rmapOpenCommunication" to the namespace of the __main__ module
                 context.addObject("BUTTON_rmapOpenCommunication", UI->rmapOpenCommunicationButton);
                 context.addObject("BUTTON_rmapCloseCommunication", UI->rmapCloseCommunicationButton);
                 context.addObject("BUTTON_selectStarDundee", UI->selectStarDundee_BUTTON);
                 context.addObject("BUTTON_selectGRESB", UI->selectGRESB_BUTTON);
                 context.addObject("GRESB_Bridge", UI->gresbBridge);
                 //**************
                 connect(UI->rmapOpenCommunicationButton, SIGNAL(clicked()), this, SLOT(openBridge()));
                 connect(UI->rmapCloseCommunicationButton, SIGNAL(clicked()), this, SLOT(closeBridge()));
+                connect(this, SIGNAL(
-                // CCSDS
+                            updateStatistics(unsigned char,unsigned char,unsigned char,unsigned char,uint,uint,uint,uint)
-                connect(this->UI->sendCCSDSCommandButton, SIGNAL(clicked()), this, SLOT(sendCCSDS()));
+                            ),
-                connect(this->UI->send_TC_LFR_UPDATE_TIME_Button, SIGNAL(clicked()), this, SLOT(send_TC_LFR_UPDATE_TIME()));
+                        this->UI->tmStatistics, SLOT(
-                connect(this->UI->reset_TC_LFR_UPDATE_TIME_Button, SIGNAL(clicked()), this, SLOT(reset_TC_LFR_UPDATE_TIME()));
+                            updateStatistics(unsigned char,unsigned char,unsigned char,unsigned char,uint,uint,uint,uint)
+                            ));
-                // spectralMAtricesDMASimulator
-                connect(this->UI->spectralMatricesDMASimulator, SIGNAL(rmapplugginRead(uint*,uint,uint)), this, SLOT(Read(uint*,uint,uint)));
-                connect(this->UI->spectralMatricesDMASimulator, SIGNAL(rmapplugginWrite(uint*,uint,uint)), this, SLOT(Write(uint*,uint,uint)));
-                connect(this->UI->spectralMatricesDMASimulator, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
                 //******
                 // GRESB
                 connect(this->UI->gresbBridge, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
                 connect(this->UI->gresbBridge, SIGNAL(isOpen(bool)), this, SLOT(activatePlugin(bool)));
                 connect(this->UI->gresbBridge, SIGNAL(RMAP_write_reply_setText(QString)), this, SLOT(RMAP_write_reply_setText(QString)));
                 connect(this->UI->gresbBridge, SIGNAL(appendToLog(QString)), this, SLOT(appendToLog(QString)));
                 connect(this, SIGNAL(ccsdsPacketIsProcessed()), this->UI->gresbBridge, SLOT(ccsdsPacketIsProcessed()));
                 connect(this->UI->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
                         this->UI->gresbBridge, SLOT(targetHasChanged(int)));
                 connect(this->UI->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
                         this->UI->gresbBridge, SLOT(sourceHasChanged(int)));
                 connect(this->UI->gresbBridge, SIGNAL(sendPacket(TMPacketToRead*)),
                         this, SLOT(receivePacketFromBridge(TMPacketToRead*)));
                 //************
                 // Star Dundee
                 connect(this->UI->starDundee, SIGNAL(sendMessage(QString)), this, SLOT(displayOnConsole(QString)));
                 connect(this->UI->starDundee, SIGNAL(isOpen(bool)), this, SLOT(activatePlugin(bool)));
                 connect(this->UI->starDundee, SIGNAL(RMAP_write_reply_setText(QString)), this, SLOT(RMAP_write_reply_setText(QString)));
                 connect(this->UI->starDundee, SIGNAL(appendToLog(QString)), this, SLOT(appendToLog(QString)));
                 connect(this, SIGNAL(ccsdsPacketIsProcessed()), this->UI->starDundee, SLOT(ccsdsPacketIsProcessed()));
                 connect(this->UI->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
                         this->UI->starDundee, SLOT(targetHasChanged(int)));
                 connect(this->UI->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)),
                         this->UI->starDundee, SLOT(sourceHasChanged(int)));
                 connect(this->UI->starDundee, SIGNAL(sendPacket(TMPacketToRead*)),
                         this, SLOT(receivePacketFromBridge(TMPacketToRead*)));
                 connect(this->UI, SIGNAL(bridgeHasChanged(selectedBridge)), this, SLOT(bridgeHasChanged(selectedBridge)));
                 ((rmappluginPythonWrapper*)this->pyObject)->ccsdsPacketStore = &(this->generalCCSDSPacketStore);
             }
             rmapplugin::~rmapplugin()
             {
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     if (RMAPSend_SOCKET->isOpen()) RMAPSend_SOCKET->disconnectFromHost();
                     if (RMAPReceive_SOCKET->isOpen()) RMAPReceive_SOCKET->disconnectFromHost();
                     if (GRESBStatusQuery_SOCKET->isOpen()) GRESBStatusQuery_SOCKET->disconnectFromHost();
                     break;
                 case selectedBridgeIsStarDundee :
                     break;
                 default:
                     break;
                 }
             }
             unsigned int rmapplugin::Write(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int result;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     result = UI->gresbBridge->Write(Value, count, address);
                     break;
                 case selectedBridgeIsStarDundee :
                     result = UI->starDundee->Write(Value, count, address);
                     break;
                 default:
                     result = 1;
                     break;
                 }
                 return result;
             }
             unsigned int rmapplugin::Read(unsigned int *Value, unsigned int count, unsigned int address)
             {
                 unsigned int result;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     result = UI->gresbBridge->Read(Value, count, address);
                     break;
                 case selectedBridgeIsStarDundee :
                     result = UI->starDundee->Read(Value, count, address);
                     break;
                 default:
                     result = 1;
                     break;
                 }
                 return result;
             }
             ////////
             // SLOTS
             unsigned int rmapplugin::WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication) // SLOT
             {
                 unsigned int result;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     result = UI->gresbBridge->WriteSPW(Value, count, targetLogicalAddress, userApplication);
                     break;
                 case selectedBridgeIsStarDundee :
                     result = UI->starDundee->WriteSPW(Value, count, targetLogicalAddress, userApplication);
                     break;
                 default:
                     result = 1;
                     break;
                 }
                 return result;
             }
-            void rmapplugin::sendCCSDS() // SLOT
-                unsigned int nbBYTES_application_data = 8;
-                unsigned int count;
-                char *tab;
-                unsigned char packetErrorControl1 = 0xaa;
-                unsigned char packetErrorControl0 = 0xbb;
-                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
-                /*      unsigned char data_field_header,
-                        unsigned char processID,
-                        unsigned int sequence_count,
-                        unsigned int packet_length,
-                        unsigned char acceptance,
-                        unsigned int completion,
-                        unsigned char service_type,
-                        unsigned char service_subtype,
-                        unsigned char sourceID*/
-                count = nbBYTES_application_data+12; // 12 is the size in bytes of the header
-                tab = (char*) malloc(count);
-                tab[0] = ccsds_command->ccsds_header->packetId1;
-                tab[1] = ccsds_command->ccsds_header->packetId0;
-                tab[2] = ccsds_command->ccsds_header->packetSequenceControl1;
-                tab[3] = ccsds_command->ccsds_header->packetSequenceControl0;
-                tab[4] = ccsds_command->ccsds_header->packetLength1;
-                tab[5] = ccsds_command->ccsds_header->packetLength0;
-                tab[6] = ccsds_command->ccsds_header->dataFieldHeader3;
-                tab[7] = ccsds_command->ccsds_header->dataFieldHeader2;
-                tab[8] = ccsds_command->ccsds_header->dataFieldHeader1;
-                tab[9] = ccsds_command->ccsds_header->dataFieldHeader0;
-                tab[10]=0x00;
-                tab[11]=0x00;
-                tab[12]=0x00;
-                tab[13]=0x00;
-                tab[14]=0x00;
-                tab[15]=0x00;
-                tab[nbBYTES_application_data+10] = packetErrorControl1;
-                tab[nbBYTES_application_data+11] = packetErrorControl0;
-                WriteSPW(tab, count, UI->CCSDSTargetLogicalAddressSpinBox->value(), 0x00);
-                free(tab);
             void rmapplugin::openBridge()
             {
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     this->UI->gresbBridge->Open();
                     break;
                 case selectedBridgeIsStarDundee :
                     this->UI->starDundee->Open();
                     break;
                 default:
                     break;
                 }
             }
             void rmapplugin::closeBridge()
             {
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     this->UI->gresbBridge->Close();
                     break;
                 case selectedBridgeIsStarDundee :
                     this->UI->starDundee->Close();
                     break;
                 default:
                     break;
                 }
             }
-            void rmapplugin::send_TC_LFR_UPDATE_TIME()
-                unsigned int nbBYTES_application_data = 6; // Time at CUC format is on 48 bits / 6 bytes
-                unsigned int count;
-                char *tab;
-                unsigned char packetErrorControl1 = 0xaa;
-                unsigned char packetErrorControl0 = 0xbb;
-                ccsds_command = new ccsds(1, 11, 0, nbBYTES_application_data, 1, 1, 9, 129, 0);
-                /*      unsigned char data_field_header,
-                        unsigned char processID,
-                        unsigned int sequence_count,
-                        unsigned int packet_length,
-                        unsigned char acceptance,
-                        unsigned int completion,
-                        unsigned char service_type,
-                        unsigned char service_subtype,
-                        unsigned char sourceID*/
-                count = nbBYTES_application_data+12; // +12 => packet header 6 bytes + data field header 4 bytes + packet error control 2 bytes
-                tab = (char*) malloc(count);
-                tab[0] = ccsds_command->ccsds_header->packetId1;
-                tab[1] = ccsds_command->ccsds_header->packetId0;
-                tab[2] = ccsds_command->ccsds_header->packetSequenceControl1;
-                tab[3] = ccsds_command->ccsds_header->packetSequenceControl0;
-                tab[4] = ccsds_command->ccsds_header->packetLength1;
-                tab[5] = ccsds_command->ccsds_header->packetLength0;
-                tab[6] = ccsds_command->ccsds_header->dataFieldHeader3;
-                tab[7] = ccsds_command->ccsds_header->dataFieldHeader2;
-                tab[8] = ccsds_command->ccsds_header->dataFieldHeader1;
-                tab[9] = ccsds_command->ccsds_header->dataFieldHeader0;
-                tab[10] = (unsigned char) (time_COARSE>>24);
-                tab[11] = (unsigned char) (time_COARSE>>18);
-                tab[12] = (unsigned char) (time_COARSE>>8);
-                tab[13] = (unsigned char) (time_COARSE);
-                tab[14] = (unsigned char) (time_FINE>>8);
-                tab[15] = (unsigned char) (time_FINE);
-                tab[nbBYTES_application_data+10] = packetErrorControl1;
-                tab[nbBYTES_application_data+11] = packetErrorControl0;
-                WriteSPW(tab, count, UI->CCSDSTargetLogicalAddressSpinBox->value(), 0x00);
-                time_COARSE = time_COARSE+1;
-                free(tab);
-            void rmapplugin::reset_TC_LFR_UPDATE_TIME()
-                time_COARSE = 0;
-                time_FINE = 0;
             void rmapplugin::RMAP_write_reply_setText(QString text)
             {
                 this->UI->RMAP_write_reply->setText(text);
             }
             void rmapplugin::appendToLog(QString text)
             {
                 APPENDTOLOG(text);
             }
             void rmapplugin::setValueTargetAddress(unsigned char newAddress)
             {
                 this->UI->rmapTargetLogicalAddressSpinBox->setValue(newAddress);
             }
             void rmapplugin::setValueSourceAddress(unsigned char newAddress)
             {
                 this->UI->rmapSourceLogicalAddressSpinBox->setValue(newAddress);
             }
             void rmapplugin::receivePacketFromBridge(TMPacketToRead *packet)
             {
                 preProcessPacket(packet);
                 this->generalCCSDSPacketStore.append(packet);
-                this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(generalCCSDSPacketStore.count()));
+                this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(generalCCSDSPacketStore.size()));
                 processPacketStore();
             }
             void rmapplugin::preProcessPacket(TMPacketToRead *packet)
             {
+                unsigned char pid = 0;
+                unsigned char cat = 0;
                 unsigned char typ = 0;
                 unsigned char sub = 0;
-                unsigned char sid = 0;
+                unsigned int sid = 0;
-                unsigned char pkt_nr = 0;
+                unsigned int length = 0;
-                unsigned int blk_nr = 0;
+                unsigned int coarse_t = 0;
-                unsigned int i = 0;
+                unsigned int fine_t = 0;
-                unsigned int j = 0;
-                unsigned char *data;
-                typ = packet->Value[11];   // TYPE
+                //*********************************
-                sub = packet->Value[12];   // SUBTYPE
+                // get the parameters of the packet
+                pid = ((packet->Value[4] & 0x07) << 4) + ((packet->Value[5] & 0xf0) >> 4);
+                cat = packet->Value[5] & 0x0f;
+                typ = packet->Value[11];    // TYPE
+                sub = packet->Value[12];    // SUBTYPE
+                sid = 0;
+                length = packet->Value[8] * 256 + packet->Value[9];
+                coarse_t = packet->Value[14] * pow(2, 24) + packet->Value[15] * pow(2, 16)
+                        + packet->Value[16] * pow(2, 8) + packet->Value[17];
+                fine_t = packet->Value[18] * pow(2, 8) + packet->Value[19];
+                if ((pid == 76) & (cat == 1) & (typ == 1) & (sub == 8))
+                        sid = packet->Value[20] * 256 + packet->Value[21];
+                else if ((pid == 76) & (cat == 12) & (typ == 21) & (sub == 3))
+                        sid = packet->Value[20];
+                else if ((pid == 76) & (cat == 4) & (typ == 3) & (sub == 25))
+                        sid = 1;
+                emit updateStatistics(pid, cat, typ, sub, sid, length, coarse_t, fine_t);
+                //****************************************
+                // if the packet is a waveform, display it
                 if ( (typ == 21) & (sub == 3) )
                 {
                     sid = packet->Value[20];    // SID
-                    pkt_nr = packet->Value[23]; // PKT_NR
-                    blk_nr = packet->Value[24] * 256 + packet->Value[25];
                     switch (sid){
                         case SID_NORMAL_SWF_F0:
-                            emit displayOnConsole("wf packet received, sid: " + QString::number(sid)
+                            buildWFAndDisplay(packet, &wfPacketNormal[0], 0);
-                                                  + ", pkt_nr: " + QString::number(pkt_nr)
-                                              + ", blk_nr: " + QString::number(blk_nr)
-                                                  );
-                            data = &packet->Value[26]; // start of the first data block;
-                            j = (pkt_nr-1) * 340;
-                            for ( i=0; i<blk_nr; i++ ){
-                                normal_swf_f0_v[j + i]  = (short) ( (data[i * BLK_SIZE     ] << 8) + (data[i*BLK_SIZE + 1]) );
-                                normal_swf_f0_e1[j + i] = (short) ( (data[i * BLK_SIZE  + 2] << 8) + (data[i*BLK_SIZE + 3]) );
-                                normal_swf_f0_e2[j + i] = (short) ( (data[i * BLK_SIZE  + 4] << 8) + (data[i*BLK_SIZE + 5]) );
-                                normal_swf_f0_b1[j + i] = (short) ( (data[i * BLK_SIZE  + 6] << 8) + (data[i*BLK_SIZE + 7]) );
-                                normal_swf_f0_b2[j + i] = (short) ( (data[i * BLK_SIZE  + 8] << 8) + (data[i*BLK_SIZE + 9]) );
-                                normal_swf_f0_b3[j + i] = (short) ( (data[i * BLK_SIZE + 10] << 8) + (data[i*BLK_SIZE + 11]) );
-                            if (pkt_nr == 7)
-                                emit displayOnConsole("all packets received, display waveform");
-                                this->UI->wfDisplay->displayOnPlot(normal_swf_f0_v, 0);
-                                this->UI->wfDisplay->displayOnPlot(normal_swf_f0_e1, 1);
-                                this->UI->wfDisplay->displayOnPlot(normal_swf_f0_e2, 2);
-                                this->UI->wfDisplay->displayOnPlot(normal_swf_f0_b1, 3);
                             break;
                         case SID_NORMAL_SWF_F1:
+                            buildWFAndDisplay(packet, &wfPacketNormal[1], 1);
                             break;
                         case SID_NORMAL_SWF_F2:
+                            buildWFAndDisplay(packet, &wfPacketNormal[2], 2);
                             break;
                         case SID_NORMAL_CWF_F3:
+                            buildWFAndDisplay(packet, &wfPacketNormal[3], 3);
                             break;
                     }
                 }
             }
+            void rmapplugin::nbPacketHasChanged(int nb)
+            {
+                this->UI->nbPacketInStore->setText("nb packets in store: " + QString::number(nb));
+            }
+            void rmapplugin::buildWFAndDisplay(TMPacketToRead *packet, WFPacket *wfPacket, unsigned char num_page)
+            {
+                unsigned int i = 0;
+                unsigned int j = 0;
+                unsigned char *data;
+                unsigned char pkt_nr = 0;
+                unsigned int blk_nr = 0;
+                pkt_nr = packet->Value[23]; // PKT_NR
+                blk_nr = packet->Value[24] * 256 + packet->Value[25];
+                data = &packet->Value[26]; // start of the first data block;
+                j = (pkt_nr-1) * 340;
+                for ( i=0; i<blk_nr; i++ ){
+                    wfPacket->wf_v[j + i] = (short) ( (data[i * BLK_SIZE     ] << 8) + (data[i*BLK_SIZE + 1]) );
+                    wfPacket->wf_e1[j + i] = (short) ( (data[i * BLK_SIZE  + 2] << 8) + (data[i*BLK_SIZE + 3]) );
+                    wfPacket->wf_e2[j + i] = (short) ( (data[i * BLK_SIZE  + 4] << 8) + (data[i*BLK_SIZE + 5]) );
+                    wfPacket->wf_b1[j + i] = (short) ( (data[i * BLK_SIZE  + 6] << 8) + (data[i*BLK_SIZE + 7]) );
+                    wfPacket->wf_b2[j + i] = (short) ( (data[i * BLK_SIZE  + 8] << 8) + (data[i*BLK_SIZE + 9]) );
+                    wfPacket->wf_b3[j + i] = (short) ( (data[i * BLK_SIZE + 10] << 8) + (data[i*BLK_SIZE + 11]) );
+                }
+                if (pkt_nr == 7)
+                {
+                    emit displayOnConsole("all packets received, display waveform f" + QString::number(num_page));
+                    this->UI->wfDisplay->displayOnPlot(wfPacket->wf_v, num_page, 0);
+                    this->UI->wfDisplay->displayOnPlot(wfPacket->wf_e1, num_page, 1);
+                    this->UI->wfDisplay->displayOnPlot(wfPacket->wf_e2, num_page, 2);
+                    this->UI->wfDisplay->displayOnPlot(wfPacket->wf_b1, num_page, 3);
+                    this->UI->wfDisplay->displayOnPlot(wfPacket->wf_b2, num_page, 4);
+                    this->UI->wfDisplay->displayOnPlot(wfPacket->wf_b3, num_page, 5);
+                }
+            }
             /////////////////////
             // INTERNAL FUNCTIONS
             void rmapplugin::processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size) // SLOT
             {
                 QString message;
                 unsigned int fine_time_value = 0;
                 fine_time_value = ((unsigned int) ccsdsPacket[7]<<24)
                         + ((unsigned int) ccsdsPacket[6]<<16)
                         + ((unsigned int) ccsdsPacket[5]<<8)
                         + ((unsigned int) ccsdsPacket[4]);
                 message.append(QTime::currentTime().toString() +":" + QString::number(QTime::currentTime().msec()) + ": ");
                 message.append("size "
                                + QString::number(size)
                                +" *** header "
                                + QString::number(ccsdsPacket[0], 16)
                                + " "
                                + QString::number(ccsdsPacket[1], 16)
                                + " "
                                + QString::number(ccsdsPacket[2], 16)
                                + " "
                                + QString::number(ccsdsPacket[3], 16)
                                + " *** coarse time "
                                + QString::number(fine_time_value));
                                //+ QString::number(ccsdsPacket[4], 16)
                                //+" "
                                //+ QString::number(ccsdsPacket[5], 16)
                                //+" "
                                //+ QString::number(ccsdsPacket[6], 16)
                                //+" "
                                //+ QString::number(ccsdsPacket[7], 16));
                 displayOnConsole(message);
                 //((rmappluginPythonWrapper*)this->pyObject)->storeCCSDSPacket(ccsdsPacket, size);
                 emit ccsdsPacketIsProcessed();
             }
             void rmapplugin::processPacketStore()
             {
                 ((rmappluginPythonWrapper*)this->pyObject)->processPacketStore();
             }
             int rmapplugin::fetchPacket()
             {
                 int ret = 0;
                 switch(currentBridge)
                 {
                 case selectedBridgeIsGRESB :
                     break;
                 case selectedBridgeIsStarDundee :
                     ret = this->UI->starDundee->receiveSPWPacketLoop();
                     break;
                 default:
                     break;
                 }
                 return ret;
             }

rmapplugin/rmapplugin.h +8 -9

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef DRIVER1_H
             #define DRIVER1_H
             #include <rmappluginui.h>
             #include <rmapoperations.h>
             #include <QMenuBar>
             #include <QMenu>
             #include <QAction>
             #include <QMainWindow>
             #include <QTcpSocket>
             #include <QTime>
             #include <ccsds.h>
             #include <QSemaphore>
+            #include <wfpacket.h>
             #include <lppmonplugin.h>
             #include "tmpackettoread.h"
             #define APPENDTOLOG(message) this->UI->appendToLogFile(QTime::currentTime().toString() +":" + QString::number(QTime::currentTime().msec()) + ": " + message)
             #define READ_WRITE_MAX_COUNTS 4096                      // in words
             #define RMAP_MAX_DATA_LENGTH 4*READ_WRITE_MAX_COUNTS    // in bytes, shall be lower than the limit size of SPW packet of the GRESB bridge
             #define RMAP_READ_REPLY_HEADER_LENGTH 12                // in bytes => ECSS
             #define RMAP_READ_COMMAND_HEADER_LENGTH 16              // in bytes => ECSS
             #define RMAP_DATA_CRC_LENGTH 1                          // in bytes => ECSS
             #define CCSDS_MAX_PACKET_LENGTH 4412                    // in bytes, specified in the LFR Software Requirements Specification
             class rmapplugin : public lppmonplugin
             {
                 Q_OBJECT
             public:
                 explicit rmapplugin(QWidget *parent = 0);
                 ~rmapplugin();
                 QList<TMPacketToRead*> generalCCSDSPacketStore;
                 void preProcessPacket(TMPacketToRead *packet);
-                short normal_swf_f0_v[2048];
+                WFPacket wfPacketNormal[4];
-                short normal_swf_f0_e1[2048];
+                void buildWFAndDisplay(TMPacketToRead *packet, WFPacket *wfPacket, unsigned char num_page);
-                short normal_swf_f0_e2[2048];
-                short normal_swf_f0_b1[2048];
-                short normal_swf_f0_b2[2048];
-                short normal_swf_f0_b3[2048];
             public slots:
                 unsigned int Write(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int Read(unsigned int *Value,unsigned int count,unsigned int address=0);
                 unsigned int WriteSPW(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
                 void setValueTargetAddress(unsigned char newAddress);
                 void setValueSourceAddress(unsigned char newAddress);
                 void openBridge();
                 void closeBridge();
                 void processCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
                 void processPacketStore();
                 void updatePacketStore(selectedBridge bridge);
+                void nbPacketHasChanged(int nb);
                 int fetchPacket();
                 void receivePacketFromBridge(TMPacketToRead* packet);
                 //
-                void sendCCSDS();
-                void send_TC_LFR_UPDATE_TIME();
-                void reset_TC_LFR_UPDATE_TIME();
                 void displayOnConsole(QString message) {this->UI->console->append(message);}
                 //
                 void RMAP_write_reply_setText(QString text);
                 void appendToLog(QString text);
                 //
                 void activatePlugin(bool flag) {emit activateSig(flag);}
                 void bridgeHasChanged(selectedBridge bridge) {currentBridge = bridge;}
             signals:
                 void ccsdsPacketIsProcessed();
+                void updateStatistics(unsigned char pid, unsigned char cat,
+                                      unsigned char typ, unsigned char sub,
+                                      unsigned int sid, unsigned int length,
+                                      unsigned int coarse_t, unsigned int fine_t);
             private:
                 selectedBridge currentBridge;
                 rmapPluginUI* UI;
                 QTcpSocket* GRESBStatusQuery_SOCKET;
                 QTcpSocket* RMAPSend_SOCKET;
                 QTcpSocket* RMAPReceive_SOCKET;
                 ccsds* ccsds_command;
                 unsigned int rmapPacketSize;
                 unsigned int time_COARSE;
                 unsigned int time_FINE;
                 char timeCode;
             };
             #endif // DRIVER1_H

rmapplugin/rmapplugin.pro +11 -4

             #
             # Project created by QtCreator 2011-09-20T08:15:30
             #
             #-------------------------------------------------
             #include(/etc/lppmon/lppmonplugin.prf)
             CONFIG += lppmonplugin
             TARGET = rmapplugin
             DEFINES += PLUGIN=rmapplugin
             DEFINES += PLUGINHEADER="\"\\\"rmapplugin.h"\\\"\"
             DEFINES += driver_Name="\"\\\"RMAPPlugin"\\\"\"
             DEFINES += driver_Author="\"\\\"Paul Leroy paul.leroy@lpp.polytechnique.fr"\\\"\"
             DEFINES += driver_Version="\"\\\"1.1.2"\\\"\"
             DEFINES += driver_Description="\"\\\"AHB bus controler, works with Gaisler's AHB plugn' play bus."\\\"\"
             DEFINES += driver_can_be_root=1
             DEFINES += driver_can_be_child=0
             DEFINES += driver_VID=0
             DEFINES += driver_PID=0
             QT += network
             LIBS += ../spw_usb_driver_v2.63/lib/x86_64/libSpaceWireUSBAPI.so \
                 ../spw_usb_driver_v2.63/lib/x86_64/libConfigLibraryUSB.so
             INCLUDEPATH += \
                     $${PWD} \
                     ../common_PLE \
                     ../spw_usb_driver_v2.63/inc
             HEADERS += \
                 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
+                wfdisplay.h \
+                tmstatistics.h \
+                wfplot.h \
+                wfpage.h \
+                wfpacket.h \
+                params.h
             SOURCES += \
                 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
+                wfdisplay.cpp \
+                tmstatistics.cpp \
+                wfplot.cpp \
+                wfpage.cpp \
+                wfpacket.cpp

rmapplugin/rmappluginpythonwrapper.cpp +1 -1

             #include "rmappluginpythonwrapper.h"
             #include <math.h>
             #include <QApplication>
             rmappluginPythonWrapper::rmappluginPythonWrapper(QObject *parent) :
                 genericPySysdriver(parent)
             {
                 timer = new QTimer;
                 timer->setSingleShot(true);
                 connect(timer, SIGNAL(timeout()), this, SLOT(sendTC()));
                 connect(this, SIGNAL(activateTCLoopSig()), this, SLOT(sendTCLoop()));
             }
             QList<QVariant> rmappluginPythonWrapper::ReadSPW(unsigned int size) // size is not used
             {
                 QList<QVariant> result;
                 TMPacketToRead *ccsdsPacket;
                 if (!ccsdsPacketStore->isEmpty())
                 {
                     ccsdsPacket = ccsdsPacketStore->takeFirst();
                     for(unsigned int i = 0;i<ccsdsPacket->size;i++)
                     {
                         result.append((QVariant)ccsdsPacket->Value[i]);
                     }
                     delete(ccsdsPacket);
                 }
+                emit nbPacketHasChanged(ccsdsPacketStore->size());
                 return result;
             }
             void rmappluginPythonWrapper::WriteSPW(QList<int> dataList)
             {
                 char targetLogicalAddress;
                 char userApplication;
                 unsigned int count;
                 char *Value;
                 unsigned char data[dataList.count()];
                 for(int i = 0; i<dataList.count(); i++) // get the data as unsigned char
                 {
                     data[i] = (unsigned char)dataList.at(i);
                 }
                 // read the first bytes of the data to get the targetLogicalAddress and the userApplication parameters
                 targetLogicalAddress = data[0];
                 userApplication = data[3];
                 count = dataList.count() - 4; // the CCSDS header (4 bytes) is added by LPPMON
                 Value = (char*) &data[4];
                 emit WriteSPWSig(Value, count, targetLogicalAddress, userApplication);
             }
             void rmappluginPythonWrapper::WriteSPWDelay(QList<int> dataList, unsigned int delay)
             {
                 char targetLogicalAddress;
                 char userApplication;
                 unsigned int count;
                 char *Value;
                 TCPacketToSend *packet;
                 unsigned char data[dataList.count()];
                 for(int i = 0; i<dataList.count(); i++) // get the data as unsigned char
                 {
                     data[i] = (unsigned char)dataList.at(i);
                 }
                 // read the first bytes of the data to get the targetLogicalAddress and the userApplication parameters
                 targetLogicalAddress = data[0];
                 userApplication = data[3];
                 count = dataList.count() - 4; // the CCSDS header (4 bytes) is added by LPPMON
                 Value = (char*) &data[4];
                 packet = new TCPacketToSend(Value, count, targetLogicalAddress, userApplication, delay);
                 TCPacketStore.append(packet);
                 emit(activateTCLoopSig());
             }
             void rmappluginPythonWrapper::processPacketStoreLater(unsigned int delay)
             {
                 emit sendMessage(
                             "*** process packet store in " + QString::number(delay) + " ms"
                             );
                 QTimer::singleShot(delay, this, SLOT(sendProcessPacketStoreNowSig()));
             }
             void rmappluginPythonWrapper::sendTCLoop()
             {
                 unsigned int delay;
                 if (!timer->isActive())
                 {
                     if (!TCPacketStore.isEmpty())
                     {
                         delay = TCPacketStore.at(0)->delay;
                         timer->setInterval(delay);
                         timer->start();
                     }
                 }
             }
             void rmappluginPythonWrapper::sendTC()
             {
                 TCPacketToSend *packet;
                 unsigned int delay;
                 packet = TCPacketStore.takeFirst();
                 // the signal is connected with the option Qt::DirectConnection, thus it is processed immediately
                 emit(WriteSPWSig(packet->Value, packet->count,packet->targetLogicalAddress, packet->userApplication));
                 delete(packet);
                 if (!TCPacketStore.isEmpty())
                 {
                     delay = TCPacketStore.at(0)->delay;
                     timer->setInterval(delay);
                     timer->start();
                 }
             }
             void rmappluginPythonWrapper::processPacketStore()
             {
                 emit ccsdsPacketIsAvailable(ccsdsPacketStore->at(0)->size);
             }
             void rmappluginPythonWrapper::setTargetAddressValue(unsigned int address)
             {
                 unsigned char newAddress;
                 newAddress = (unsigned char) address;
                 emit updateTargetAddress(newAddress);
             }
             void rmappluginPythonWrapper::setSourceAddressValue(unsigned int address)
             {
                 unsigned char newAddress;
                 newAddress = (unsigned char) address;
                 emit updateSourceAddress(newAddress);
             }
             void rmappluginPythonWrapper::ProcessPendingEvents()
             {
                 QCoreApplication::processEvents();
             }

rmapplugin/rmappluginpythonwrapper.h +1 0

             #ifndef RMAPPLUGINPYTHONWRAPPER_H
             #define RMAPPLUGINPYTHONWRAPPER_H
             #include <QObject>
             #include <genericPySysdriver.h>
             #include <QList>
             #include <QVariant>
             #include "rmapoperations.h"
             #include "ccsds.h"
             #include <tcpackettosend.h>
             #include <tmpackettoread.h>
             #include <QTimer>
             class rmappluginPythonWrapper : public genericPySysdriver
             {
                 Q_OBJECT
             public:
                 explicit rmappluginPythonWrapper(QObject *parent = 0);
                 QList<TMPacketToRead*> *ccsdsPacketStore;
                 void processPacketStore();
                 unsigned int storeCCSDSPacket(unsigned char *ccsdsPacket, unsigned int size);
                 QList<TCPacketToSend*> TCPacketStore;
                 QTimer *timer;
             signals:
                 void ccsdsPacketIsAvailable(unsigned int size);
                 void wakeUpCallingThread();
                 unsigned int WriteSPWSig(char *Value, unsigned int count, char targetLogicalAddress, char userApplication);
                 void updateTargetAddress(unsigned char newAddress);
                 void updateSourceAddress(unsigned char newAddress);
                 void activateTCLoopSig();
                 void processPacketStoreNowSig();
                 void sendMessage(QString message);
                 int fetchPacketSig();
+                void nbPacketHasChanged(int nb);
             public slots:
                 QList<QVariant> ReadSPW(unsigned int size=0);
                 int fetchPacket() {return emit fetchPacketSig();}
                 void WriteSPW(QList<int> dataList);
                 void WriteSPWDelay(QList<int> dataList, unsigned int delay=0);
                 void processPacketStoreLater(unsigned int delay);
                 void sendProcessPacketStoreNowSig(){emit processPacketStoreNowSig();}
                 void sendTCLoop();
                 void sendTC();
                 void reEmitWriteSPWSig(char *Value, unsigned int count, char targetLogicalAddress, char userApplication)
                     {emit WriteSPWSig(Value, count, targetLogicalAddress, userApplication);}
                 void setTargetAddressValue(unsigned int address);
                 void setSourceAddressValue(unsigned int address);
                 void ProcessPendingEvents();
                 void BlockAllSignals();
             };
             #endif // RMAPPLUGINPYTHONWRAPPER_H

rmapplugin/rmappluginui.cpp +7 -26

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "rmapplugin.h"
             rmapPluginUI::rmapPluginUI(QWidget *parent) :
                 QWidget(parent)
             {
-                spectralMatricesDMASimulator = new SpectralMatricesDMASimulator;
                 spwTabWidget = new QTabWidget;
+                //
                 QWidget* spwTabWidgetPage0 = new QWidget;
-                QWidget* spwTabWidgetPage1 = new QWidget;
                 QWidget* spwTabWidgetPage2 = new QWidget;
                 QWidget* spwTabWidgetPage3 = new QWidget;
                 QWidget* spwTabWidgetPage4 = new QWidget;
                 QWidget* spwTabWidgetPage5 = new QWidget;
+                //
                 bridgeWidget = new QWidget;
                 mainLayout = new QVBoxLayout;
                 ccsdsLayout = new QVBoxLayout;
                 consoleLayout = new QVBoxLayout;
                 selectionLayout = new QVBoxLayout;
                 connectionLayout = new QGridLayout;
                 bridgeSelection_LAYOUT = new QGridLayout;
                 generalParameters_LAYOUT = new QGridLayout;
                 gresb_GROUPBOX = new QGroupBox(tr("GRESB bridge parameters"));
                 stardundee_GROUPBOX = new QGroupBox(tr("Star Dundee brick parameters"));
                 selection_GROUPBOX = new QGroupBox(tr("Bridge selection"));
                 generalParameters_GROUPBOX = new QGroupBox(tr("General parameters"));
                 //*** QLABEL ***//
                 gresbBridgeIPLabel = new QLabel(tr("Bridge IP: "));
                 gresbVirtualLinkLabel = new QLabel(tr("Virtual Link: "));
                 spwLinkLabel = new QLabel(tr("SPW Link: "));
                 rmapSourceLogicalAddressLabel = new QLabel(tr("RMAP Source Logical Address: "));
                 rmapTargetLogicalAddressLabel = new QLabel(tr("RMAP Target Logical Address: "));
                 logFileName = new QLabel;
                 gresbStatusQueryLabel = new QLabel(tr("Status query socket (port 3010): waiting for connection"));
                 gresbStatusQueryDialogLabel = new QLabel(tr("sockets opened but SpaceWire link not running"));
-                sendCCSDSCommandLabel = new QLabel(tr("Address of the target"));
                 nbPacketInStore = new QLabel(tr("nb packets in store: -"));
                 //*** QPUSHBUTTON ***//
                 rmapOpenCommunicationButton = new QPushButton(tr("Open selected bridge"));
                 rmapCloseCommunicationButton = new QPushButton(tr("Close selected bridge"));
                 rmapOpenCommunicationButton->setEnabled(false);
                 rmapCloseCommunicationButton->setEnabled(false);
                 logFileChooseButton = new QPushButton(tr("Choose file"));
                 gresbStatusQueryRetryButton = new QPushButton(tr("Retry"));
                 gresbStatusQueryAbortButton = new QPushButton(tr("Abort"));
-                sendCCSDSCommandButton = new QPushButton(tr("Send CCSDS Command"));
-                send_TC_LFR_UPDATE_TIME_Button = new QPushButton(tr("Send TC_LFR_UPDATE_TIME Packet"));
-                reset_TC_LFR_UPDATE_TIME_Button = new QPushButton(tr("reset the TC_LFR_UPDATE_TIME Packet coarse and fine times"));
                 clearConsoleButton = new QPushButton(tr("Clear"));
                 selectGRESB_BUTTON = new QRadioButton(tr("GRESB"));
                 selectStarDundee_BUTTON = new QRadioButton(tr("Star Dundee"));
                 //*** SPINBOX ***//
                 gresbVirtualLinkSpinBox = new QSpinBox;
                 rmapSourceLogicalAddressSpinBox = new QSpinBox;
                 rmapTargetLogicalAddressSpinBox = new QSpinBox;
                 spwLinkSpinBox = new QSpinBox;;
                 CCSDSTargetLogicalAddressSpinBox = new QSpinBox;
                 gresbVirtualLinkSpinBox->setRange(0, 4);
                 gresbVirtualLinkSpinBox->setValue(1);
                 rmapSourceLogicalAddressSpinBox->setRange(0, 255);
-                rmapSourceLogicalAddressSpinBox->setValue(0);
+                rmapSourceLogicalAddressSpinBox->setValue(RMAP_DEFAULT_SOURCE_ADDRESS);
                 rmapTargetLogicalAddressSpinBox->setRange(0, 255);
                 spwLinkSpinBox->setRange(0, 2);
                 spwLinkSpinBox->setValue(0);
-                CCSDSTargetLogicalAddressSpinBox->setRange(0,255);
-                CCSDSTargetLogicalAddressSpinBox->setValue(0);
                 //*** MISC **//
                 starDundee = new StarDundee;
                 gresbBridge = new gresb;
                 console = new QTextEdit;
-                //gresbBridgeIPDialogBox = new QIPDialogBox;
                 gresbStatusQueryDialog = new QDialog;
                 logEnableCheckBox = new QCheckBox(tr("Enable Logs"));
                 RMAP_write_verify = new QCheckBox(tr("data checked before write\nlimited to 4 bytes\nNOT IMPLEMENTED"));
                 RMAP_write_reply = new QCheckBox(tr("reply to the write command required\nlast reply status: unavailable"));
-                spwLinkStatusEnquiry = new gresbStatusEnquiry;
                 logFile = new QFile();
                 wfDisplay = new WFDisplay();
+                tmStatistics = new TMStatistics();
                 logFileEn = false;
                 connectionLayout->setRowStretch(7, 1);
                 connectionLayout->setColumnStretch(2, 1);
                 bridgeSelection_LAYOUT->addWidget(selectGRESB_BUTTON, 0, 0, 1, 1);
                 bridgeSelection_LAYOUT->addWidget(selectStarDundee_BUTTON, 0, 1, 1, 1);
-                bridgeSelection_LAYOUT->setRowStretch(1, 1);
-                bridgeSelection_LAYOUT->setColumnStretch(2, 1);
                 generalParameters_LAYOUT->addWidget(logEnableCheckBox, 0, 0, 1, 1);
                 generalParameters_LAYOUT->addWidget(logFileChooseButton, 0, 1, 1, 1);
                 generalParameters_LAYOUT->addWidget(rmapSourceLogicalAddressLabel, 1, 0, 0);
                 generalParameters_LAYOUT->addWidget(rmapSourceLogicalAddressSpinBox, 1, 1, 0);
                 generalParameters_LAYOUT->addWidget(rmapTargetLogicalAddressLabel, 2, 0, 0);
                 generalParameters_LAYOUT->addWidget(rmapTargetLogicalAddressSpinBox, 2, 1, 0);
                 generalParameters_LAYOUT->addWidget(rmapOpenCommunicationButton, 3, 0, 1, 1);
                 generalParameters_LAYOUT->addWidget(rmapCloseCommunicationButton, 3, 1, 1, 1);
                 generalParameters_LAYOUT->addWidget(RMAP_write_verify, 4, 0, 1, 2);
                 generalParameters_LAYOUT->addWidget(RMAP_write_reply, 5, 0, 1, 2);
                 generalParameters_LAYOUT->setRowStretch(6, 1);
                 generalParameters_LAYOUT->setColumnStretch(2, 1);
                 gresb_GROUPBOX->setLayout(gresbBridge->layout());
                 gresb_GROUPBOX->setVisible(false);
                 stardundee_GROUPBOX->setLayout(starDundee->layout());
                 stardundee_GROUPBOX->setVisible(false);
                 selection_GROUPBOX->setLayout(bridgeSelection_LAYOUT);
                 generalParameters_GROUPBOX->setLayout(generalParameters_LAYOUT);
                 selectionLayout->addWidget(selection_GROUPBOX);
                 selectionLayout->addWidget(generalParameters_GROUPBOX);
                 selectionLayout->addWidget(gresb_GROUPBOX);
                 selectionLayout->addWidget(stardundee_GROUPBOX);
-                //******
-                // CCSDS
-                ccsdsLayout->addWidget(sendCCSDSCommandButton);
-                ccsdsLayout->addWidget(send_TC_LFR_UPDATE_TIME_Button);
-                ccsdsLayout->addWidget(reset_TC_LFR_UPDATE_TIME_Button);
-                ccsdsLayout->addWidget(sendCCSDSCommandLabel);
-                ccsdsLayout->addWidget(CCSDSTargetLogicalAddressSpinBox);
                 //********
                 // CONSOLE
                 consoleLayout->addWidget(console);
                 consoleLayout->addWidget(clearConsoleButton);
                 consoleLayout->addWidget(nbPacketInStore);
                 connect(this->logFileChooseButton, SIGNAL(clicked()), this, SLOT(chooseLogFile()));
                 connect(this, SIGNAL(setLogFileName(QString)), this->logFileName, SLOT(setText(QString)));
                 connect(this->logEnableCheckBox, SIGNAL(stateChanged(int)), this, SLOT(logFileEnDisable(int)));
                 spwTabWidget->addTab(spwTabWidgetPage0, tr("connection"));
-                spwTabWidget->addTab(spwTabWidgetPage1, tr("ccsds"));
                 spwTabWidget->addTab(spwTabWidgetPage2, tr("status"));
                 spwTabWidget->addTab(spwTabWidgetPage3, tr("console"));
-                spwTabWidget->addTab(spwTabWidgetPage4, tr("DMA"));
+                spwTabWidget->addTab(spwTabWidgetPage4, tr("TM statistics"));
                 spwTabWidget->addTab(spwTabWidgetPage5, tr("waveforms"));
                 spwTabWidgetPage0->setLayout(selectionLayout);
-                spwTabWidgetPage1->setLayout(ccsdsLayout);
+                spwTabWidgetPage2->setLayout(this->gresbBridge->spwLinkStatusEnquiry->mainLayout);
-                spwTabWidgetPage2->setLayout(this->spwLinkStatusEnquiry->mainLayout);
                 spwTabWidgetPage3->setLayout(consoleLayout);
-                spwTabWidgetPage4->setLayout(spectralMatricesDMASimulator->mainLayout);
+                spwTabWidgetPage4->setLayout(tmStatistics->layout());
                 spwTabWidgetPage5->setLayout(wfDisplay->layout());
                 mainLayout->addWidget(spwTabWidget);
                 setLayout(mainLayout);
                 connect(this->clearConsoleButton, SIGNAL(clicked()), this->console, SLOT(clear()));
                 // briges
                 connect(this->selectGRESB_BUTTON, SIGNAL(clicked()), this, SLOT(selectionBetweenGresbAndStarDundee()));
                 connect(this->selectStarDundee_BUTTON, SIGNAL(clicked()), this, SLOT(selectionBetweenGresbAndStarDundee()));
                 connect(this->starDundee, SIGNAL(isOpen(bool)), this, SLOT(isOpen(bool)));
                 connect(this->gresbBridge, SIGNAL(isOpen(bool)), this, SLOT(isOpen(bool)));
                 connect(this->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->gresbBridge, SLOT(sourceHasChanged(int)));
                 connect(this->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->gresbBridge, SLOT(targetHasChanged(int)));
                 connect(this->rmapSourceLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->starDundee, SLOT(sourceHasChanged(int)));
                 connect(this->rmapTargetLogicalAddressSpinBox, SIGNAL(valueChanged(int)), this->starDundee, SLOT(targetHasChanged(int)));
                 // command code
                 connect(this->RMAP_write_reply, SIGNAL(clicked()), this, SLOT(getCommandCode()));
                 connect(this->RMAP_write_verify, SIGNAL(clicked()), this, SLOT(getCommandCode()));
                 connect(this, SIGNAL(commandCodeHasChanged(RMAP_command_codes)),
                         this->starDundee, SLOT(commandCodeHasChanged(RMAP_command_codes)));
                 connect(this, SIGNAL(commandCodeHasChanged(RMAP_command_codes)),
                         this->gresbBridge, SLOT(commandCodeHasChanged(RMAP_command_codes)));
                 getCommandCode(); // init the command code value
                 rmapSourceLogicalAddressSpinBox->setValue(DEFAULT_SOURCE);
                 rmapTargetLogicalAddressSpinBox->setValue(DEFAULT_TARGET);
             }
             rmapPluginUI::~rmapPluginUI()
             {
                 //delete ui;
             }
             void rmapPluginUI::chooseLogFile()
             {
                 if(this->logFile->isOpen())
                     this->logFile->close();
                 this->logFile->setFileName(QFileDialog::getSaveFileName(this,tr("Open Log file"),
                                                                         QDir::homePath()
                                                                         + "/"
                                                                         + QDate::currentDate().toString()
                                                                         + "_"
                                                                         + QTime::currentTime().toString()
                                                                         + "_rmapPluginUI.log",
                                                                         tr("Log Files (*.txt *.log)")));
                 if(this->logFile->open(QIODevice::WriteOnly))
                 {
                     this->logFileStrm = new QTextStream(this->logFile);
                     emit this->setLogFileName(this->logFile->fileName());
                 }
             }
             void rmapPluginUI::logFileEnDisable(int state)
             {
                 if(state==Qt::Checked)
                 {
                     this->logFileEn = true;
                 }
                 else if(state==Qt::Unchecked)
                 {
                     this->logFileEn = false;
                 }
             }
             bool rmapPluginUI::islogfileenable()
             {
                 return this->logFileEn;
             }
             void rmapPluginUI::appendToLogFile(const QString & text)
             {
                 if(this->logFileEn && this->logFile->isOpen())
                 {
                     *(this->logFileStrm) << text << endl;
                 }
             }
             void rmapPluginUI::closeEvent(QCloseEvent *event)
             {
                 if(this->logFile->isOpen())
                 {
                     this->logFileStrm->flush();
                     this->logFile->waitForBytesWritten(3000);
                     this->logFile->close();
                 }
                 event->accept();
             }
             RMAP_command_codes rmapPluginUI::getCommandCode()
             {
                 RMAP_command_codes commandCode = invalid0;
                 if (RMAP_write_verify->isChecked() and RMAP_write_reply->isChecked()) commandCode = writeSingle_ver_rep;
                 if (RMAP_write_verify->isChecked() and !RMAP_write_reply->isChecked()) commandCode = writeSingle_ver_noRep;
                 if (!RMAP_write_verify->isChecked() and RMAP_write_reply->isChecked()) commandCode = writeSingle_noVer_Rep;
                 if (!RMAP_write_verify->isChecked() and !RMAP_write_reply->isChecked()) commandCode = writeSingle_noVer_noRep;
                 emit commandCodeHasChanged(commandCode);
                 return commandCode;
             }
             // SLOT
             void rmapPluginUI::selectionBetweenGresbAndStarDundee() //SLOT
             {
                 if (selectGRESB_BUTTON->isChecked())
                 {
                     gresb_GROUPBOX->setVisible(true);
                     stardundee_GROUPBOX->setVisible(false);
                     rmapOpenCommunicationButton->setEnabled(true);
                     emit bridgeHasChanged(selectedBridgeIsGRESB);
                 }
                 if (selectStarDundee_BUTTON->isChecked())
                 {
                     stardundee_GROUPBOX->setVisible(true);
                     gresb_GROUPBOX->setVisible(false);
                     rmapOpenCommunicationButton->setEnabled(true);
                     emit bridgeHasChanged(selectedBridgeIsStarDundee);
                 }
             }
             void rmapPluginUI::isOpen(bool flag)
             {
                 if (flag == true)
                 {
                     selection_GROUPBOX->setEnabled(false);
                     this->rmapOpenCommunicationButton->setEnabled(false);
                     this->rmapCloseCommunicationButton->setEnabled(true);
                 }
                 if (flag == false)
                 {
                     selection_GROUPBOX->setEnabled(true);
                     this->rmapOpenCommunicationButton->setEnabled(true);
                     this->rmapCloseCommunicationButton->setEnabled(false);
                 }
             }

rmapplugin/rmappluginui.h +3 -7

             /*------------------------------------------------------------------------------
             --  This file is a part of the LPPMON Software
             --  Copyright (C) 20011, Laboratory of Plasma Physics - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 3 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Paul Leroy
             --                     Mail : paul.leroy@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef RMAPPLUGINUI_H
             #define RMAPPLUGINUI_H
             #include <QWidget>
             #include <QPushButton>
             #include <QLabel>
             #include <QSlider>
             #include <QSpinBox>
             #include <QGridLayout>
             #include <QCheckBox>
             #include <QFile>
             #include <QTextStream>
             #include <QFileDialog>
             #include <QDir>
             #include <QDialog>
             #include <QCloseEvent>
             #include <QTabWidget>
             #include "qipdialogbox.h"
             #include <rmapoperations.h>
             #include <gresbstatusenquiry.h>
             #include <QTextEdit>
-            #include "spectralmatricesdmasimulator.h"
             #include <stardundee.h>
             #include <gresb.h>
             #include <QRadioButton>
             #include <QGroupBox>
             #include "wfdisplay.h"
+            #include "tmstatistics.h"
             enum selectedBridge{
                 selectedBridgeIsUnknown,
                 selectedBridgeIsGRESB,
                 selectedBridgeIsStarDundee
             };
             class rmapPluginUI : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit rmapPluginUI(QWidget *parent = 0);
                 ~rmapPluginUI();
                 QPushButton* rmapOpenCommunicationButton;
                 QPushButton* rmapCloseCommunicationButton;
                 QPushButton* logFileChooseButton;
                 QPushButton* gresbStatusQueryRetryButton;
                 QPushButton* gresbStatusQueryAbortButton;
                 QPushButton* sendCCSDSCommandButton;
                 QPushButton* send_TC_LFR_UPDATE_TIME_Button;
                 QPushButton* reset_TC_LFR_UPDATE_TIME_Button;
                 QPushButton* clearConsoleButton;
                 QRadioButton* selectGRESB_BUTTON;
                 QRadioButton* selectStarDundee_BUTTON;
                 QGroupBox *selection_GROUPBOX;
                 QSpinBox* gresbVirtualLinkSpinBox;
                 QSpinBox* spwLinkSpinBox;
                 QSpinBox* rmapSourceLogicalAddressSpinBox;
                 QSpinBox* rmapTargetLogicalAddressSpinBox;
                 QSpinBox* CCSDSTargetLogicalAddressSpinBox;
-                //QIPDialogBox* gresbBridgeIPDialogBox;
                 QCheckBox *logEnableCheckBox;
                 QCheckBox *RMAP_write_verify;
                 QCheckBox *RMAP_write_reply;
                 QLabel* rmapSendStateLabel;
                 QLabel* rmapReceiveStateLabel;
                 QLabel* gresbStatusQueryLabel;
                 QLabel* gresbStatusQueryDialogLabel;
                 QLabel* sendCCSDSCommandLabel;
                 QLabel* nbPacketInStore;
                 QDialog* gresbStatusQueryDialog;
-                gresbStatusEnquiry* spwLinkStatusEnquiry;
-                SpectralMatricesDMASimulator *spectralMatricesDMASimulator;
                 QTextEdit* console;
                 WFDisplay* wfDisplay;
+                TMStatistics* tmStatistics;
                 // SPACEWIRE BRIDGES
                 StarDundee *starDundee;
                 gresb *gresbBridge;
                 bool islogfileenable();
                 void appendToLogFile(const QString & text);
                 void closeEvent(QCloseEvent *event);
             public slots:
                 void chooseLogFile();
                 void logFileEnDisable(int state);
                 RMAP_command_codes getCommandCode();
             private slots:
                 void selectionBetweenGresbAndStarDundee();
                 void isOpen(bool flag);
             signals:
                 void connectPortsig(QString PortName,int baudrate);
                 void setLogFileName(QString FileName);
                 void commandCodeHasChanged(RMAP_command_codes commandCode);
                 void bridgeHasChanged(selectedBridge bridge);
                 void targetHasChanged(unsigned char target);
                 void sourceHasChanged(unsigned char source);
             private:
                 QLabel *gresbBridgeIPLabel;
                 QLabel *gresbVirtualLinkLabel;
                 QLabel *spwLinkLabel;
                 QLabel *rmapSourceLogicalAddressLabel;
                 QLabel *rmapTargetLogicalAddressLabel;
                 QLabel *logFileName;
                 QGridLayout *bridgeSelection_LAYOUT;
                 QGridLayout *connectionLayout;
                 QGridLayout *gresbStatusQueryDialogLayout;
                 QGridLayout *generalParameters_LAYOUT;
                 QVBoxLayout *selectionLayout;
                 QVBoxLayout *mainLayout;
                 QVBoxLayout *ccsdsLayout;
                 QVBoxLayout *consoleLayout;
                 QTabWidget *spwTabWidget;
                 QWidget* bridgeWidget;
                 QGroupBox *gresb_GROUPBOX;
                 QGroupBox *stardundee_GROUPBOX;
                 QGroupBox *generalParameters_GROUPBOX;
                 QFile *logFile;
                 QTextStream *logFileStrm;
                 bool logFileEn;
             };
             #endif // RMAPPLUGINUI_H

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