Skip to content

Commit e89e8a6

Browse files
author
Pavel Polyakov
committed
fixed preview image from latest version
1 parent 3d6361d commit e89e8a6

File tree

6 files changed

+308
-57
lines changed

6 files changed

+308
-57
lines changed

MKSWifiPlugin/MKSConnectBtn.qmlc

80 Bytes
Binary file not shown.

MKSWifiPlugin/MKSOutputDevice.py

Lines changed: 286 additions & 51 deletions
Large diffs are not rendered by default.

MKSWifiPlugin/MachineConfig.qmlc

80 Bytes
Binary file not shown.

MKSWifiPlugin/MonitorItem4x.qml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,27 @@ Component
151151
{
152152
return catalog.i18nc("@label", "Resume");
153153
}else{
154-
return catalog.i18nc("@label", "Pause");
154+
return catalog.i18nc("@label", "Pause/Resume");
155155
}
156+
// return catalog.i18nc("@label", Cura.MachineManager.printerOutputDevices[0].printer_state());
156157
}
158+
// visible: manager.printer_state() == 'paused'
157159
enabled: base.selectedPrinter != null && base.selectedPrinter.getProperty("manual") == "true"
158160
onClicked:Cura.MachineManager.printerOutputDevices[0].pausePrint()
159161
}
162+
163+
// Button
164+
// {
165+
// id: pauseButton
166+
// height: UM.Theme.getSize("save_button_save_to_button").height
167+
// text:
168+
// {
169+
// return catalog.i18nc("@label", "Pause");
170+
// }
171+
// visible: manager.printer_state() != 'paused'
172+
// enabled: base.selectedPrinter != null && base.selectedPrinter.getProperty("manual") == "true"
173+
// onClicked:Cura.MachineManager.printerOutputDevices[0].pausePrint()
174+
// }
160175

161176
Button
162177
{

MKSWifiPlugin/MonitorItem4x.qmlc

96 Bytes
Binary file not shown.

MKSWifiPlugin/SaveOutputDevice.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def __init__(self):
2222
super().__init__("save_with_screenshot")
2323
self.setName("save_with_screenshot")
2424
self.setPriority(2)
25+
self._preferences = Application.getInstance().getPreferences()
2526
self.setShortDescription(catalog.i18nc("@action:button", "Save as TFT file"))
2627
self.setDescription(catalog.i18nc("@properties:tooltip", "Save as TFT file"))
2728
self.setIconName("save")
@@ -47,7 +48,7 @@ def requestWrite(self, nodes, file_name=None, limit_mimetypes=None, file_handler
4748
filters = []
4849
mime_types = []
4950
selected_filter = None
50-
last_used_type = Preferences.getInstance().getValue("local_file/last_used_type")
51+
last_used_type = self._preferences.getValue("local_file/last_used_type")
5152

5253
if not file_handler:
5354
file_handler = Application.getInstance().getMeshFileHandler()
@@ -78,17 +79,17 @@ def requestWrite(self, nodes, file_name=None, limit_mimetypes=None, file_handler
7879
if file_name is not None:
7980
dialog.selectFile(file_name)
8081

81-
stored_directory = Preferences.getInstance().getValue("local_file/dialog_save_path")
82+
stored_directory = self._preferences.getValue("local_file/dialog_save_path")
8283
dialog.setDirectory(stored_directory)
8384

8485
if not dialog.exec_():
8586
raise OutputDeviceError.UserCanceledError()
8687

8788
save_path = dialog.directory().absolutePath()
88-
Preferences.getInstance().setValue("local_file/dialog_save_path", save_path)
89+
self._preferences.setValue("local_file/dialog_save_path", save_path)
8990

9091
selected_type = file_types[filters.index(dialog.selectedNameFilter())]
91-
Preferences.getInstance().setValue("local_file/last_used_type", selected_type["mime_type"])
92+
self._preferences.setValue("local_file/last_used_type", selected_type["mime_type"])
9293

9394
# Get file name from file dialog
9495
file_name = dialog.selectedFiles()[0]
@@ -116,7 +117,7 @@ def save_gcode(self, file_name, _gcode):
116117
message.show()
117118
save_file = open(file_name, "w")
118119
if image:
119-
save_file.write(utils.add_screenshot(image, 100, 100, ";simage:"))
120+
save_file.write(utils.add_screenshot(image, 50, 50, ";simage:"))
120121
save_file.write(utils.add_screenshot(image, 200, 200, ";;gimage:"))
121122
save_file.write("\r")
122123
for line in _gcode:

0 commit comments

Comments
 (0)