Skip to content

GitLab

Commit 5691b829 authored by Georg Auzinger's avatar Georg Auzinger
Browse files

Merge branch 'Dev' for release version v1-31

parents ead990fb 9b616b42
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 5691b829
......@@ -2,14 +2,15 @@
._*
*~
Data/*
latex/*
html/*
html/
latex/
*.bin
*.raw
Results/*
settings/connections_slc6.xml
latex/*
html/*
html/
latex/
*.bin
*.raw
Results/*
settings/connections_slc6.xml
# just for G. Auzingers sanity
CalibrationResults
Calibrations
.run_number.txt
settings/connections_186.xml
GUI/.gitignore deleted 100644 → 0
View file @ ead990fb
moc_*
ui_*
Ph2_ACF
Macros/TBrowser
*.o
\ No newline at end of file
GUI/GUI.pro deleted 100644 → 0
View file @ ead990fb
#-------------------------------------------------
#
# Project created by QtCreator 2014-09-10T13:51:18
#
#-------------------------------------------------
QT += core gui
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = Ph2_ACF
TEMPLATE = app
CONFIG += c++11
QMAKE_CXXFLAGS += -g -O1 -w -Wall -pedantic -fPIC -std=c++11 -lrt `root-config --cflags --evelibs` -Wcpp -pthread
LIBS += -L../lib -lPh2_Interface -lPh2_Description -lPh2_System -lPh2_Tools -lPh2_Utils
LIBS += -L/opt/cactus/lib -lcactus_extern_pugixml -lcactus_uhal_log -lcactus_uhal_grammars -lcactus_uhal_uhal -lboost_system
#LibraryDirs = /opt/cactus/lib
#LibraryDirs = /opt/xdaq/lib ../
LibraryPaths = $(LibraryDirs:%=-L%)
LIBS += $(LibraryPaths:%=-L%) -uhal `root-config --glibs`
INCLUDEPATH += $(ROOTSYS)/include
INCLUDEPATH += /opt/cactus/include /../../Ph2_ACF/
SOURCES += main.cpp\
View/mainview.cpp \
startup.cpp \
View/setuptab.cpp \
ViewMgr/setuptabviewmanager.cpp \
Model/settings.cpp \
Model/systemcontroller.cpp \
View/cbcregisterstab.cpp \
ViewMgr/cbcregviewmanager.cpp \
provider.cpp \
View/aboutbox.cpp \
Model/systemcontrollerworker.cpp \
Model/cbcregisters.cpp \
ViewMgr/mainviewmanager.cpp \
Model/cbcregisterworker.cpp \
Model/hybridtest.cpp \
Model/hybridtestworker.cpp \
ViewMgr/hybridtestviewmanager.cpp \
View/hybridtesttab.cpp \
View/calibratetab.cpp \
ViewMgr/calibrateviewmanager.cpp \
Model/calibrate.cpp \
Model/calibrateworker.cpp \
View/cmtesttab.cpp \
ViewMgr/cmtestviewmanager.cpp \
Model/cmtest.cpp \
Model/cmtestworker.cpp \
Model/beboardregisters.cpp \
Model/beboardregistersworker.cpp \
ViewMgr/beboardregistersviewmanager.cpp \
View/beboardregisterstab.cpp
HEADERS += View/mainview.h \
startup.h \
View/setuptab.h \
ViewMgr/setuptabviewmanager.h \
Model/settings.h \
utils.h \
Model/systemcontroller.h \
View/cbcregisterstab.h \
ViewMgr/cbcregviewmanager.h \
provider.h \
View/aboutbox.h \
Model/systemcontrollerworker.h \
Model/cbcregisters.h \
ViewMgr/mainviewmanager.h \
Model/cbcregisterworker.h \
Model/hybridtest.h \
Model/hybridtestworker.h \
ViewMgr/hybridtestviewmanager.h \
View/hybridtesttab.h \
View/calibratetab.h \
ViewMgr/calibrateviewmanager.h \
Model/calibrate.h \
Model/calibrateworker.h \
View/cmtesttab.h \
ViewMgr/cmtestviewmanager.h \
Model/cmtest.h \
Model/cmtestworker.h \
Model/beboardregisters.h \
Model/beboardregistersworker.h \
ViewMgr/beboardregistersviewmanager.h \
View/beboardregisterstab.h
FORMS += View/mainview.ui \
View/setuptab.ui \
View/cbcregisterstab.ui \
View/aboutbox.ui \
View/hybridtesttab.ui \
View/calibratetab.ui \
View/cmtesttab.ui \
View/beboardregisterstab.ui
OTHER_FILES +=
RESOURCES +=
GUI/GUI.pro.user deleted 100644 → 0
View file @ ead990fb
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.3.0, 2015-04-03T13:58:52. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
<value type="QByteArray">{28f5a739-3a1d-4dee-a269-4f68d33c86cc}</value>
</data>
<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>
<value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
<valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
<value type="QString" key="language">Cpp</value>
<valuemap type="QVariantMap" key="value">
<value type="QByteArray" 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="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
</valuemap>
</valuemap>
<value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
<value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
<value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
<value type="int" key="EditorConfiguration.MarginColumn">80</value>
<value type="bool" key="EditorConfiguration.MouseHiding">true</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="bool" key="EditorConfiguration.ShowMargin">false</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 Qt 5.4.0 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.4.0 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.54.clang_64_kit</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.BuildDirectory">/Users/fb13590/Bristol/TEST_Ph2Saq_dev/build-GUI-Desktop_Qt_5_4_0_clang_64bit-Debug</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<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>
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<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>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<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="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<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>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<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">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="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
<value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/Users/fb13590/Bristol/TEST_Ph2Saq_dev/build-GUI-Desktop_Qt_5_4_0_clang_64bit-Release</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<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>
<value type="bool" key="QtProjectManager.QMakeBuildStep.UseQtQuickCompiler">false</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<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>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<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="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<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>
<valuelist type="QVariantList" key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments">
<value type="QString">-w</value>
<value type="QString">-r</value>
</valuelist>
<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">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="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</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">Deploy locally</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.PluginSettings"/>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
<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.EnableBranchSim">false</value>
<value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</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.VisualisationMinimumCostRatio">10</value>
<value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
<value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
<value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
<valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
<value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
<value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
<value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
<value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</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>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GUI</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/Users/fb13590/Bristol/TEST_Ph2Saq_dev/GUI/GUI.pro</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GUI.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseMultiProcess">false</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">1</value>
</valuemap>
</data>
<data>
<variable>ProjectExplorer.Project.TargetCount</variable>
<value type="int">1</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
<value type="int">18</value>
</data>
<data>
<variable>Version</variable>
<value type="int">18</value>
</data>
</qtcreator>
GUI/Macros/Makefile deleted 100644 → 0
View file @ ead990fb
Objs = TBrowser.o
CC = gcc
CXX = g++
CCFlags = -g -O1 -w -Wall -pedantic -fPIC `root-config --cflags --evelibs` -Wcpp
#DevFlags = -D__CBCDAQ_DEV__
DevFlags =
IncludeDirs = /opt/cactus/include ../
IncludePaths = $(IncludeDirs:%=-I%)
%.o: %.cc %.h
$(CXX) -std=c++11 $(DevFlags) $(CCFlags) $(UserCCFlags) $(CCDefines) $(IncludePaths) -c -o $@ $<
TBrowser: TBrowser.cc
$(CXX) -std=c++11 $(CCFlags) -o $@ $< $(IncludePaths) $(ExternalObjects)
cp $@ ../../bin
clean:
rm -f *.o
\ No newline at end of file
GUI/Macros/TBrowser.cc deleted 100644 → 0
View file @ ead990fb
#include <iostream>
#include "TCanvas.h"
#include "TH1F.h"
#include <unistd.h>
#include "TBrowser.h"
#include <TApplication.h>
void OpenTBrowser()
{
TBrowser *tb = new TBrowser();
}
int main(int argc, char **argv)
{
TApplication theApp("App", &argc, argv);
OpenTBrowser();
theApp.Run();
return 0;
}
GUI/Makefile deleted 100644 → 0
View file @ ead990fb
This diff is collapsed.
GUI/Model/beboardregisters.cpp deleted 100644 → 0
View file @ ead990fb
#pragma once
#include "beboardregisters.h"
#include <QDebug>
#include <QThread>
#include "Model/beboardregistersworker.h"
namespace GUI {
BeBoardRegisters::BeBoardRegisters(QObject *parent,
SystemController &sysCtrl) :
QObject(parent),
m_thread(new QThread()),
m_worker(new BeBoardRegistersWorker(nullptr,
sysCtrl))
{
qRegisterMetaType<QMap<QString, int>>("QMap<QString, int>");
qRegisterMetaType<std::map< std::string, uint32_t >>("std::map< std::string, uint32_t >");
m_worker->moveToThread(m_thread);
WireThreadConnections();
Initialise();
}
BeBoardRegisters::~BeBoardRegisters()
{
//m_worker->abort();
m_thread->quit();
m_thread->wait();
delete m_thread;
qDebug() << "Deleting BeBoardRegister worker thread " <<this->QObject::thread()->currentThreadId();
qDebug() << "Destructing " << this;
}
void BeBoardRegisters::Initialise()
{
//m_worker->abort();
m_thread->wait();
m_worker->requestWork();
}
void BeBoardRegisters::WireThreadConnections()
{
connect(m_worker, SIGNAL(workRequested()),
m_thread, SLOT(start()));
connect(m_worker, SIGNAL(finished()),
m_thread, SLOT(quit()), Qt::DirectConnection);
connect(m_worker, SIGNAL(globalEnable(bool)),
this, SIGNAL(globalEnable(bool)));
connect(this, SIGNAL(getInitialBeRegValues()),
m_worker, SLOT(getInitialBeBoardRegMap()));
connect(this, SIGNAL(getBeRegValues()),
m_worker, SLOT(getBeBoardRegMap()));
connect(m_worker, SIGNAL(finishedInitialiseBeBoardRegValues()),
this, SIGNAL(finishedInitialiseBeBoardRegValues()));
connect(m_worker, SIGNAL(sendInitialBeBoardRegValues(int,int,std::map<std::string,uint32_t>)),
this, SIGNAL(sendInitialBeBoardRegValues(int,int,std::map<std::string,uint32_t>)));
connect(m_worker, SIGNAL(sendBeBoardRegValues(int,int,std::map<std::string,uint32_t>)),
this, SIGNAL(sendBeBoardRegValues(int,int,std::map<std::string,uint32_t>)));
connect(this, SIGNAL(writeBeRegisters(int,int,QMap<QString,int>)),
m_worker, SLOT(writeBeRegisters(int,int,QMap<QString,int>)));
}
}
GUI/Model/beboardregisters.h deleted 100644 → 0
View file @ ead990fb
#pragma once
#include <QObject>
#include <map>
#include <QMap>
namespace GUI {
class BeBoardRegistersWorker;
class SystemController;
class BeBoardRegisters : public QObject
{
Q_OBJECT
public:
explicit BeBoardRegisters(QObject *parent,
SystemController &sysCtrl);
~BeBoardRegisters();
signals:
void createInitialBeBoardMap();
void getInitialBeRegValues();
void getBeRegValues();
void sendInitialBeBoardRegValues(const int idSh, const int idBe, const std::map< std::string, uint32_t > cMap);
void sendBeBoardRegValues(const int idSh, const int idBe, const std::map< std::string, uint32_t > cMap);
void finishedInitialiseBeBoardRegValues();
void writeBeRegisters(const int idSh, const int idBe, QMap<QString, int>);
void globalEnable(bool enable);
private :
QThread *m_thread;
BeBoardRegistersWorker *m_worker;
void Initialise();
void WireThreadConnections();
explicit BeBoardRegisters(const BeBoardRegisters& rhs) = delete;
BeBoardRegisters& operator= (const BeBoardRegisters& rhs) = delete;
};
}
GUI/Model/beboardregistersworker.cpp deleted 100644 → 0
View file @ ead990fb
#pragma once
#include "beboardregistersworker.h"
#include <QDebug>
#include <QThread>
namespace GUI{
BeBoardRegistersWorker::BeBoardRegistersWorker(QObject *parent,
SystemController &sysCtrl) :
QObject(parent),
m_systemController(sysCtrl)
{
}
BeBoardRegistersWorker::~BeBoardRegistersWorker()
{
qDebug() << "Destructing BeRegister Worker" << this;
}
void BeBoardRegistersWorker::requestWork()
{
qDebug()<<"Request worker start in Thread "<<thread()->currentThreadId();
emit workRequested();
}
void BeBoardRegistersWorker::getObjects()
{
fBeBoardInterface = m_systemController.getBeBoardInterface();
fCbcInterface = m_systemController.getCbcInterface();
fShelveVector = m_systemController.getfShelveVector();
fBeBoardFWMap = m_systemController.getBeBoardFWMap();
}
void BeBoardRegistersWorker::getInitialBeBoardRegMap()
{