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

Moved default values into components

Browse source 
CURA-5829
This commit is contained in:
Jaime van Kessel 2018-10-31 09:46:41 +01:00
parent f773030218
commit 3fc399a644
4 changed files with 26 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

22
plugins/SimulationView/LayerSlider.qml
View file

@ -13,22 +13,22 @@ Item
{ {
id: sliderRoot id: sliderRoot
// handle properties // Handle properties
property real handleSize: 10 property real handleSize: UM.Theme.getSize("slider_handle").width
property real handleRadius: handleSize / 2 property real handleRadius: handleSize / 2
property real minimumRangeHandleSize: handleSize / 2 property real minimumRangeHandleSize: handleSize / 2
property color upperHandleColor: "black" property color upperHandleColor: UM.Theme.getColor("slider_handle")
property color lowerHandleColor: "black" property color lowerHandleColor: UM.Theme.getColor("slider_handle")
property color rangeHandleColor: "black" property color rangeHandleColor: UM.Theme.getColor("slider_groove_fill")
property color handleActiveColor: "white" property color handleActiveColor: UM.Theme.getColor("slider_handle_active")
property real handleLabelWidth: width property real handleLabelWidth: UM.Theme.getSize("slider_layerview_background").width
property var activeHandle: upperHandle property var activeHandle: upperHandle
// track properties // Track properties
property real trackThickness: 4 // width of the slider track property real trackThickness: UM.Theme.getSize("slider_groove").width // width of the slider track
property real trackRadius: trackThickness / 2 property real trackRadius: trackThickness / 2
property color trackColor: "white" property color trackColor: UM.Theme.getColor("slider_groove")
property real trackBorderWidth: 1 // width of the slider track border property real trackBorderWidth: UM.Theme.getColor("slider_groove_border")
property color trackBorderColor: "black" property color trackBorderColor: "black"
// value properties // value properties

14
plugins/SimulationView/PathSlider.qml
View file

@ -14,19 +14,19 @@ Item
id: sliderRoot id: sliderRoot
// handle properties // handle properties
property real handleSize: 10 property real handleSize: UM.Theme.getSize("slider_handle").width
property real handleRadius: handleSize / 2 property real handleRadius: handleSize / 2
property color handleColor: "black" property color handleColor: UM.Theme.getColor("slider_handle")
property color handleActiveColor: "white" property color handleActiveColor: UM.Theme.getColor("slider_handle_active")
property color rangeColor: "black" property color rangeColor: UM.Theme.getColor("slider_groove_fill")
property real handleLabelWidth: width property real handleLabelWidth: width
// track properties // track properties
property real trackThickness: 4 // width of the slider track property real trackThickness: UM.Theme.getSize("slider_groove").width
property real trackRadius: trackThickness / 2 property real trackRadius: trackThickness / 2
property color trackColor: "white" property color trackColor: UM.Theme.getColor("slider_groove")
property real trackBorderWidth: 1 // width of the slider track border property real trackBorderWidth: 1 // width of the slider track border
property color trackBorderColor: "black" property color trackBorderColor: UM.Theme.getColor("slider_groove_border")
// value properties // value properties
property real maximumValue: 100 property real maximumValue: 100

16
plugins/SimulationView/SimulationViewMainComponent.qml
View file

@ -30,13 +30,6 @@ Item
// Custom properties // Custom properties
handleValue: UM.SimulationView.currentPath handleValue: UM.SimulationView.currentPath
maximumValue: UM.SimulationView.numPaths maximumValue: UM.SimulationView.numPaths
handleSize: UM.Theme.getSize("slider_handle").width
trackThickness: UM.Theme.getSize("slider_groove").width
trackColor: UM.Theme.getColor("slider_groove")
trackBorderColor: UM.Theme.getColor("slider_groove_border")
handleColor: UM.Theme.getColor("slider_handle")
handleActiveColor: UM.Theme.getColor("slider_handle_active")
rangeColor: UM.Theme.getColor("slider_groove_fill")
// Update values when layer data changes. // Update values when layer data changes.
Connections Connections
@ -175,15 +168,6 @@ Item
upperValue: UM.SimulationView.currentLayer upperValue: UM.SimulationView.currentLayer
lowerValue: UM.SimulationView.minimumLayer lowerValue: UM.SimulationView.minimumLayer
maximumValue: UM.SimulationView.numLayers maximumValue: UM.SimulationView.numLayers
handleSize: UM.Theme.getSize("slider_handle").width
trackThickness: UM.Theme.getSize("slider_groove").width
trackColor: UM.Theme.getColor("slider_groove")
trackBorderColor: UM.Theme.getColor("slider_groove_border")
upperHandleColor: UM.Theme.getColor("slider_handle")
lowerHandleColor: UM.Theme.getColor("slider_handle")
rangeHandleColor: UM.Theme.getColor("slider_groove_fill")
handleActiveColor: UM.Theme.getColor("slider_handle_active")
handleLabelWidth: UM.Theme.getSize("slider_layerview_background").width
// Update values when layer data changes // Update values when layer data changes
Connections Connections

17
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

@ -216,15 +216,14 @@ Item
onPreferenceChanged: onPreferenceChanged:
{ {
layerTypeCombobox.currentIndex = UM.SimulationView.compatibilityMode ? 1 : UM.Preferences.getValue("layerview/layer_view_type"); layerTypeCombobox.currentIndex = UM.SimulationView.compatibilityMode ? 1 : UM.Preferences.getValue("layerview/layer_view_type");
layerTypeCombobox.updateLegends(layerTypeCombobox.currentIndex); layerTypeCombobox.updateLegends(layerTypeCombobox.currentIndex)
playButton.pauseSimulation(); viewSettings.extruder_opacities = UM.Preferences.getValue("layerview/extruder_opacities").split("|")
viewSettings.extruder_opacities = UM.Preferences.getValue("layerview/extruder_opacities").split("|"); viewSettings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves")
viewSettings.show_travel_moves = UM.Preferences.getValue("layerview/show_travel_moves"); viewSettings.show_helpers = UM.Preferences.getValue("layerview/show_helpers")
viewSettings.show_helpers = UM.Preferences.getValue("layerview/show_helpers"); viewSettings.show_skin = UM.Preferences.getValue("layerview/show_skin")
viewSettings.show_skin = UM.Preferences.getValue("layerview/show_skin"); viewSettings.show_infill = UM.Preferences.getValue("layerview/show_infill")
viewSettings.show_infill = UM.Preferences.getValue("layerview/show_infill"); viewSettings.only_show_top_layers = UM.Preferences.getValue("view/only_show_top_layers")
viewSettings.only_show_top_layers = UM.Preferences.getValue("view/only_show_top_layers"); viewSettings.top_layer_count = UM.Preferences.getValue("view/top_layer_count")
viewSettings.top_layer_count = UM.Preferences.getValue("view/top_layer_count");
} }
} }