Commit graph

3049 commits

Author SHA1 Message Date
Arjen Hiemstra
110c3fa754 Do not react to all Scene changes in LayerView but just childrenChanged
When the layer data is updated, a new node is attached to the scene
root. We can thus watch for only children changes since everything else
can be ignored.

Contributes to CURA-938
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
f2d98cfba3 Do not show a message when processing top layers but rather leave it up to QML
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
c684e96ef1 Expose the new busy property to QML
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
e0afc1535a Add a busy property to LayerView that indicates whether we are currently building top layers
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Tim Kuipers
98693e7a80 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-02-29 17:54:16 +01:00
Tim Kuipers
804af3cdda JSON: fix global_only problems (CURA-458)
draft shield, support, coasting, auto temp, combing, platform adhesion, speed slowdown layers, travel speed
2016-02-29 17:41:19 +01:00
Tim Kuipers
451e3bd377 JSON: fix more dual extrusion global_only (CURA-458) 2016-02-29 17:39:37 +01:00
Tim Kuipers
f276dd0282 JSON: fix dual extrusion global_only (CURA-458) 2016-02-29 17:21:26 +01:00
Tim Kuipers
36f8bb5553 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 16:40:11 +01:00
Tim Kuipers
f8d7b9ddfa JSON: wall line count should be 1 for magic spiralize (CURA-961) 2016-02-29 16:14:46 +01:00
Jaime van Kessel
06afed5283 Loading files now uses home folder as default location
CURA-906
2016-02-29 16:11:48 +01:00
Jaime van Kessel
03b3c4c20a Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 15:52:29 +01:00
Jaime van Kessel
67d10ef0a2 UpdateTopLayer timer is now only triggered when max layers changes
CURA-969
2016-02-29 15:51:40 +01:00
Ghostkeeper
b9786e5208 Fix for infill overlap
Turns out it was only a distance on the master branch and should still be a percentage on 2.1. Sorry! The dependency on infill density still remains superfluous though.

Contributes to issue CURA-892.
2016-02-29 15:38:33 +01:00
Ghostkeeper
b4cda2bcf1 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 15:19:49 +01:00
Jaime van Kessel
00dcf339c8 Visibility of processing message is now correct when switching between views.
CURA-971
2016-02-29 15:11:13 +01:00
Ghostkeeper
94314a7c2c Make infill overlap depend on line width
Paul said this way was a better default for all our profiles.

Contributes to issue CURA-892.
2016-02-29 15:09:51 +01:00
Jaime van Kessel
636d6af2de Removed reference to removed profile selection 2016-02-29 14:18:00 +01:00
Jaime van Kessel
01627145bb Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 13:58:28 +01:00
Jaime van Kessel
339ee12f90 Not being able to find firmware no longer blocks GUI
Cura-440
2016-02-29 13:57:40 +01:00
fieldOfView
f0b37d71cc Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-29 11:55:29 +01:00
fieldOfView
2eb06848b5 Match UM2 with Olsson Block profiles to Paul's UM2+ PLA profiles
Contributes to CURA-91
2016-02-29 11:54:37 +01:00
Ghostkeeper
d54b24ac86 Make conical support invisible by default
It is considered an 'expert setting' since it is fairly experimental.

Contributes to issue CURA-942.
2016-02-29 10:43:25 +01:00
Arjen Hiemstra
257242b783 Use a map of colours rather than big if statement to get the layer color
The entire if-else tree turned out to be quite slow. Using a dict is a
lot faster.

Contributes to CURA-708
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
9e4f1539e0 Do not center the layer data but instead move the node it is attached to
Since all the layer data is offset by the same amount, we can simply
move the node, which saves us some processing when adding layers.

Contributes to CURA-708
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
4573a233e9 Do not use insert to insert the Y height in the Layer data
Numpy's insert turns out to be slower than creating a new array and
manually copying values.

