UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] additional_outputs: misc. clean-up on unit additional results

Browse Source
This commit is contained in:
Émilie Feral
2020-04-24 17:49:57 +02:00
parent 1a9014645c
commit 785d7a0a62
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/calculation/additional_outputs/unit_list_controller.cpp
View File

@@ -21,6 +21,7 @@ void UnitListController::computeLayoutAtIndex(int index) { //FIXME
// SI units only
Shared::PoincareHelpers::Simplify(&expressionAtIndex, App::app()->localContext(), ExpressionNode::ReductionTarget::User, Poincare::ExpressionNode::SymbolicComputation::ReplaceAllDefinedSymbolsWithDefinition, Poincare::ExpressionNode::UnitConversion::InternationalSystem);
} else if (index == 1) {
// Miscellaneous classic units for some dimensions
ExpressionNode::ReductionContext reductionContext(
App::app()->localContext(),
Preferences::sharedPreferences()->complexFormat(),
@@ -31,9 +32,10 @@ void UnitListController::computeLayoutAtIndex(int index) { //FIXME
// Reduce to be able to recognize units
expressionAtIndex = expressionAtIndex.reduce(reductionContext);
expressionAtIndex = expressionAtIndex.removeUnit(&units);
bool requireSimplification = true;
bool canChangeUnitPrefix = true;
bool requireSimplification = false;
bool canChangeUnitPrefix = false;
if (Unit::IsISSpeed(units)) {
// Turn into km/h
expressionAtIndex = UnitConvert::Builder(
m_expression.clone(),
Multiplication::Builder(
@@ -44,13 +46,17 @@ void UnitListController::computeLayoutAtIndex(int index) { //FIXME
)
)
);
canChangeUnitPrefix = false; // We force km/h
requireSimplification = true; // Reduce the conversion
} else if (Unit::IsISVolume(units)) {
// Turn into L
expressionAtIndex = UnitConvert::Builder(
m_expression.clone(),
Unit::Liter()
);
requireSimplification = true; // reduce the conversion
canChangeUnitPrefix = true; // Pick best prefix (mL)
} else if (Unit::IsISEnergy(units)) {
// Turn into W
expressionAtIndex = UnitConvert::Builder(
m_expression.clone(),
Multiplication::Builder(
@@ -58,16 +64,13 @@ void UnitListController::computeLayoutAtIndex(int index) { //FIXME
Unit::Hour()
)
);
requireSimplification = true; // reduce the conversion
canChangeUnitPrefix = true; // Pick best prefix (kWh)
} else if (Unit::IsISTime(units)) {
// Turn into ? year + ? month + ? day + ? h + ? min + ? s
double value = Shared::PoincareHelpers::ApproximateToScalar<double>(expressionAtIndex, App::app()->localContext());
expressionAtIndex = Unit::BuildTimeSplit(value);
requireSimplification = false;
canChangeUnitPrefix = false;
} else {
requireSimplification = false;
canChangeUnitPrefix = false;
}
if (requireSimplification) {
Shared::PoincareHelpers::Simplify(&expressionAtIndex, App::app()->localContext(), ExpressionNode::ReductionTarget::User);
}

2
apps/calculation/calculation.cpp
View File

@@ -250,7 +250,7 @@ Calculation::AdditionalInformationType Calculation::additionalInformationType(Co
if (input().isDefinedCosineOrSine(context, complexFormat, preferences->angleUnit()) || o.isDefinedCosineOrSine(context, complexFormat, preferences->angleUnit())) {
return AdditionalInformationType::Trigonometry;
}
if (o.hasUnit()) {
if (o.hasUnit()) { // TODO: find a way to check that it'll do have additional results
return AdditionalInformationType::Unit;
}
if (o.isBasedIntegerCappedBy(k_maximalIntegerWithAdditionalInformation)) {