GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,973 Commits 288 Branches 260 Tags
Commit Graph

176 Commits

Author SHA1 Message Date
Nino van Hooff
ae245ed0e5 Cleanup: remove warnings for non-existing margins 2019-11-12 14:51:48 +01:00
Jaime van Kessel
7e3905059d
Let the simulation slider label scale on actual font size 
CURA-6854
 2019-11-11 16:10:26 +01:00
Jaime van Kessel
4335acb19f
Fix text jitter for the layer slider 
CURA-6854
 2019-11-11 14:27:31 +01:00
Lipu Fei
534b432e7e Fix another is None check for typing 2019-11-11 09:08:13 +01:00
Lipu Fei
7495d7900f Fix is None check for typing 2019-11-11 09:03:21 +01:00
Lipu Fei
adaea90d50 Fix typing 2019-11-11 08:48:04 +01:00
Jaime van Kessel
9940bc8551
Merge branch 'master' of github.com:Ultimaker/Cura 2019-11-08 13:38:58 +01:00
Jaime van Kessel
00078fd659
Remove a bunch of unused imports 2019-11-08 13:38:42 +01:00
Nino van Hooff
ba6cf8eae5 Fix window resize bug in LayerSlider concerning handle position 
Upper handle position would not be updated on resize

CURA-6854
 2019-11-07 12:46:45 +01:00
Nino van Hooff
96bd641d93 Fix: upper/lower handle not losing focus when range handle pressed 2019-11-01 11:06:16 +01:00
Nino van Hooff
94d291a20c Merge branch 'master' into CURA-6854_align_layer_label_top_bottom 
# Conflicts:
#	plugins/SimulationView/SimulationViewMainComponent.qml
 2019-11-01 10:51:21 +01:00
Nino van Hooff
958a922808 Cleanup debugging things for cura-6874 
CURA-6874
 2019-10-30 10:54:22 +01:00
Nino van Hooff
888c3f51a5 Show both handle labels instead of the range label 
Now that the labels are horizontally centered with the handles,
the range label would overlap the bottom handle. So instead, delete the
range handle and show both other handles instead.

CURA-6854
 2019-10-29 14:11:09 +01:00
Nino van Hooff
3db5abbd3a Move layer slider range handle label to below the vertical center 
CURA-6854
 2019-10-29 13:39:52 +01:00
Nino van Hooff
ba766c3a19 Move lower layer slider handle label to the bottom 
CURA-6854
 2019-10-29 13:23:43 +01:00
Nino van Hooff
e152529b5e Increase layer slider margins to accomodate labels 
CURA-6854
 2019-10-29 13:03:53 +01:00
Nino van Hooff
5ebdae9f1a Move upper layer slider handle label to the top 
CURA-6854
 2019-10-29 11:47:39 +01:00
Nino van Hooff
d59a343b3f Update simulation slider handle position after width change 
CURA-6874
 2019-10-28 09:59:30 +01:00
Nino van Hooff
9430d05cac WIP: center path slider between view controls and action panel 
CURA-6874
 2019-10-25 15:06:33 +02:00
ninovanhooff
9beea85482
Merge pull request #6566 from Ultimaker/CURA-6858_increase_sdk_ver_7_0 
Change SDK version to 7.0.0
 2019-10-23 11:54:49 +02:00
Nino van Hooff
c62ff262ed Change SDK version to 7.0.0 
CURA-6858
 2019-10-21 14:51:34 +02:00
Jaime van Kessel
9d931d8d2b
Remove stray print statement 
CURA-6853
 2019-10-21 14:24:52 +02:00
Nino van Hooff
664ed4a6a6 Take a more generic approach to safe areas for the SimulationView 
Re-implements layer slider positioning

CURA-6853
 2019-10-17 12:52:30 +02:00
Nino van Hooff
87bbf32597 Rename is_simulation_playing 
CURA-6853
 2019-10-09 16:53:19 +02:00
Nino van Hooff
4148f56d2b Remove external dependency from SimulationViewMainComponent 
Previously, panelTop had to be defined externally whenever
SimulationViewMainComponent was used. I renamed it and set a default
so the binding by a parent is optional.

CURA-6853
 2019-10-09 16:51:28 +02:00
Nino van Hooff
f090450bba Fix pixel-position of layer slider after the window was resized. 
CURA-6853
 2019-10-07 16:27:25 +02:00
Nino van Hooff
5bb23e4c6f Make the height of the layer slider dynamic 
Prevents the action panel from overlapping the layer slider

CURA-6853
 2019-10-07 15:40:42 +02:00
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