149 Commits

Author SHA1 Message Date
Jaime van Kessel
24474b4434 Made too broad exception handling more specific 2019-09-02 09:52:36 +02:00
Jaime van Kessel
9b45b56e61 Fix simulation view not showing bars for g-code 2019-08-30 11:43:59 +02:00
Jaime van Kessel
e8cd5723c9 Speedup the layerview
We were doing a lot of re-calculations that served no purpose (and
even slowed down the rest of the application)
2019-08-27 13:26:55 +02:00
Jaime van Kessel
ea11187eaf Don't reset the data when the root updates
Resolves #6258
2019-08-27 13:18:11 +02:00
Jaime van Kessel
511eba28b6 Ensure that min/max feedrate & thickness gets defined in init 2019-08-27 13:06:33 +02:00
Jaime van Kessel
9c2f8a94d5 Greatly simplify the SimulationViewProxy 2019-08-27 13:03:23 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues
They were caused by upgrading to a higher mypy version, which found more mistakes
2019-07-23 12:58:46 +02:00
Lipu Fei
dab0a43214 Merge remote-tracking branch 'origin/master' into shader_optimization 2019-05-16 14:22:05 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Remco Burema
2e88c172c1 Reduced amount of matrix multiplication in geometry shaders. 2019-04-19 23:00:26 +02:00
Remco Burema
ed6db6c9b0 Move multiplication from Python to shaders. (Needs the same-named Uranium branch.) 2019-04-19 16:58:38 +02:00
Lipu Fei
f2234cffa4 Fix extruder enable/disable problem in color scheme 2019-04-05 10:43:09 +02:00
Jaime van Kessel
94cf61ca18 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-01-17 14:28:35 +01:00
Remco Burema
f057c9a7df Prevent spurious updates to 'onPreferenceChanged's if the preference doesn't match. 2019-01-15 17:15:12 +01:00
Lipu Fei
ee34cd522d
Merge pull request #5017 from Ultimaker/add_comment_prime_tower
Add time prime tower into Cura.proto
2019-01-07 13:30:32 +01:00
Lipu Fei
d4b0c157aa Fix layers.shader to check feature prime_tower
CURA-5932
2019-01-07 13:20:46 +01:00
Jaime van Kessel
ffce9bd172 Ensure that the primetower gets drawn in the right color again
CURA-5932
2019-01-04 14:59:26 +01:00
Ghostkeeper
78ee666919
Merge branch '4.0' 2019-01-03 11:09:28 +01:00
Lipu Fei
d97b812ccd
Merge branch '4.0' into unify_font_types 2019-01-03 10:46:49 +01:00
Jaime van Kessel
e02fcd664c Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-31 14:34:53 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
2018-12-31 13:22:53 +01:00
Ghostkeeper
c333899d18
Fix reference to renamed file 2018-12-31 11:09:26 +01:00
Aleksei S
81a6531f47 Fix range slider label position in LayerSlider.qml. 2018-12-20 20:37:48 +01:00
Ghostkeeper
56d0a52fac
Documentation and code style 2018-12-19 11:51:46 +01:00
Ghostkeeper
f1c28498a6
Display 0 if there are no measurements for minimum values
Don't display max float then.
2018-12-19 11:00:00 +01:00
Lipu Fei
6992fd2991 Update plugin versions to match package versions
CURA-6019
2018-12-17 13:03:21 +01:00
Ghostkeeper
c235f339ae
Increment API version to 6
All plug-ins now have to re-check whether they are still compatible with the current version of Cura.

Contributes to issue CURA-6019.
2018-12-14 17:29:02 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels
CURA-6015
2018-12-13 14:12:23 +01:00
Diego Prado Gesto
c804610fa6 Make the stage menu in the preview using 85 percent of the total width in order to prevent the print setup panel to be in the middle 2018-12-11 15:19:40 +01:00
Diego Prado Gesto
742fc34e75 Change labels in the layer view legend 2018-12-11 14:31:12 +01:00
Diego Prado Gesto
db56aa028c Change the swatch from a circle to the extruder icon 2018-12-11 13:59:36 +01:00
Diego Prado Gesto
faa3f42acc Modify the header in the simulation view menu component
This is needed to align with the designs.
2018-12-11 13:53:05 +01:00
Diego Prado Gesto
af37f51cf8 Make the expandable content header to be a common header for every expandable component.
Contributes to CURA-5941.
2018-12-10 13:36:06 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
76acb13f59 Change the play/pause button colors 2018-12-06 13:50:58 +01:00
Diego Prado Gesto
cdb8020029 Add another expandable component
Use one of them if the drop-panel has to act as a Popup and the other if it has to act as a standard component.

Contributes to CURA-5941.
2018-12-05 09:39:04 +01:00
Diego Prado Gesto
47ff95b1f3 Set contentType to the different expandable components.
Also add a color for the active state when the contentType is 'Fixed'.

Contributes to CURA-5941.
2018-12-04 13:53:11 +01:00
Diego Prado Gesto
e159cbdb1a Rename all the references from 'popup' to 'content'
Contributes to CURA-5941.
2018-12-04 13:14:12 +01:00
Jaime van Kessel
5ddb3ff909 Factor out superfluous use of small_tool_button style
The style was overly complicated for what it should do
2018-11-26 17:40:34 +01:00
Jaime van Kessel
bf8a04fa40 Fix some minor display issues for simulation view
CURA-5785
2018-11-22 11:08:46 +01:00
Jaime van Kessel
bd636e61a0 Minor changes suggested in review
CURA-5785
2018-11-21 13:17:36 +01:00
Jaime van Kessel
3b4d728d6a Fix Simulation view popup not sizing down
I have no idea why implictHeight does work and childrenRect.height doesn't (eg;
childrenRect.height only scales up for some reason, never down)

CURA-5785
2018-11-20 14:35:13 +01:00
Jaime van Kessel
6fe89e3d54 Fix width of simulationView component not being set correctly
CURA-5785
2018-11-19 10:33:19 +01:00
Jaime van Kessel
6b55490af8 Fix final QML warnings
CURA-5785
2018-11-16 16:30:47 +01:00
Jaime van Kessel
fb72f9a059 Fixed size of expandableItem not being the correct width
CURA-5785
2018-11-14 09:59:56 +01:00
Jaime van Kessel
785c2661a2 Make SimulationViewMenuComponent also use the ExpandableComponent
CURA-5785
2018-11-13 15:57:00 +01:00
Diego Prado Gesto
38a80ecae5 Make some tweaks in the UI for the preview stage.
Clean up the default theme a bit by removing unused entries.

Contributes to CURA-5829.
2018-11-11 14:06:52 +01:00
Diego Prado Gesto
7a12cc53cc Merge branch 'master' into ui_rework_4_0 2018-11-09 08:53:31 +01:00
Diego Prado Gesto
9f663cfd18 Change the gradient for the LinearGradient that works in the new versions of Qt.
I also changed it because we had a TODO here and I thought it was the right moment to do it.

Contributes to CURA-5829.
2018-11-07 17:25:43 +01:00