Commit graph

7424 commits

Author SHA1 Message Date
Tim Kuipers
c755479b1b Merge branch 'feature_firmware_travel_settings' 2016-07-12 11:22:32 +02:00
fieldOfView
615cfae465 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-12 10:54:07 +02:00
fieldOfView
ae4beeb0ed Remove container stack and user profile for extruders when removing a printer
CURA-1896
2016-07-12 10:53:50 +02:00
Jaime van Kessel
b5aa7c3545 Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion
CURA-1876 & CURA-1768
2016-07-12 10:34:58 +02:00
Johan K
d31516bbb1 Code cleanup
Changed to "is None" insted of "== None" to test if numpy.array was initialized
Added extruder to PathSegment in Cura.proto
Changed index_pattern to class variable in Layer.py
2016-07-12 01:32:46 +02:00
Johan K
bbd49cee85 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-12 00:37:27 +02:00
fieldOfView
a7cfe1b5af Emphasize settings that have a value in the user or quality profile
(in a subtle way)
2016-07-11 21:15:09 +02:00
fieldOfView
1b2514ae2e Fix setting the active container stack on start
When starting Cura, no nozzle, material or quality would seem to be selected. This commit makes sure _active_container_stack gets properly initialised.

I'll hijack CURA-1844 for this.
2016-07-11 18:10:25 +02:00
fieldOfView
cd09017328 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 17:26:19 +02:00
fieldOfView
151bf1f8de Make style of sections on the Materials page match sections on the profiles page
CURA-342
2016-07-11 17:25:59 +02:00
Tim Kuipers
5d256e5e59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-11 16:44:04 +02:00
Tim Kuipers
2c09fc4a67 JSON fix: infill mesh order defaults to higher than for normal meshes (CURA-833) 2016-07-11 16:43:55 +02:00
Arjen Hiemstra
5393beb8de Fix binding loop warnings that would sometimes occur when editing Brand entry
Contributes to CURA-342
2016-07-11 16:41:57 +02:00
Arjen Hiemstra
a7585a4b9a Ignore default container types when creating name filters for containers
Contributes to CURA-342
2016-07-11 16:41:57 +02:00
Aldo Hoeben
946aac5e32 Merge pull request #869 from Ultimaker/cura-1787
CURA-1787 Added message when switching to one_at_a_time.
2016-07-11 16:39:41 +02:00
Ghostkeeper
c3d395b71d
Define extruder_prime_pos_* in fdmextruder too
We need to have it in both, because it needs to be changed by the inheriting definitions (so it needs to be defined in fdmextruder) but it also needs to be defined for single-extrusion printers (so it needs to be in fdmprinter). I copied these definitions from fdmprinter.

Contributes to issue CURA-1816.
2016-07-11 16:29:39 +02:00
fieldOfView
b243dd5aec Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 15:48:51 +02:00
fieldOfView
7a63f957cb More gracefully handle cases where no profile is selected in the profiles list 2016-07-11 15:48:41 +02:00
Arjen Hiemstra
99c2e3b1d1 Ensure machine, material and quality name changes are properly handled
Contributes to CURA-342
Fixes CURA-1669
2016-07-11 15:36:26 +02:00
Jack Ha
2798b73d32 Also display build volume message _onGlobalContainerStackChanged
CURA-1787
2016-07-11 15:12:08 +02:00
Arjen Hiemstra
4d2d889604 Do not complain when currentItem is null
Contributes to CURA-342
2016-07-11 14:57:28 +02:00
Arjen Hiemstra
d6ba70c552 Do not try to set a material's metadata when we know it has not changed
Contributes to CURA-342
2016-07-11 14:57:28 +02:00
Arjen Hiemstra
57f63bfc73 Update material container's name when its "material" metadata key changes
Contributes to CURA-342
2016-07-11 14:57:28 +02:00
Arjen Hiemstra
f49528b71f Do not try to set base_file metadata if it was never set before
Contributes to CURA-341
2016-07-11 14:57:28 +02:00
fieldOfView
3bdffd83cd Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 14:54:19 +02:00
fieldOfView
4aa95ab317 Prevent showing custom profiles twice and fix separator in the profiles dropdown
CURA-1887
2016-07-11 14:54:08 +02:00
Jaime van Kessel
5638246fa2 Merge branch 'feature_cubic_isometric_infill' of github.com:Ultimaker/Cura 2016-07-11 14:40:54 +02:00
Ghostkeeper
f424097387
Improve defaults for raft settings
These better defaults and formulas are coming from Paul, one of our material testers.
2016-07-11 14:01:45 +02:00
Jack Ha
9efc2ee973 Added message when switching to one_at_a_time.
CURA-1787
2016-07-11 13:36:23 +02:00
fieldOfView
2a949237c1 Do not ask the user about keeping current settings when creating a profile from the current changes.
CURA-1885
2016-07-11 12:49:32 +02:00
Thomas-Karl Pietrowski
bea67f0536 CURA-1445: Using getDurationInISOFormat in SliceInfo
I think this is the way YouMagine expects the data to be sent.
2016-07-11 12:10:03 +02:00
Arjen Hiemstra
898c621b6f Recreate editingFinished signal behaviour without using TextArea::editingFinished
Apparently, editingFinished was only added in Qt 5.6, so we cannot use
it. So we have to manually recreate the behaviour.

