GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-11 18:39:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CURA-5979_gcode_loading_new_ui' of github.com:Ultimaker/Cura into ui_rework_4_0

Browse Source
This commit is contained in:
Jaime van Kessel 2018-11-28 10:15:07 +01:00
commit aeb2887796
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/CuraApplication.py
View File

@ -1663,7 +1663,9 @@ class CuraApplication(QtApplication):
is_non_sliceable = "." + file_extension in self._non_sliceable_extensions is_non_sliceable = "." + file_extension in self._non_sliceable_extensions
if is_non_sliceable: if is_non_sliceable:
self.callLater(lambda: self.getController().setActiveView("SimulationView")) # Need to switch first to the preview stage and then to layer view
self.callLater(lambda: (self.getController().setActiveStage("PreviewStage"),
self.getController().setActiveView("SimulationView")))
block_slicing_decorator = BlockSlicingDecorator() block_slicing_decorator = BlockSlicingDecorator()
node.addDecorator(block_slicing_decorator) node.addDecorator(block_slicing_decorator)

8
resources/qml/ActionPanel/OutputProcessWidget.qml
View File

@ -18,6 +18,7 @@ Column
id: widget id: widget
spacing: UM.Theme.getSize("thin_margin").height spacing: UM.Theme.getSize("thin_margin").height
property bool preSlicedData: PrintInformation.preSliced
UM.I18nCatalog UM.I18nCatalog
{ {
@ -48,7 +49,7 @@ Column
id: estimatedTime id: estimatedTime
width: parent.width width: parent.width
text: PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long) text: preSlicedData ? catalog.i18nc("@label", "No time estimation available") : PrintInformation.currentPrintTime.getDisplayString(UM.DurationFormat.Long)
source: UM.Theme.getIcon("clock") source: UM.Theme.getIcon("clock")
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
} }
@ -63,6 +64,10 @@ Column
text: text:
{ {
if (preSlicedData)
{
return catalog.i18nc("@label", "No cost estimation available")
}
var totalLengths = 0 var totalLengths = 0
var totalWeights = 0 var totalWeights = 0
if (printMaterialLengths) if (printMaterialLengths)
@ -86,6 +91,7 @@ Column
PrintInformationWidget PrintInformationWidget
{ {
id: printInformationPanel id: printInformationPanel
visible: !preSlicedData
anchors anchors
{ {

2
resources/qml/Cura.qml
View File

@ -212,7 +212,7 @@ UM.MainWindow
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
left: parent.left left: parent.left
} }
visible: CuraApplication.platformActivity visible: CuraApplication.platformActivity && !PrintInformation.preSliced
} }
ObjectsList ObjectsList