3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Correct and consistent spelling of g-code

Browse source 
This spelling is in Ultimaker's style guide.
We use g-code, and capitalise the G if it's at the start of a sentence or header.
Pretty good score, considering there are literally thousands of user- or log-visible strings mentioning g-code across Cura.
This commit is contained in:
Ghostkeeper 2020-07-20 13:36:49 +02:00
parent e6c305de40
commit db15bc84cf
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
8 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/GCodeGzReader/GCodeGzReader.py
View file

@ -1,4 +1,4 @@
# Copyright (c) 2018 Ultimaker B.V.
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import gzip
@ -19,7 +19,7 @@ class GCodeGzReader(MeshReader):
MimeTypeDatabase.addMimeType(
MimeType(
name = "application/x-cura-compressed-gcode-file",
comment = "Cura Compressed GCode File",
comment = "Cura Compressed G-code File",
suffixes = ["gcode.gz"]
)
)

10
plugins/GCodeReader/FlavorParser.py
View file

@ -312,7 +312,7 @@ class FlavorParser:
# F5, that gcode SceneNode will be removed because it doesn't have a file to be reloaded from.
#
def processGCodeStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]:
Logger.log("d", "Preparing to load GCode")
Logger.log("d", "Preparing to load g-code")
self._cancelled = False
# We obtain the filament diameter from the selected extruder to calculate line widths
global_stack = CuraApplication.getInstance().getGlobalContainerStack()
@ -352,7 +352,7 @@ class FlavorParser:
self._message.setProgress(0)
self._message.show()
Logger.log("d", "Parsing Gcode...")
Logger.log("d", "Parsing g-code...")
current_position = Position(0, 0, 0, 0, [0])
current_path = [] #type: List[List[float]]
@ -363,7 +363,7 @@ class FlavorParser:
for line in stream.split("\n"):
if self._cancelled:
Logger.log("d", "Parsing Gcode file cancelled")
Logger.log("d", "Parsing g-code file cancelled.")
return None
current_line += 1
@ -482,7 +482,7 @@ class FlavorParser:
gcode_dict = {active_build_plate_id: gcode_list}
CuraApplication.getInstance().getController().getScene().gcode_dict = gcode_dict #type: ignore #Because gcode_dict is generated dynamically.
Logger.log("d", "Finished parsing Gcode")
Logger.log("d", "Finished parsing g-code.")
self._message.hide()
if self._layer_number == 0:
@ -493,7 +493,7 @@ class FlavorParser:
machine_depth = global_stack.getProperty("machine_depth", "value")
scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2))
Logger.log("d", "GCode loading finished")
Logger.log("d", "G-code loading finished.")
if CuraApplication.getInstance().getPreferences().getValue("gcodereader/show_caution"):
caution_message = Message(catalog.i18nc(

4
plugins/GCodeReader/GCodeReader.py
View file

@ -1,5 +1,5 @@
# Copyright (c) 2017 Aleph Objects, Inc.
# Copyright (c) 2018 Ultimaker B.V.
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Optional, Union, List, TYPE_CHECKING
@ -32,7 +32,7 @@ class GCodeReader(MeshReader):
MimeTypeDatabase.addMimeType(
MimeType(
name = "application/x-cura-gcode-file",
comment = "Cura GCode File",
comment = "Cura G-code File",
suffixes = ["gcode"]
)
)

6
plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py
View file

@ -1,3 +1,5 @@
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
# Created by Wayne Porter
from ..Script import Script
@ -24,8 +26,8 @@ class InsertAtLayerChange(Script):
},
"gcode_to_add":
{
"label": "GCODE to insert.",
"description": "GCODE to add before or after layer change.",
"label": "G-code to insert.",
"description": "G-code to add before or after layer change.",
"type": "str",
"default_value": ""
}

4
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -188,14 +188,14 @@ class PauseAtHeight(Script):
"custom_gcode_before_pause":
{
"label": "G-code Before Pause",
"description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.",
"description": "Any custom g-code to run before the pause, for example, M300 S440 P200 to beep.",
"type": "str",
"default_value": ""
},
"custom_gcode_after_pause":
{
"label": "G-code After Pause",
"description": "Any custom GCODE to run after the pause, for example, M300 S440 P200 to beep.",
"description": "Any custom g-code to run after the pause, for example, M300 S440 P200 to beep.",
"type": "str",
"default_value": ""
}

4
plugins/PostProcessingPlugin/scripts/TimeLapse.py
View file

@ -1,3 +1,5 @@
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
# Created by Wayne Porter
from ..Script import Script
@ -18,7 +20,7 @@ class TimeLapse(Script):
"trigger_command":
{
"label": "Trigger camera command",
"description": "Gcode command used to trigger camera.",
"description": "G-code command used to trigger camera.",
"type": "str",
"default_value": "M240"
},

4
scripts/check_gcode_buffer.py
View file

@ -1,5 +1,5 @@
#!/usr/bin/env python3
# Copyright (c) 2018 Ultimaker B.V.
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import copy
@ -522,7 +522,7 @@ class CommandBuffer:
if __name__ == "__main__":
if len(sys.argv) < 2 or 3 < len(sys.argv):
print("Usage: <input gcode> [output gcode]")
print("Usage: <input g-code> [output g-code]")
sys.exit(1)
in_filename = sys.argv[1]
out_filename = None

5
tests/TestPrintInformation.py
View file

@ -1,3 +1,6 @@
# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import functools
from UM.Qt.Duration import Duration
@ -55,7 +58,7 @@ def setup_module():
MimeTypeDatabase.addMimeType(
MimeType(
name = "application/x-cura-gcode-file",
comment = "Cura GCode File",
comment = "Cura G-code File",
suffixes = ["gcode"]
)
)