Fixed: names of curves in intensity plot

Author: spectralcode

src/fdml_commands.xml

@@ -46,14 +46,12 @@
 		<IntValueElement command="flt.wfm.amp" minValue="0" maxValue="20000000" defaultValue="100" stepSize="10" expertMode="1" infoText="..."/>
 		<IntValueElement command="flt.hvoff" minValue="0" maxValue="20000000" defaultValue="100" stepSize="10" expertMode="1" infoText="..."/>
 	</IntValueElements>
-	
 	<Buttons>
 		<Button name="Laser Enable" command="sys.button.push" expertMode="0" infoText="Equivalent of pushing the Laser Enable button on the front panel (turns booster SOA on/off when laser is running and autostart has been performed)."/>
 		<Button name="Reboot" command="sys.restart.reboot" expertMode="1" infoText="Perform restart procedure."/>/>
 		<Button name="Do Autostart" command="reg.autostart" expertMode="1" infoText="Perform autostart procedure."/>
 		<Button name="Do Freq Scan" command="reg.flt.freq.do_scan" expertMode="1" infoText="Activates a frequency optimization scan. Can lead to better laser performance if current frequency is sub-optimum."/>
 	</Buttons>
-	
 	<ComboBoxes>
 		<ComboBox name="acq.start" expertMode="0" options="EXT,OFF,FORCE" infoText="Gates the user_wfm_adc_trig_out_X/Y waveforms according to the mode: 0 waveform active only when the input selected by acq.start_src is HIGH (TTL), 1 Always OFF, 2 Always ON."/>
 		<ComboBox name="acq.trig_src" expertMode="0" options="Sync Out 0,Sync Out 1,FDML,Rg odd,RG even,RG both,Always" infoText="Currently not used."/>
@@ -81,24 +79,5 @@
 		<ComboBox name="io.bnc.inv 3" expertMode="0" options="Normal,Inverted" infoText="BNC D"/>
 		<ComboBox name="io.bnc.mux 0" expertMode="0" options="low,FDML_start_tick_0,user_wfm_adc_trig_out_X,user_wfm_adc_trig_out_Y,user_wfm_sync_out_X,user_wfm_sync_out_Y,sync_wfm_0_[0]/blip_0,sync_wfm_0_[1]/blip_1,sync_wfm_0_[2]/blip_2,sync_wfm_0_[3]/blip_3,sync_wfm_0_[4]/spike_0,sync_wfm_0_[5]/spike_1,sync_wfm_0_[6]/fadc_sw_0,sync_wfm_0_[7]/fadc_sw_1,sync_wfm_1_[0],sync_wfm_1_[1],sync_wfm_1_[2],sync_wfm_1_[3],sync_wfm_1_[4]/user_0,sync_wfm_1_[5]/user_1,sync_wfm_1_[6],sync_wfm_1_[7],BNC_in_A,BNC_in_B,BNC_in_C,BNC_in_D,LVDS_in,ext_acq_start_in,RG_adc_trig_out,RG_sync_out,RG_acq_active,blip_det_in_0,blip_det_in_1,blip_det_in_2,blip_det_in_3,blip_det_in_all,lip_det_all,blip_tcp_pulse_0,blip_tcp_pulse_1,blip_tcp_pulse_2,blip_tcp_pulse_3,spike_det_in,spike_gated_0,spike_gated_1,spike_gated_tgl_0,spike_gated_tgl_1,SPI_SS_0,SPI_SS_1,SPI_SS_2,SPI_SS_3,SPI_SS4_0,SCPLL_LD,SCPLL_MUXOUT" infoText="BNC A"/>
 		<ComboBox name="io.bnc.inv 0" expertMode="0" options="Normal,Inverted" infoText="BNC A"/>
-	</ComboBoxes>
-	
-	
+	</ComboBoxes>	
 </Elements>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

src/plotwidget.cpp

@@ -34,9 +34,6 @@ PlotWidget::PlotWidget(QWidget *parent)
 	: QueryWidget(parent)
 {
 	this->plot = new QCustomPlot(this);
-
-
-
     this->plot->setBackground( QColor(50, 50, 50));
     this->plot->axisRect()->setBackground(QColor(55, 55, 55));
     this->plot->xAxis->setBasePen(QPen(Qt::white, 1));
@@ -76,7 +73,6 @@ PlotWidget::PlotWidget(QWidget *parent)
 	this->layout = new QVBoxLayout(this);
 	this->layout->addWidget(this->plot);
 
-
 	this->timer = new QTimer(this);
 	this->autoUpdate = false;
 
@@ -98,7 +94,6 @@ PlotWidget::PlotWidget(QWidget *parent)
 
 	connect(this->checkBox, &QCheckBox::stateChanged, this, &PlotWidget::setAutoUpdate);
 	connect(this->plot, &QCustomPlot::mouseDoubleClick, this, &PlotWidget::rescalePlot);
-
 }
 
 PlotWidget::~PlotWidget()
@@ -134,7 +129,6 @@ void PlotWidget::rescalePlot(){
 	this->plot->replot();
 }
 
-
 void PlotWidget::handleResponse(QString initialQuery, QString response) {
 	//check if response is not empty
 	if (!(response.size() > 2)) {

src/plotwidget.h

@@ -30,8 +30,8 @@
 
 #pragma once
 
-#define INTENSITY_QUERY_MAIN "fadc.dump? 0 256"
-#define INTENSITY_QUERY_CAVITY "fadc.dump? 1 256"
+#define INTENSITY_QUERY_MAIN "fadc.dump? 1 256"
+#define INTENSITY_QUERY_CAVITY "fadc.dump? 0 256"
 #define SOA_CURRENT "reg.sadc.dump.ch? 16"
 #define BOA_CURRENT "reg.sadc.dump.ch? 17"
 #define AUTO_UPDATE_TIME_MS 3000