SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

fix: math trace got a factor value is 0

Browse Source
This commit is contained in:
dreamsourcelabTAI
2024-04-27 20:29:03 +08:00
parent c063974900
commit 972a0afaec
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
DSView/pv/data/mathstack.cpp
View File

@@ -203,28 +203,34 @@ uint64_t MathStack::default_vDialValue()
uint64_t MathStack::default_factor()
{
uint64_t value = 0;
const uint64_t factor1 = _dsoSig1->get_vDial()->get_factor();
const uint64_t factor1 = _dsoSig1->get_vDial()->get_factor();
const uint64_t factor2 = _dsoSig2->get_vDial()->get_factor();
assert(factor1 > 0);
assert(factor2 > 0);
const uint64_t v1 = _dsoSig1->get_vDial()->get_value() * factor1;
const uint64_t v2 = _dsoSig2->get_vDial()->get_value() * factor2;
switch(_type) {
case MATH_ADD:
case MATH_SUB:
value = v1 > v2 ? factor1 : factor2;
break;
case MATH_MUL:
value = factor1 * factor2;
break;
case MATH_DIV:
value = factor1 / factor2;
break;
case MATH_ADD:
case MATH_SUB:
value = v1 > v2 ? factor1 : factor2;
break;
case MATH_MUL:
value = factor1 * factor2;
break;
case MATH_DIV:
value = factor1 / factor2;
break;
}
if (value == 0){
value = 1;
}
return value;
}
view::dslDial * MathStack::get_vDial()
view::dslDial* MathStack::get_vDial()
{
QVector<uint64_t> vValue;
QVector<QString> vUnit;

4
DSView/pv/view/dsldial.cpp
View File

@@ -187,7 +187,9 @@ void dslDial::set_value(uint64_t value)
}
void dslDial::set_factor(uint64_t factor)
{
{
assert(factor > 0);
if (_factor != factor) {
_factor = factor;
}