Merged muonspin/musrfit into master
This commit is contained in:
commit
af7ab0d6b1
@ -711,39 +711,52 @@ void PMusrCanvas::UpdateDataTheoryPad()
|
|||||||
PlotData();
|
PlotData();
|
||||||
} else { // show Fourier straight ahead.
|
} else { // show Fourier straight ahead.
|
||||||
// set the menu properly
|
// set the menu properly
|
||||||
|
if (!fBatchMode)
|
||||||
fPopupMain->UnCheckEntry(P_MENU_ID_DATA+P_MENU_PLOT_OFFSET*fPlotNumber);
|
fPopupMain->UnCheckEntry(P_MENU_ID_DATA+P_MENU_PLOT_OFFSET*fPlotNumber);
|
||||||
|
|
||||||
// filter proper Fourier plot tag, and set the menu tags properly
|
// filter proper Fourier plot tag, and set the menu tags properly
|
||||||
switch (fFourier.fPlotTag) {
|
switch (fFourier.fPlotTag) {
|
||||||
case FOURIER_PLOT_REAL:
|
case FOURIER_PLOT_REAL:
|
||||||
fCurrentPlotView = PV_FOURIER_REAL;
|
fCurrentPlotView = PV_FOURIER_REAL;
|
||||||
|
if (!fBatchMode) {
|
||||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL);
|
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL);
|
||||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
||||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case FOURIER_PLOT_IMAG:
|
case FOURIER_PLOT_IMAG:
|
||||||
fCurrentPlotView = PV_FOURIER_IMAG;
|
fCurrentPlotView = PV_FOURIER_IMAG;
|
||||||
|
if (!fBatchMode) {
|
||||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_IMAG);
|
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_IMAG);
|
||||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
||||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case FOURIER_PLOT_REAL_AND_IMAG:
|
case FOURIER_PLOT_REAL_AND_IMAG:
|
||||||
fCurrentPlotView = PV_FOURIER_REAL_AND_IMAG;
|
fCurrentPlotView = PV_FOURIER_REAL_AND_IMAG;
|
||||||
|
if (!fBatchMode) {
|
||||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL_AND_IMAG);
|
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL_AND_IMAG);
|
||||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
||||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case FOURIER_PLOT_POWER:
|
case FOURIER_PLOT_POWER:
|
||||||
fCurrentPlotView = PV_FOURIER_PWR;
|
fCurrentPlotView = PV_FOURIER_PWR;
|
||||||
|
if (!fBatchMode) {
|
||||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR);
|
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case FOURIER_PLOT_PHASE:
|
case FOURIER_PLOT_PHASE:
|
||||||
fCurrentPlotView = PV_FOURIER_PHASE;
|
fCurrentPlotView = PV_FOURIER_PHASE;
|
||||||
|
if (!fBatchMode) {
|
||||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE);
|
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
fCurrentPlotView = PV_FOURIER_PWR;
|
fCurrentPlotView = PV_FOURIER_PWR;
|
||||||
|
if (!fBatchMode) {
|
||||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR);
|
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user