diff options
author | p.kuiper <p.kuiper@ultimaker.com> | 2021-12-09 10:16:55 +0300 |
---|---|---|
committer | p.kuiper <p.kuiper@ultimaker.com> | 2021-12-09 10:16:55 +0300 |
commit | 21d914f158d72955949051e64f97d5b3a66b84ad (patch) | |
tree | 35f2a345e5c542cba58e1ab0e43709be5d7e31b9 | |
parent | 7b4bc6958c3cbc03ab868b63fdd24133df739d98 (diff) | |
parent | 9674c54efb089d8445ab3ec84ec649c1b2b5e091 (diff) |
Merge branch 'master' into PP-50_0.3mm_layer_height_print_profiles
-rw-r--r-- | cura/PrinterOutput/Models/PrintJobOutputModel.py | 14 | ||||
-rw-r--r-- | plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py | 10 | ||||
-rw-r--r-- | resources/definitions/fdmprinter.def.json | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/cura/PrinterOutput/Models/PrintJobOutputModel.py b/cura/PrinterOutput/Models/PrintJobOutputModel.py index 256999b96f..f7404f71ed 100644 --- a/cura/PrinterOutput/Models/PrintJobOutputModel.py +++ b/cura/PrinterOutput/Models/PrintJobOutputModel.py @@ -42,7 +42,7 @@ class PrintJobOutputModel(QObject): self._preview_image = None # type: Optional[QImage] @pyqtProperty("QStringList", notify=compatibleMachineFamiliesChanged) - def compatibleMachineFamilies(self): + def compatibleMachineFamilies(self) -> List[str]: # Hack; Some versions of cluster will return a family more than once... return list(set(self._compatible_machine_families)) @@ -77,11 +77,11 @@ class PrintJobOutputModel(QObject): self._configuration = configuration self.configurationChanged.emit() - @pyqtProperty(str, notify=ownerChanged) - def owner(self): + @pyqtProperty(str, notify = ownerChanged) + def owner(self) -> str: return self._owner - def updateOwner(self, owner): + def updateOwner(self, owner: str) -> None: if self._owner != owner: self._owner = owner self.ownerChanged.emit() @@ -132,7 +132,7 @@ class PrintJobOutputModel(QObject): @pyqtProperty(float, notify = timeElapsedChanged) def progress(self) -> float: - result = float(self.timeElapsed) / max(self.timeTotal, 1.0) # Prevent a division by zero exception. + result = float(self.timeElapsed) / max(self.timeTotal, 1.0) # Prevent a division by zero exception. return min(result, 1.0) # Never get a progress past 1.0 @pyqtProperty(str, notify=stateChanged) @@ -151,12 +151,12 @@ class PrintJobOutputModel(QObject): return False return True - def updateTimeTotal(self, new_time_total): + def updateTimeTotal(self, new_time_total: int) -> None: if self._time_total != new_time_total: self._time_total = new_time_total self.timeTotalChanged.emit() - def updateTimeElapsed(self, new_time_elapsed): + def updateTimeElapsed(self, new_time_elapsed: int) -> None: if self._time_elapsed != new_time_elapsed: self._time_elapsed = new_time_elapsed self.timeElapsedChanged.emit() diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py index 987ca9fab1..6873582074 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py @@ -40,7 +40,7 @@ class ClusterPrintJobStatus(BaseModel): configuration_changes_required: List[ Union[Dict[str, Any], ClusterPrintJobConfigurationChange]] = None, build_plate: Union[Dict[str, Any], ClusterBuildPlate] = None, - compatible_machine_families: List[str] = None, + compatible_machine_families: Optional[List[str]] = None, impediments_to_printing: List[Union[Dict[str, Any], ClusterPrintJobImpediment]] = None, preview_url: Optional[str] = None, **kwargs) -> None: @@ -97,7 +97,7 @@ class ClusterPrintJobStatus(BaseModel): configuration_changes_required) \ if configuration_changes_required else [] self.build_plate = self.parseModel(ClusterBuildPlate, build_plate) if build_plate else None - self.compatible_machine_families = compatible_machine_families if compatible_machine_families else [] + self.compatible_machine_families = compatible_machine_families if compatible_machine_families is not None else [] self.impediments_to_printing = self.parseModels(ClusterPrintJobImpediment, impediments_to_printing) \ if impediments_to_printing else [] @@ -130,8 +130,10 @@ class ClusterPrintJobStatus(BaseModel): model.updateConfiguration(self._createConfigurationModel()) model.updateTimeTotal(self.time_total) - model.updateTimeElapsed(self.time_elapsed) - model.updateOwner(self.owner) + if self.time_elapsed is not None: + model.updateTimeElapsed(self.time_elapsed) + if self.owner is not None: + model.updateOwner(self.owner) model.updateState(self.status) model.setCompatibleMachineFamilies(self.compatible_machine_families) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d59edb9389..9a3cc32f39 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2087,7 +2087,7 @@ "default_value": 0, "type": "int", "minimum_value": "0", - "maximum_value_warning": "1 if (infill_pattern == 'cross' or infill_pattern == 'cross_3d' or support_pattern == 'concentric') else 5", + "maximum_value_warning": "1 if (infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'concentric') else 5", "maximum_value": "999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2))", "enabled": "infill_sparse_density > 0 and infill_pattern not in ['cubicsubdiv', 'cross', 'cross_3d', 'lightning']", "limit_to_extruder": "infill_extruder_nr", |