203 Commits

Author SHA1 Message Date
Nino van Hooff
c6e6c76962 Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/Account.py
#	plugins/SimulationView/SimulationView.py
2020-05-15 13:38:37 +02:00
Nino van Hooff
58e43c0a07 Convert doxygen to rst for SentryLogger, SimulationView, SliceInfo,
SolidView
2020-05-15 13:34:58 +02:00
Remco Burema
23cdf871c1
Add comments: Why a matrix4x4 and not a sampler1d?
part of CURA-7426
2020-05-07 18:55:55 +02:00
Kostas Karmas
6ffd250965 Format spacing
CURA-7426
2020-05-07 14:10:45 +02:00
Remco Burema
99e99e4650
Layerview can now deal with visibility extruder nrs. 4+
part of CURA-7426
2020-05-06 18:03:32 +02:00
Nino van Hooff
7302e8ba7f Update missed sdk versions from 7.1 to 7.2.0 for Cura 4.6
CURA-7383
2020-04-21 11:46:12 +02:00
Ghostkeeper
a1438e91d0
Merge branch '4.5'
Conflicts:
	cura_app.py -> Due to moving some imports around.
2020-02-25 12:07:47 +01:00
Nino van Hooff
d762ad4acc
Merge pull request #7156 from Ultimaker/CURA-7231_no_layers_to_show_msg
Cura 7231 no layers to show msg
2020-02-25 09:42:23 +01:00
Jaime van Kessel
239a8ea3db
Revert speedup 2020-02-24 13:07:59 +01:00
Jaime van Kessel
b86658996b
Revert "Chop up the render function to make it a bit more readable"
This reverts commit 61a605d02be0d0f34893fa5d544111a3b0d49132.
2020-02-24 12:45:13 +01:00
konskarm
069384e588
Merge pull request #7152 from Ultimaker/CURA-7231_no_layers_to_show_msg
Cura 7231 no layers to show msg
2020-02-24 12:02:06 +01:00
Tim Kuipers
c1d87fa474 Pop-up checkbox to never show [No layers to show] ever again, because the user ain't no noob
CURA-7231
2020-02-21 15:07:57 +01:00
Tim Kuipers
0a10a1220f Don't show 'no layer data' msg when Slice Automatically is enabled
CURA-7231
2020-02-21 15:07:26 +01:00
Remco Burema
b0418716fd
Rename 'Feedrate' to 'Speed'.
At least in the interface. Even though Feedrate is congruent with the CNCdefinition thereof, Speed is less confusing for the user.
2020-02-11 13:03:27 +01:00
Ghostkeeper
6f707f3149
Bump SDK version number of Cura 4.5 to 7.1
We've added new things to our API. This allows plug-in developers to use them.

Contributes to issue CURA-7205.
2020-02-10 10:45:07 +01:00
Ghostkeeper
5a7ec98f1e
Slightly improve wording
'Layer data' is a bit technical.
2020-02-04 14:14:23 +01:00
Ghostkeeper
2c28f70016
Add warning if you haven't sliced before going to layer view
Done as a 5 minute fix.

Fixes #7044.
2020-02-03 11:22:22 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Jaime van Kessel
043ef2e84f
Fix crash when layer does not exist 2020-01-06 10:47:47 +01:00
Jaime van Kessel
3ffbdf2888
Ensure that after a reslice the nozzle location of re-slice is still correct 2020-01-03 11:28:29 +01:00
Jaime van Kessel
61a605d02b
Chop up the render function to make it a bit more readable 2020-01-02 13:34:57 +01:00
Jaime van Kessel
0d7421140f
Recalculate the start / end elements when the layer is changed instead of on render
About with larger models, about 30-40% of the time of the render was spent on this.
2020-01-02 13:28:14 +01:00
Remco Burema
1915100118
Fix: Layersliders work again. 2019-12-31 16:48:50 +01:00
Remco Burema
cb361e9543
Force sim-view to update after view-type change. 2019-12-31 16:14:02 +01:00
Nino van Hooff
c31c1dd6fb Refactor: simplify SimulationSliderLabel font metrics 2019-11-12 14:56:56 +01:00
Nino van Hooff
27b4e9a063 Refactor: simplify SimulationSliderLabel width 2019-11-12 14:55:00 +01:00
Nino van Hooff
f4b9c0fdd4 Fix SimulationSliderLabel width 2019-11-12 14:52:11 +01:00
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