Contributes to CURA-342
2016-07-11 11:36:21 +02:00
Jack Ha
0745b3bbf5 Unbreak LayerView.
CURA-1381
2016-07-11 10:29:21 +02:00
Simon Edwards
f52f713694 Tightended up the signals associated with the extruders. Bug fixed.
CURA-1585 Profile dropdown options non functional.
2016-07-11 09:37:59 +02:00
Jaime van Kessel
b48db45a37 Merge pull request #859 from thopiekar/master-CURA-1831-newer
[CURA-1831] Adding only the basic workaround for OSX
2016-07-11 09:22:08 +02:00
Ghostkeeper
6fbac2f7ee Better fallbacks if MachineInstance missing profiles
They now fallback to "empty" so that it can still construct a valid
instance, albeit with a missing profile (such as material), if some
profile is missing from the original machine instance file.

Contributes to issue CURA-844.
2016-07-11 00:49:18 +02:00
fieldOfView
c01b7091c8 Wait until the nozzle temperature is reached before starting to print
CURA-1794
2016-07-09 18:14:16 +02:00
fieldOfView
f30bfafd4d Select a material for the extruder that is intended for the correct machine
CURA-1878
2016-07-09 15:35:55 +02:00
Thomas-Karl Pietrowski
a854554d94 CURA-1831: Adding only the basic workaround for OSX 2016-07-08 16:56:12 +02:00
Jaime van Kessel
25d13969ee Filename is now correctly set for 3mf
CURA-1622
2016-07-08 15:58:33 +02:00
Jaime van Kessel
1d2f7b3c36 Added logging to indicate reload all failed
CURA-1622
2016-07-08 15:54:39 +02:00
Jaime van Kessel
d2ad1ad153 Added more logging 2016-07-08 15:52:31 +02:00
Jaime van Kessel
8a4ea5c710 Added warnings to top/bottom thickness if it exceeds machine height
CURA-1706
2016-07-08 15:26:41 +02:00
Jaime van Kessel
19933cb4e7 Improved robustness of Platform physics by checking if the hulls are calculated before trying to intersect them.
fixes CURA-1827
2016-07-08 15:17:28 +02:00
Jaime van Kessel
1ced206c5d Codestyle 2016-07-08 14:12:44 +02:00
Jaime van Kessel
b6e4bcb58f Updated documentation
CURA-537
2016-07-08 13:37:09 +02:00
Jaime van Kessel
31f97e0f61 Another set of fixes due to merge issues 2016-07-08 13:33:09 +02:00
Jaime van Kessel
6e7c263557 Improved logging 2016-07-08 13:31:54 +02:00
Jaime van Kessel
91a3e90dfe Merge branch 'feature_ux_dialogs' of github.com:Ultimaker/Cura 2016-07-08 13:23:44 +02:00
Jaime van Kessel
27d47b5c9c Fixes some issues due to merge 2016-07-08 13:22:40 +02:00