Dark98/SliceBeam
1
0
Fork 0
mirror of https://github.com/Dark98/SliceBeam.git synced 2026-07-02 16:49:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Weight/Length filament info in stats

Browse Source
This commit is contained in:
YTKAB0BP
2024-11-18 20:20:39 +03:00
parent 1451fe274c
commit a8c108aa85
6 changed files with 117 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ru/ytkab0bp/slicebeam/components/bed_menu/SliceMenu.java
+36 -10
View File
@@ -2,6 +2,7 @@ package ru.ytkab0bp.slicebeam.components.bed_menu;
import static ru.ytkab0bp.slicebeam.utils.DebugUtils.assertTrue;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
@@ -35,6 +36,7 @@ import org.json.JSONObject;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -53,6 +55,7 @@ import ru.ytkab0bp.slicebeam.config.ConfigObject;
import ru.ytkab0bp.slicebeam.events.NeedSnackbarEvent;
import ru.ytkab0bp.slicebeam.fragment.BedFragment;
import ru.ytkab0bp.slicebeam.recycler.SimpleRecyclerItem;
import ru.ytkab0bp.slicebeam.slic3r.GCodeProcessorResult;
import ru.ytkab0bp.slicebeam.slic3r.GCodeViewer;
import ru.ytkab0bp.slicebeam.slic3r.Slic3rLocalization;
import ru.ytkab0bp.slicebeam.theme.IThemeView;
@@ -187,11 +190,16 @@ public class SliceMenu extends ListBedMenu {
private TextView totalView;
private SegmentsView segmentsView;
private ExtrusionRoleView[] roleViews = new ExtrusionRoleView[GCodeViewer.EXTRUSION_ROLES_COUNT];
private static DecimalFormat format = new DecimalFormat("0.##");
private GCodeViewer getViewer() {
return fragment.getGlView().getRenderer().getViewer();
}
private GCodeProcessorResult getResult() {
return fragment.getGlView().getRenderer().getGcodeResult();
}
@Override
protected View onCreateView(Context ctx, boolean portrait) {
LinearLayout ll = new LinearLayout(ctx);
@@ -250,12 +258,13 @@ public class SliceMenu extends ListBedMenu {
super.onCreate();
GCodeViewer viewer = getViewer();
GCodeProcessorResult result = getResult();
if (viewer != null) {
for (int i = 0; i < GCodeViewer.EXTRUSION_ROLES_COUNT; i++) {
boolean visible = viewer.getEstimatedTime(i) != 0;
roleViews[i].setVisibility(visible ? View.VISIBLE : View.GONE);
if (visible) {
roleViews[i].bind(viewer, i);
roleViews[i].bind(viewer, result, i);
}
}
}
@@ -299,22 +308,28 @@ public class SliceMenu extends ListBedMenu {
return total;
}
@SuppressLint("SetTextI18n")
private void updateValues() {
GCodeViewer viewer = getViewer();
GCodeProcessorResult result = getResult();
if (viewer == null) return;
float[] values = new float[2 + GCodeViewer.EXTRUSION_ROLES_COUNT];
double totalWeight = 0;
double totalLength = 0;
values[0] = 0;
values[values.length - 1] = 1;
float prev = 0;
int lastVisible = 0;
float total = getTotalEstimatedTime();
float totalTime = getTotalEstimatedTime();
for (int i = 0; i < GCodeViewer.EXTRUSION_ROLES_COUNT; i++) {
if (viewer.isExtrusionRoleVisible(i)) {
float percent = viewer.getEstimatedTime(i) / total;
float percent = viewer.getEstimatedTime(i) / totalTime;
values[i + 1] = prev + percent;
lastVisible = i;
prev = values[i + 1];
totalLength += result.getUsedFilamentMM(i);
totalWeight += result.getUsedFilamentG(i);
} else {
values[i + 1] = prev;
}
@@ -323,11 +338,21 @@ public class SliceMenu extends ListBedMenu {
values[lastVisible] = 1;
segmentsView.setValues(values);
totalView.setText(formatTime(total));
totalView.setText(formatComplex(totalWeight, totalLength, totalTime));
}
private static String formatComplex(double weight, double length, float time) {
StringBuilder sb = new StringBuilder();
if (weight > 0) {
sb.append(format.format(weight)).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoWeight)).append(" | ");
}
sb.append(format.format(length)).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoLength)).append(" | ");
sb.append(formatTime(time));
return sb.toString();
}
private static String formatTime(float time) {
int secondsTotal = Math.round(time);
int secondsTotal = (int) Math.round(Math.ceil(time));
int seconds = secondsTotal % 60;
int minutes = ((secondsTotal - seconds) / 60) % 60;
int hours = ((secondsTotal - seconds) / 60) / 60;
@@ -341,7 +366,7 @@ public class SliceMenu extends ListBedMenu {
sb.append(minutes).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoMinute));
}
if (seconds > 0) {
if (seconds > 0 || sb.length() == 0) {
if (sb.length() > 0) sb.append(" ");
sb.append(seconds).append(" ").append(SliceBeam.INSTANCE.getString(R.string.MenuSliceInfoSecond));
@@ -379,18 +404,19 @@ public class SliceMenu extends ListBedMenu {
titleView = new TextView(context);
titleView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 15);
addView(titleView, new LinearLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f) {{
leftMargin = rightMargin = ViewUtils.dp(12);
leftMargin = ViewUtils.dp(12);
rightMargin = ViewUtils.dp(8);
}});
timeView = new TextView(context);
timeView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 13);
timeView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 12);
addView(timeView, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewUtils.dp(42)));
onApplyTheme();
}
public void bind(GCodeViewer viewer, @GCodeViewer.ExtrusionRole int role) {
public void bind(GCodeViewer viewer, GCodeProcessorResult result, @GCodeViewer.ExtrusionRole int role) {
switch (role) {
case GCodeViewer.EXTRUSION_ROLE_NONE:
titleView.setText(Slic3rLocalization.getString("Unknown"));
@@ -439,7 +465,7 @@ public class SliceMenu extends ListBedMenu {
break;
}
timeView.setText(formatTime(viewer.getEstimatedTime(role)));
timeView.setText(formatComplex(result.getUsedFilamentG(role), result.getUsedFilamentMM(role), viewer.getEstimatedTime(role)));
checkBox.setChecked(viewer.isExtrusionRoleVisible(role));
checkBox.setButtonTintList(ColorStateList.valueOf(SegmentsView.mapColor(role)));
app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/GCodeProcessorResult.java
+8
View File
@@ -13,6 +13,14 @@ public class GCodeProcessorResult {
pointer = ptr;
}
public double getUsedFilamentMM(@GCodeViewer.ExtrusionRole int role) {
return Native.gcoderesult_get_used_filament_mm(pointer, role);
}
public double getUsedFilamentG(@GCodeViewer.ExtrusionRole int role) {
return Native.gcoderesult_get_used_filament_g(pointer, role);
}
public String getRecommendedName() {
return Native.gcoderesult_get_recommended_name(pointer);
}
app/src/main/java/ru/ytkab0bp/slicebeam/slic3r/Native.java
+2
View File
@@ -73,6 +73,8 @@ class Native {
static native long gcoderesult_load_file(String path, String name);
static native String gcoderesult_get_recommended_name(long ptr);
static native double gcoderesult_get_used_filament_mm(long ptr, int role);
static native double gcoderesult_get_used_filament_g(long ptr, int role);
static native void gcoderesult_release(long ptr);
static native long vgcode_create();
app/src/main/jni/slicebeam/beam_native.cpp
+67
View File
@@ -637,6 +637,73 @@ extern "C" {
return env->NewStringUTF(ref->name.c_str());
}
GCodeExtrusionRole mapGCodeRole(int index) {
GCodeExtrusionRole gRole;
switch (index) {
default:
case 0:
gRole = GCodeExtrusionRole::None;
break;
case 1:
gRole = GCodeExtrusionRole::Perimeter;
break;
case 2:
gRole = GCodeExtrusionRole::ExternalPerimeter;
break;
case 3:
gRole = GCodeExtrusionRole::OverhangPerimeter;
break;
case 4:
gRole = GCodeExtrusionRole::InternalInfill;
break;
case 5:
gRole = GCodeExtrusionRole::SolidInfill;
break;
case 6:
gRole = GCodeExtrusionRole::TopSolidInfill;
break;
case 7:
gRole = GCodeExtrusionRole::Ironing;
break;
case 8:
gRole = GCodeExtrusionRole::BridgeInfill;
break;
case 9:
gRole = GCodeExtrusionRole::GapFill;
break;
case 10:
gRole = GCodeExtrusionRole::Skirt;
break;
case 11:
gRole = GCodeExtrusionRole::SupportMaterial;
break;
case 12:
gRole = GCodeExtrusionRole::SupportMaterialInterface;
break;
case 13:
gRole = GCodeExtrusionRole::WipeTower;
break;
case 14:
gRole = GCodeExtrusionRole::Custom;
break;
}
return gRole;
}
JNIEXPORT jdouble JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1get_1used_1filament_1mm(JNIEnv* env, jclass, jlong ptr, jint role) {
GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr;
std::pair<double, double> info = ref->result.print_statistics.used_filaments_per_role.find(mapGCodeRole(role))->second;
return info.first * 1000.0 / 25.4;
}
JNIEXPORT jdouble JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1get_1used_1filament_1g(JNIEnv* env, jclass, jlong ptr, jint role) {
GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr;
std::pair<double, double> info = ref->result.print_statistics.used_filaments_per_role.find(mapGCodeRole(role))->second;
return info.second;
}
JNIEXPORT void JNICALL Java_ru_ytkab0bp_slicebeam_slic3r_Native_gcoderesult_1release(JNIEnv* env, jclass, jlong ptr) {
GCodeResultRef* ref = (GCodeResultRef*) (intptr_t) ptr;
delete ref;
app/src/main/res/values-ru/strings.xml
+2
View File
@@ -82,6 +82,8 @@
<string name="MenuSliceInfoSecond">с.</string>
<string name="MenuSliceInfoMinute">мин.</string>
<string name="MenuSliceInfoHour">ч.</string>
<string name="MenuSliceInfoWeight">г.</string>
<string name="MenuSliceInfoLength">мм.</string>
<string name="MenuSliceLayers">Слои</string>
<string name="MenuSliceInfoLayers">Слои %d - %d</string>
<string name="MenuSliceExportToFile">Экспорт. в файл</string>
app/src/main/res/values/strings.xml
+2
View File
@@ -84,6 +84,8 @@
<string name="MenuSliceInfoSecond">s.</string>
<string name="MenuSliceInfoMinute">min.</string>
<string name="MenuSliceInfoHour">h.</string>
<string name="MenuSliceInfoWeight">g.</string>
<string name="MenuSliceInfoLength">mm.</string>
<string name="MenuSliceLayers">Layers</string>
<string name="MenuSliceInfoLayers">Layers %d - %d</string>
<string name="MenuSliceExportToFile">Export to file</string>