|
|
@ -469,6 +469,19 @@ com_measure_when( |
|
|
else if ((ac_check || sp_check) && (scaleValue < 0)) |
|
|
else if ((ac_check || sp_check) && (scaleValue < 0)) |
|
|
continue; |
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if (dc_check) { |
|
|
|
|
|
/* dc: start from pos or neg scale value */ |
|
|
|
|
|
if ((scaleValue < meas->m_from) || (scaleValue > meas->m_to)) |
|
|
|
|
|
continue; |
|
|
|
|
|
} else { |
|
|
|
|
|
/* all others: start from neg scale value */ |
|
|
|
|
|
if (scaleValue < meas->m_from) |
|
|
|
|
|
continue; |
|
|
|
|
|
|
|
|
|
|
|
if ((meas->m_to != 0.0e0) && (scaleValue > meas->m_to)) |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/* if 'dc': reset first if scale jumps back to origin */ |
|
|
/* if 'dc': reset first if scale jumps back to origin */ |
|
|
if ((first > 1) && (dc_check && (meas->m_td == scaleValue))) |
|
|
if ((first > 1) && (dc_check && (meas->m_td == scaleValue))) |
|
|
first = 1; |
|
|
first = 1; |
|
|
@ -1667,6 +1680,13 @@ get_measure2( |
|
|
goto err_ret1; |
|
|
goto err_ret1; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// If there was a FROM propagate trig<->targ |
|
|
|
|
|
|
|
|
|
|
|
if (measTrig->m_from !=0.0 && measTarg->m_from == 0.0) |
|
|
|
|
|
measTarg->m_from = measTrig->m_from; |
|
|
|
|
|
else if (measTarg->m_from !=0.0 && measTrig->m_from == 0.0) |
|
|
|
|
|
measTrig->m_from = measTarg->m_from; |
|
|
|
|
|
|
|
|
// measure trig |
|
|
// measure trig |
|
|
if (measTrig->m_at == 1e99) |
|
|
if (measTrig->m_at == 1e99) |
|
|
com_measure_when(measTrig); |
|
|
com_measure_when(measTrig); |
|
|
|