Uniformize power display with rates input text style

Author: adepierre

ficsit-companion/include/node.hpp

@@ -57,8 +57,12 @@ struct CraftNode : public Node
     FractionalNumber current_rate;
     /// @brief Technically it could be just an int, but FractionalNumber already has all string operations
     FractionalNumber num_somersloop;
-    double same_clock_power;
-    double last_underclock_power;
+    /// @brief Power requirement if all machines are at the same clock.
+    /// It could be a double, but FractionalNumber already has all string operations
+    FractionalNumber same_clock_power;
+    /// @brief Power requirements if all machines are at 100% except the last one.
+    /// It could be a double, but FractionalNumber already has all string operations
+    FractionalNumber last_underclock_power;
 };
 
 struct OrganizerNode : public Node

ficsit-companion/src/app.cpp

@@ -1157,8 +1157,8 @@ void App::RenderLeftPanel()
     std::map<const Item*, FractionalNumber, ItemPtrCompare> intermediates;
     std::map<std::string, FractionalNumber> total_machines;
     std::map<std::string, std::map<const Recipe*, FractionalNumber, RecipePtrCompare>> detailed_machines;
-    double total_power = 0.0;
-    std::map<const Recipe*, double> detailed_power;
+    FractionalNumber total_power;
+    std::map<const Recipe*, FractionalNumber> detailed_power;
     bool has_variable_power = false;
 
     // Gather all inputs/outputs/machines
@@ -1203,11 +1203,13 @@ void App::RenderLeftPanel()
         }
     }
 
+    const float power_width = ImGui::CalcTextSize("000000.00").x + ImGui::GetStyle().FramePadding.x * 2.0f;
     ImGui::SeparatorText(has_variable_power ? "Average Power" : "Power");
+    if (total_power.GetNumerator() > 0)
     {
-        std::vector<std::pair<const Recipe*, double>> sorted_detailed_power(detailed_power.begin(), detailed_power.end());
+        std::vector<std::pair<const Recipe*, FractionalNumber>> sorted_detailed_power(detailed_power.begin(), detailed_power.end());
         std::stable_sort(sorted_detailed_power.begin(), sorted_detailed_power.end(), [](const auto& a, const auto& b) {
-            return a.second > b.second;
+            return a.second.GetValue() > b.second.GetValue();
         });
 
         // No visible color change when hovered/click
@@ -1219,14 +1221,18 @@ void App::RenderLeftPanel()
 
         // Displayed over the TreeNodeEx element (same line)
         ImGui::SameLine();
-        ImGui::Text("%s%.8g MW", has_variable_power ? "~" : "", total_power);
+        total_power.RenderInputText("##power", true, false, power_width);
+        ImGui::SameLine();
+        ImGui::Text("%sMW", has_variable_power ? "~" : "");
         // Detailed list of recipes if the tree node is open
         if (display_power_details)
         {
             ImGui::Indent();
             for (auto& [recipe, p] : sorted_detailed_power)
             {
-                ImGui::Text("%s%.6g MW", recipe->building->variable_power ? "~" : "", p);
+                p.RenderInputText("##power", true, false, power_width);
+                ImGui::SameLine();
+                ImGui::Text("%sMW", recipe->building->variable_power ? "~" : "");
                 ImGui::SameLine();
                 recipe->Render();
             }
@@ -1598,7 +1604,9 @@ void App::RenderNodes()
                 {
                     ImGui::Spring(0.0f);
                     CraftNode* craft_node = static_cast<CraftNode*>(node.get());
-                    ImGui::Text("%s%.6g MW", craft_node->recipe->building->variable_power ? "~" : "", settings.power_equal_clocks ? craft_node->same_clock_power : craft_node->last_underclock_power);
+                    (settings.power_equal_clocks ? craft_node->same_clock_power : craft_node->last_underclock_power).RenderInputText("##power", true, false);
+                    ImGui::Spring(0.0f);
+                    ImGui::Text("%sMW", craft_node->recipe->building->variable_power ? "~" : "");
                     if (craft_node->recipe->building->variable_power && ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled))
                     {
                         frame_tooltips.push_back("Average power");

ficsit-companion/src/node.cpp

@@ -121,31 +121,28 @@ bool CraftNode::Deserialize(const Json::Value& v)
 
 void CraftNode::ComputePowerUsage()
 {
-    same_clock_power = 0.0;
-    last_underclock_power = 0.0;
-
     const Building* building = recipe->building;
     // All machines are underclocked at current_rate/num_machines
     const int num_machines = static_cast<int>(std::ceil(current_rate.GetValue()));
     const double power = recipe->power;
-    same_clock_power =
+    double same_clock_power_double =
         num_machines *
         power *
         std::pow(1.0 + num_somersloop.GetValue() * building->somersloop_mult.GetValue(), building->somersloop_power_exponent) *
-        std::pow(current_rate.GetValue() / static_cast<double>(num_machines), building->power_exponent);
-    // num_full_machines have 100% rate + extra underclocked machine
+        std::pow(current_rate.GetValue() / static_cast<double>(std::max(1, num_machines)), building->power_exponent);
+    // num_full_machines at 100% rate + one extra underclocked machine
     const int num_full_machines = static_cast<int>(std::floor(current_rate.GetValue()));
-    last_underclock_power =
+    double last_underclock_power_double =
         num_full_machines *
         power *
         std::pow(1.0 + num_somersloop.GetValue() * building->somersloop_mult.GetValue(), building->somersloop_power_exponent);
-    last_underclock_power +=
+    last_underclock_power_double +=
         power *
         std::pow(1.0 + num_somersloop.GetValue() * building->somersloop_mult.GetValue(), building->somersloop_power_exponent) *
         std::pow(current_rate.GetValue() - num_full_machines, building->power_exponent);
-    // Truncate power to max 2 figures after the decimal point
-    same_clock_power = std::floor(same_clock_power * 100.0) / 100.0;
-    last_underclock_power = std::floor(last_underclock_power * 100.0) / 100.0;
+    // Round values at 0.001 precision for the power, as we don't have exact fractional values with the exponents anyway
+    same_clock_power = FractionalNumber(static_cast<long long int>(std::round(same_clock_power_double * 1000.0)), 1000);
+    last_underclock_power = FractionalNumber(static_cast<long long int>(std::round(last_underclock_power_double * 1000.0)), 1000);
 
 }