detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-21 17:18:00 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-06-28 18:16:32 +02:00
parent 039a725c5c
commit a373609b08
11 changed files with 544 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorGui/src/qCloneWidget.cpp
View File

@ -124,7 +124,7 @@ void qCloneWidget::SetupWidgetWindow(QString title, QString xTitle, QString yTit
resize(500, 350);
}
void qCloneWidget::SetCloneHists(unsigned int nHists, int histNBins, double *histXAxis, std::vector<double*> histYAxis, std::vector<std::string> histTitle, bool lines, bool markers) {
void qCloneWidget::SetCloneHists(unsigned int nHists, int histNBins, double *histXAxis, std::vector<double*> histYAxis, QString histTitle, bool lines, bool markers) {
//for each plot, create hists
for (unsigned int hist_num = 0; hist_num < nHists; ++hist_num) {
SlsQtH1D *h = new SlsQtH1D("1d plot", histNBins, histXAxis, histYAxis[hist_num]);
@ -138,13 +138,14 @@ void qCloneWidget::SetCloneHists(unsigned int nHists, int histNBins, double *his
cloneplot1D_hists.append(h);
h->Attach(cloneplot1D);
lblHistTitle->setText(QString(histTitle[0].c_str()));
lblHistTitle->setText(histTitle);
}
}
void qCloneWidget::SetCloneHists2D(int nbinsx, double xmin, double xmax, int nbinsy, double ymin, double ymax, double *d) {
void qCloneWidget::SetCloneHists2D(int nbinsx, double xmin, double xmax, int nbinsy, double ymin, double ymax, double *d, QwtText frameIndexTitle) {
cloneplot2D->GetPlot()->SetData(nbinsx, xmin, xmax, nbinsy, ymin, ymax, d);
cloneplot2D->KeepZRangeIfSet();
cloneplot2D->setTitle(frameIndexTitle);
}
void qCloneWidget::SetRange(bool IsXYRange[], double XYRange[]) {

2
slsDetectorGui/src/qDetectorMain.cpp
View File

@ -699,7 +699,7 @@ void qDetectorMain::EnableTabs() {
tabDeveloper->Refresh();
tabPlot->Refresh();
myPlot->StartStopDaqToggle();
myPlot->StartAcquisition();
} else { // to enable scan box
tabPlot->Refresh();
// to start adc timer

967
slsDetectorGui/src/qDrawPlot.cpp
View File

File diff suppressed because it is too large Load Diff

14
slsDetectorGui/src/qTabMeasurement.cpp
View File

@ -523,16 +523,18 @@ void qTabMeasurement::SetRunIndex(int val) {
void qTabMeasurement::ResetProgress() {
FILE_LOG(logDEBUG) << "Resetting progress";
lblCurrentFrame->setText(QString::number(0));
lblCurrentMeasurement->setText(QString::number(0));
lblCurrentFrame->setText("");
lblCurrentMeasurement->setText("");
progressBar->setValue(0);
}
void qTabMeasurement::UpdateProgress() {
FILE_LOG(logDEBUG) << "Updating progress";
progressBar->setValue(myPlot->GetProgress());
lblCurrentFrame->setText(QString::number(myPlot->GetCurrentFrameIndex()));
lblCurrentMeasurement->setText(QString::number(myPlot->GetCurrentMeasurementIndex()));
int64_t temp = myPlot->GetCurrentFrameIndex();
lblCurrentFrame->setText(temp >= 0 ? QString::number(temp) : "");
temp = myPlot->GetCurrentMeasurementIndex();
lblCurrentMeasurement->setText(temp >= 0 ? QString::number(temp) : "");
}
int qTabMeasurement::VerifyOutputDirectoryError() {
@ -574,8 +576,8 @@ void qTabMeasurement::StartAcquisition() {
}
FILE_LOG(logINFOBLUE) << "Starting Acquisition";
lblCurrentFrame->setText(QString::number(0));
lblCurrentMeasurement->setText(QString::number(0));
lblCurrentFrame->setText("");
lblCurrentMeasurement->setText("");
Enable(0);
progressBar->setValue(0);
progressTimer->start(100);