fieldOfView
bec897843d
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-01 17:24:06 +01:00
fieldOfView
f8681ed401
Use Open Sans font instead of Proxima Nova
...
Also removes unused Roboto font
Contributes to CURA-953
2016-03-01 17:22:25 +01:00
Jaime van Kessel
9c5e169f2b
Loaded profiles are now marked as dirty so they are saved correctly
...
CURA-936
2016-03-01 16:24:43 +01:00
Jaime van Kessel
e90fd95495
Profile importing now checks if it's the right file type
...
Contributes to CURA-936
2016-03-01 15:16:50 +01:00
Ghostkeeper
d27d4df8ff
Move file open queue handling later
...
At the point where the file open queue was processed, the events weren't handled yet. Here's to hoping that they will be handled at this point (but I must commit before testing...).
Contributes to issue CURA-730.
2016-03-01 13:35:46 +01:00
Ghostkeeper
232713a019
Catch file open events before file loaders are loaded
...
The event is essentially delayed. The filename is put in a list by the event handler. The list of files is then loaded after all plug-ins are loaded.
Contributes to issue CURA-730.
2016-03-01 13:17:15 +01:00
Tim Kuipers
7b9ecd4aba
Revert "Make conical support invisible by default"
...
This reverts commit d54b24ac86439fe9ae9d9915e70848e66dec99fb.
2016-03-01 12:16:55 +01:00
Jaime van Kessel
a72180ebf2
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-01 11:35:28 +01:00
Jaime van Kessel
e3a12919f0
Slightly increased size of head for um2+
...
Discussed this with HW department, size of um2+ head is slightly bigger.
CURA-900
2016-03-01 11:34:36 +01:00
Ghostkeeper
5a3e67238e
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-01 11:23:39 +01:00
Ghostkeeper
935596d603
Add log entry when opening a file via Qt event
...
This helps debugging CURA-730, and might also help debugging similar issues in the future. It's a user-triggered event so this warrants an info-level log entry.
Contributes to issue CURA-730.
2016-03-01 11:23:20 +01:00
Jaime van Kessel
f05eaf6d9c
Too high objects (in one at a time) are now greyed out
...
CURA-972
2016-03-01 11:04:59 +01:00
Jaime van Kessel
41d00af345
Moved timer back again, as arjen fixed the real issue
2016-03-01 10:57:29 +01:00
Jaime van Kessel
7ca3c39ec0
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-01 10:41:04 +01:00
Jaime van Kessel
ff3bca19ac
Renamed getdefaultsavepath
2016-03-01 10:40:35 +01:00
fieldOfView
51ad894711
Properly disable Per Object Settings toolbutton on first start
...
On an empty profile, the cura/active_mode preference is not set so the code disabling the button was not called.
Fixes CURA-901
2016-03-01 10:34:00 +01:00
Jaime van Kessel
7985a961c4
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-01 09:31:05 +01:00
Jaime van Kessel
fa59416dc4
Added warning to logging if no one at a time print is possible
...
CURA-972
2016-03-01 09:30:33 +01:00
Arjen Hiemstra
3afd3f2209
Use the right style for the layer view slider and add a busy indicator to the current layer field
...
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
363fb0c4dd
Remove layer view slider style from Cura theme's style file
...
Since it is a plugin, it should not be in the main theme.
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
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