mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-15 14:15:56 +08:00
Shorten excessively long lines
- Some lines in the files were excessively long, even in the context of the Cura project which seems to prefer a long line length. These lines could not be read easily even on github .... - Removed some unnecessary whitespaces - Added some extra spaces so that inline comments are separated by at least two spaces from the statement
This commit is contained in:
parent
9488092e5e
commit
776c71e5c9
@ -24,9 +24,12 @@ class LayerPolygon:
|
|||||||
PrimeTowerType = 11
|
PrimeTowerType = 11
|
||||||
__number_of_types = 12
|
__number_of_types = 12
|
||||||
|
|
||||||
__jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(__number_of_types) == NoneType, numpy.arange(__number_of_types) == MoveCombingType), numpy.arange(__number_of_types) == MoveRetractionType)
|
__jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(__number_of_types) == NoneType,
|
||||||
|
numpy.arange(__number_of_types) == MoveCombingType),
|
||||||
|
numpy.arange(__number_of_types) == MoveRetractionType)
|
||||||
|
|
||||||
def __init__(self, extruder: int, line_types: numpy.ndarray, data: numpy.ndarray, line_widths: numpy.ndarray, line_thicknesses: numpy.ndarray, line_feedrates: numpy.ndarray) -> None:
|
def __init__(self, extruder: int, line_types: numpy.ndarray, data: numpy.ndarray,
|
||||||
|
line_widths: numpy.ndarray, line_thicknesses: numpy.ndarray, line_feedrates: numpy.ndarray) -> None:
|
||||||
"""LayerPolygon, used in ProcessSlicedLayersJob
|
"""LayerPolygon, used in ProcessSlicedLayersJob
|
||||||
|
|
||||||
:param extruder: The position of the extruder
|
:param extruder: The position of the extruder
|
||||||
@ -63,7 +66,9 @@ class LayerPolygon:
|
|||||||
self._color_map = LayerPolygon.getColorMap()
|
self._color_map = LayerPolygon.getColorMap()
|
||||||
self._colors = self._color_map[self._types] # type: numpy.ndarray
|
self._colors = self._color_map[self._types] # type: numpy.ndarray
|
||||||
|
|
||||||
# When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType
|
# When type is used as index returns true if type == LayerPolygon.InfillType
|
||||||
|
# or type == LayerPolygon.SkinType
|
||||||
|
# or type == LayerPolygon.SupportInfillType
|
||||||
# Should be generated in better way, not hardcoded.
|
# Should be generated in better way, not hardcoded.
|
||||||
self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype=bool)
|
self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype=bool)
|
||||||
|
|
||||||
@ -85,7 +90,9 @@ class LayerPolygon:
|
|||||||
self._vertex_begin = 0
|
self._vertex_begin = 0
|
||||||
self._vertex_end = cast(int, numpy.sum(self._build_cache_needed_points))
|
self._vertex_end = cast(int, numpy.sum(self._build_cache_needed_points))
|
||||||
|
|
||||||
def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray, colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray, extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None:
|
def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray,
|
||||||
|
colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray,
|
||||||
|
extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None:
|
||||||
"""Set all the arrays provided by the function caller, representing the LayerPolygon
|
"""Set all the arrays provided by the function caller, representing the LayerPolygon
|
||||||
|
|
||||||
The arrays are either by vertex or by indices.
|
The arrays are either by vertex or by indices.
|
||||||
@ -138,7 +145,8 @@ class LayerPolygon:
|
|||||||
# Convert type per vertex to type per line
|
# Convert type per vertex to type per line
|
||||||
line_types[self._vertex_begin:self._vertex_end] = numpy.tile(self._types, (1, 2)).reshape((-1, 1))[needed_points_list.ravel()][:, 0]
|
line_types[self._vertex_begin:self._vertex_end] = numpy.tile(self._types, (1, 2)).reshape((-1, 1))[needed_points_list.ravel()][:, 0]
|
||||||
|
|
||||||
# The relative values of begin and end indices have already been set in buildCache, so we only need to offset them to the parents offset.
|
# The relative values of begin and end indices have already been set in buildCache,
|
||||||
|
# so we only need to offset them to the parents offset.
|
||||||
self._index_begin += index_offset
|
self._index_begin += index_offset
|
||||||
self._index_end += index_offset
|
self._index_end += index_offset
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user