Contributes to CURA-708
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
220146b0a9 Also trigger an update of the top layers when recalculating the layer count
Contributes to CURA-938
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
f37b422ccb Display a message when processing the top layers takes a long time
Contributes to CURA-957
2016-02-29 08:57:23 +01:00
Ghostkeeper
864851f8ba Fix open-with-Cura on Ubuntu
Contributes to issue CURA-730.
2016-02-26 12:11:02 +01:00
Ghostkeeper
c1385f5e4a Merge pull request #643 from guigashm/master
prusa i3 filament diameter to 1.75
Conflicts:
	resources/machines/prusa_i3_xl.json
2016-02-26 10:55:10 +01:00
Ghostkeeper
f125acd9c7 Merge pull request #643 from guigashm/master
prusa i3 filament diameter to 1.75
2016-02-26 10:39:59 +01:00
guigas
614a52425d filament diameter to 1.75
filament diameter to 1.75
2016-02-25 16:03:19 +00:00
fieldOfView
bbd77ee998 Revert "Fix Per Object Settings toolbutton enabled state on startup"
This reverts commit 8d7df76aa1.

Contributes to CURA-901
2016-02-25 16:31:53 +01:00
fieldOfView
b5c90d67d0 Remove deprecated use of theme sizes from UM2 upgrades wizard
CURA-91
2016-02-25 11:35:21 +01:00
fieldOfView
d172a98ae4 Fix consistency in profile names ("Fast Print" vs "Fast Prints") to match Paul's new profiles
CURA-892
2016-02-25 11:34:14 +01:00
fieldOfView
b77f51c02e Renamed abs and cpe profiles to match Paul's new pla profiles
Also renamed Ultimaker2+Olsson profiles to match

Contributes to CURA-892
2016-02-25 11:10:42 +01:00
fieldOfView
8d7df76aa1 Fix Per Object Settings toolbutton enabled state on startup
Contributes to CURA-901
2016-02-25 09:40:12 +01:00
Jaime van Kessel
122ec7c3a3 Merge pull request #642 from guigashm/master
add prusa I3 XL  machine profile and STL
2016-02-25 09:35:40 +01:00
guigas
bcfc20014e add prusa I3 XL machine profile and STL
add prusa I3 XL  machine profile and STL
2016-02-24 21:05:14 +00:00
Arjen Hiemstra
abe184ebff Do not display backend error messages for a few known error types
ConnectionReset is already handled, as is BindFailed and Debug should
never result in an error.

Contributes to CURA-813
2016-02-24 17:28:31 +01:00
Ghostkeeper
64aa977696 Properly update global_only on profile switch
In the setting override model for per-object settings now gets its global_only property also updated on a profile switch. This is needed because the settings also change during a profile switch but the change event is not triggered.

Contributes to issue CURA-458.
2016-02-24 13:05:52 +01:00
Jaime van Kessel
dc1ee1d73b Merge pull request #636 from Ultimaker/feature_um2upgrades
Support UM2 with Olsson block
2016-02-24 12:07:35 +01:00
fieldOfView
390dc7e2c6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-24 00:15:22 +01:00
fieldOfView
de28561152 Remove Profiles from Per Object Settings panel
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
2016-02-24 00:14:54 +01:00
Arjen Hiemstra
a60bfa3d32 Perform creation of top solid layers in a background thread
This way we have a much more responsive layer view
2016-02-23 17:53:51 +01:00
Ghostkeeper
b9bc14ea09 Make progress bar determinate when at 100%
This gives the user a better indication that the firmware update is done. The progress bar is still sorta disfunctional, but hey even disabled people are people.

Contributes to issue CURA-440.
2016-02-23 17:27:17 +01:00
Ghostkeeper
abed3d8c7d Make firmware update loading bar indeterminate
There is no real progress to report, so it's actually indeterminate.

Contributes to issue CURA-440.
2016-02-23 17:27:17 +01:00
Ghostkeeper
c41b9fb09a UMO firmware update to detect heated bed
It detects it by virtue of whether the user indicated that the printer has a heated bed during the add printer wizard.

Contributes to issue CURA-440.
2016-02-23 17:27:17 +01:00
Ghostkeeper
ba39864af2 Add new PLA profiles
These were designed through rigorous testing by the test team.

Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Ghostkeeper
9233813768 Remove override settings from UM2+ machine settings
A lot of these settings were just normal tweaks, such as speed, which should be set in the profiles rather than the machine definition.

Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00