This commit is contained in:
2019-10-29 11:05:20 +01:00
parent 1084e5361b
commit badff47663
6 changed files with 103 additions and 130 deletions

View File

@ -560,104 +560,6 @@ format
ANALOG /** < analog */
};
#ifdef __cplusplus
/** returns string from enabled/disabled
\param b true or false
\returns string enabled, disabled
*/
static std::string stringEnable(bool b) {
if (b)
return std::string("enabled");
else
return std::string("disabled");
};
/** returns std::string from timer index
\param s can be FRAME_NUMBER,ACQUISITION_TIME,FRAME_PERIOD,
DELAY_AFTER_TRIGGER, TRIGGER_NUMBER,
ACTUAL_TIME,MEASUREMENT_TIME,
PROGRESS,FRAMES_FROM_START,FRAMES_FROM_START_PG,ANALOG_SAMPLES,DIGITAL_SAMPLES,SUBFRAME_ACQUISITION_TIME,STORAGE_CELL_NUMBER,
SUBFRAME_DEADTIME \returns std::string
frame_number,acquisition_time,frame_period,
delay_after_trigger, triggers_number,
actual_time,measurement_time,
progress,frames_from_start,frames_from_start_pg,analog_samples, digital_samples,subframe_acquisition_time,storage_cell_number,
SUBFRAME_DEADTIME
*/
static std::string getTimerType(timerIndex t) {
switch (t) {
case FRAME_NUMBER:
return std::string("frame_number");
case ACQUISITION_TIME:
return std::string("acquisition_time");
case FRAME_PERIOD:
return std::string("frame_period");
case DELAY_AFTER_TRIGGER:
return std::string("delay_after_trigger");
case TRIGGER_NUMBER:
return std::string("triggers_number");
case ACTUAL_TIME:
return std::string("actual_time");
case MEASUREMENT_TIME:
return std::string("measurement_time");
case PROGRESS:
return std::string("progress");
case FRAMES_FROM_START:
return std::string("frames_from_start");
case FRAMES_FROM_START_PG:
return std::string("frames_from_start_pg");
case ANALOG_SAMPLES:
return std::string("analog_samples");
case DIGITAL_SAMPLES:
return std::string("digital_samples");
case SUBFRAME_ACQUISITION_TIME:
return std::string("subframe_acquisition_time");
case SUBFRAME_DEADTIME:
return std::string("subframe_deadtime");
case STORAGE_CELL_NUMBER:
return std::string("storage_cell_number");
default:
return std::string("unknown");
}
};
/**
@short returns dac index from std::string
\param s can be vcmp_ll, vcmp_lr, vcmp_rl, vcmp_rr, vthreshold, vrf, vrs,
vtr, vcall, vcp \returns E_Vcmp_ll, E_Vcmp_lr, E_Vcmp_rl, E_Vcmp_rr,
THRESHOLD, E_Vrf, E_Vrs, E_Vtr, E_cal, E_Vcp , -1 when unknown mode
*/
static int getDACIndex(std::string s) {
if (s == "vcmp_ll")
return E_Vcmp_ll;
if (s == "vcmp_lr")
return E_Vcmp_lr;
if (s == "vcmp_rl")
return E_Vcmp_rl;
if (s == "vcmp_rr")
return E_Vcmp_rr;
if (s == "vthreshold")
return THRESHOLD;
if (s == "vrf")
return E_Vrf;
if (s == "vrs")
return E_Vrs;
if (s == "vtr")
return E_Vtr;
if (s == "vcall")
return E_cal;
if (s == "vcp")
return E_Vcp;
return -1;
};
#endif
#ifdef __cplusplus
protected: