Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revamp Time Cost Feature #4840

Closed
wants to merge 54 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
c3800bf
Add electric_consumption & electric_cost
cochcoder Mar 8, 2024
6c28d4f
Change time_cost to electric_consumption & add electric_cost
cochcoder Mar 8, 2024
894913f
Add electric_consumption & electric_cost
cochcoder Mar 8, 2024
2e5242c
Add electric_consumption & electric_cost
cochcoder Mar 8, 2024
6d7cc68
Update total cost caculator
cochcoder Mar 8, 2024
887819b
Fix total_cost caculator
cochcoder Mar 8, 2024
52478fe
Attempt at fixing incorrect cost calculation
cochcoder Mar 9, 2024
720b9a0
Slight tidying up
cochcoder Mar 9, 2024
e227687
Merge branch 'SoftFever:main' into main
cochcoder Mar 9, 2024
bb83dec
Add electric cost section to legend
cochcoder Mar 10, 2024
c25372f
Misc.
cochcoder Mar 10, 2024
6665bd8
Hopefully this fixes failed builds
cochcoder Mar 10, 2024
39953b0
Merge branch 'main' into main
SoftFever Mar 10, 2024
d5be7a7
Fix failed builds attempt 2
cochcoder Mar 10, 2024
cc3a1a2
Merge branch 'SoftFever:main' into main
cochcoder Mar 10, 2024
69308cc
Replace total_cost with total_filament_cost
cochcoder Mar 10, 2024
626f1e1
Forgot to replace this...
cochcoder Mar 10, 2024
6412a38
Edit legend
cochcoder Mar 10, 2024
a3a83b1
Merge branch 'SoftFever:main' into main
cochcoder Mar 10, 2024
00e6c12
Forgot this one
cochcoder Mar 10, 2024
e4770fe
Add Total Cost to legend
cochcoder Mar 10, 2024
292672d
Add Filament cost & Electric cost to All Plates Stats
cochcoder Mar 10, 2024
80da975
Attempt at fixing failed builds
cochcoder Mar 10, 2024
594508f
Remove redundant declaration of buf
cochcoder Mar 10, 2024
dcc93d3
Add if statment
cochcoder Mar 10, 2024
e5cf92c
Oops
cochcoder Mar 11, 2024
3b02513
Syntax errors
cochcoder Mar 11, 2024
0a7b057
Some fine tuning
cochcoder Mar 11, 2024
ae779f0
Unneeded +
cochcoder Mar 11, 2024
a27527c
Merge branch 'SoftFever:main' into main
cochcoder Mar 11, 2024
24229ac
Add other costs
cochcoder Mar 11, 2024
68217a3
Forgot this
cochcoder Mar 11, 2024
46b2922
Attempt at adding a currency field
cochcoder Mar 12, 2024
3d92a5a
Fix failed builds...again
cochcoder Mar 12, 2024
3142d3a
Hopefully this works...
cochcoder Mar 12, 2024
1dee130
Maybe this?
cochcoder Mar 12, 2024
d0b574a
Merge branch 'SoftFever:main' into main
cochcoder Mar 12, 2024
647e5c2
Trying two changes
cochcoder Mar 12, 2024
915c731
Maybe this?
cochcoder Mar 12, 2024
1f822fa
Revert "Maybe this?"
cochcoder Mar 12, 2024
5299711
Revert "Trying two changes"
cochcoder Mar 12, 2024
5ae545e
Revert "Maybe this?"
cochcoder Mar 12, 2024
cacf895
Revert "Hopefully this works..."
cochcoder Mar 12, 2024
e277486
Revert "Fix failed builds...again"
cochcoder Mar 12, 2024
a17e552
Revert "Attempt at adding a currency field"
cochcoder Mar 12, 2024
dcb5637
Fix bug
cochcoder Mar 12, 2024
cff1069
Merge branch 'SoftFever:main' into main
cochcoder Mar 13, 2024
e069108
Merge branch 'SoftFever:main' into main
cochcoder Mar 14, 2024
4970a7a
Merge branch 'main' into main
cochcoder Mar 19, 2024
5b60516
Merge branch 'SoftFever:main' into main
cochcoder Mar 23, 2024
b93adf7
Merge branch 'main' into main
cochcoder Mar 26, 2024
e49085d
Merge branch 'SoftFever:main' into main
cochcoder Mar 28, 2024
8f60ed9
Merge branch 'SoftFever:main' into time-cost
cochcoder Apr 1, 2024
87ad7b4
Merge branch 'main' into time-cost
cochcoder Apr 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove redundant declaration of buf
  • Loading branch information
cochcoder committed Mar 10, 2024
commit 594508f9ed9d94f7d6fb2c01a29838870322c607
2 changes: 0 additions & 2 deletions src/slic3r/GUI/GCodeViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4326,15 +4326,13 @@ void GCodeViewer::render_all_plates_stats(const std::vector<const GCodeProcessor
ImGui::SameLine();
imgui.text(_u8L("Electric cost") + ":");
ImGui::SameLine();
char buf[64];
::sprintf(buf, "%.2f", electric_cost_all_plates);
imgui.text(buf);

ImGui::Dummy({ window_padding, window_padding });
ImGui::SameLine();
imgui.text(_u8L("Total cost") + ":");
ImGui::SameLine();
char buf[64];
::sprintf(buf, "%.2f", total_cost_all_plates);
imgui.text(buf);
}
Expand Down