GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 00:59:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,235 Commits 292 Branches 265 Tags
Commit Graph

4235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
cab1dc7a13 Fix merge mistake 2016-07-28 12:35:36 +02:00
Jaime van Kessel
c6d1caaf0f Convex hull is no longer needlessly re-calculated 
CURA-2002
 2016-07-28 11:47:56 +02:00
Jaime van Kessel
b663fa2824 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-28 09:28:08 +02:00
Jaime van Kessel
1147e915c1 Setting a instance to the same state no longer causes display to break 
CURA-1985
 2016-07-28 09:27:20 +02:00
Jack Ha
dc6d415cf5 Disabled duplicate material, because it has a lot of issues. 
CURA-1969.
 2016-07-28 09:13:35 +02:00
fieldOfView
329a3dce00 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-28 07:49:16 +02:00
fieldOfView
b9857a6975 Partially solve setting the UMO heated bed kit option 
CURA-580
 2016-07-28 07:48:23 +02:00
Thomas Karl Pietrowski
5f540a7a78 Revert "Revert "Clean up __init__"" 
This reverts commit d99827109ab836963d523322ef00b0e6cf9675bd.
 2016-07-27 21:22:30 +02:00
Thomas Karl Pietrowski
d99827109a Revert "Clean up __init__" 
This reverts commit 44c64c4ac766fc7e085d338cb1f21c949851c9ba.
 2016-07-27 21:22:16 +02:00
Thomas Karl Pietrowski
9f280717d8 Clean up __init__ 2016-07-27 21:22:08 +02:00
Thomas Karl Pietrowski
b699efa55e Revert "Clean up __init__" 
This reverts commit 44c64c4ac766fc7e085d338cb1f21c949851c9ba.
 2016-07-27 21:20:55 +02:00
Thomas Karl Pietrowski
44c64c4ac7 Clean up __init__ 2016-07-27 21:14:21 +02:00
Thomas Karl Pietrowski
c7956542c4 CURA-1923: Rename SliceInfoThread to SliceInfoJob 2016-07-27 20:39:55 +02:00
Thomas Karl Pietrowski
dd9220068e CURA-1923: Using super.__init__() 2016-07-27 20:34:52 +02:00
Thomas Karl Pietrowski
7581aded7a CURA-1923: Remove tracking of jobs 
Like suggested by @awhiemstra.

Contributes to CURA-1923
 2016-07-27 20:32:44 +02:00
Thomas Karl Pietrowski
d4861ee626 CURA-1223: Checking whether the bounding box is correct 
Adds an additional check, like suggested by @awhiemstra.

Contributes to CURA-1223
 2016-07-27 20:21:35 +02:00
Thomas Karl Pietrowski
4dbe895c15 3MF_Reader: Optionally use cElementTree 
This should make reading the XML faster
 2016-07-27 20:16:12 +02:00
Arjen Hiemstra
7971ffdc08 Properly ignore Arcus debug messages 2016-07-27 18:03:20 +02:00
Arjen Hiemstra
823ab61cc5 Tweak convex hull node and transparent object shader 
Now we render at least a vague hint at lighting instead of nothing at
all.
 2016-07-27 18:03:20 +02:00
Ghostkeeper
6af0f28f32
Only show draft shield height if draft shield enabled 
We must've missed that one previously.

Contributes to issue CURA-1295.
 2016-07-27 17:50:34 +02:00
Jack Ha
bac3f73e6d Check ConvexHullHead vs ConvexHullHead collision. CURA-1776 2016-07-27 17:42:15 +02:00
Tim Kuipers
d1f4fadbfc Merge branch 'master' into feature_support_bottoms 2016-07-27 17:40:36 +02:00
Tim Kuipers
cd26794155 JSON fix: retrieve globalish support settings from support extruder (CURA-2003) 2016-07-27 17:27:57 +02:00
Jaime van Kessel
b29ff7feeb Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 14:14:35 +02:00
Jaime van Kessel
afed6eed93 Print montior also handles wait_for_cleanup correctly now 2016-07-27 14:14:13 +02:00
Jack Ha
4175e51dbb Corrected gantry height for ultimaker2.json (extended and go inherit). 
CURA-1979

Made same change in resources/definitions/ultimaker2.def.json as in
the original resources/machines/ultimaker2.json
 2016-07-27 14:10:01 +02:00
Tim Kuipers
358a48dfbb JSON fix: support_bottom_height now warns if below support_bottom_stair_step_dist (CURA-1013) 2016-07-27 12:14:25 +02:00
Tim Kuipers
b9b9a15f72 Merge branch 'master' into feature_support_bottoms 2016-07-27 11:18:02 +02:00
Simon Edwards
1e2147522d Increase the size of the backend log. 
Contributes to CURA-1509 Cura in slicing loop, Arcus Error (8)
 2016-07-27 11:03:11 +02:00
Ghostkeeper
5da3cd34e9
Improve inheritance function for speed_travel_layer_0 
This makes the speed_travel_layer_0 by default have the same ratio to the parent print speed as the travel speed has on other layers.
 2016-07-27 10:56:13 +02:00
Tim Kuipers
17b455d2ed JSON rename: Support Roof ==> Support Interface (CURA-1013) 
the support roof settings are now used for support bottoms as well
 2016-07-27 10:34:41 +02:00
Tim Kuipers
f4698c7cd4 feat: support_bottom_height and support_interface_height (CURA-1013) 2016-07-27 10:18:19 +02:00
Jaime van Kessel
32c5c1ad7a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-27 09:54:47 +02:00
Jaime van Kessel
762ea15e78 Global inherited settings now use target (instead of active) stack to copy values 
Fixes multiple issues with support settings not being updated properly
 2016-07-27 09:54:02 +02:00
Thomas Karl Pietrowski
d96ce760f8 CURA-1223: 3MFReader: Doing selftest and fail on broken files 
This commit adds a selftest before the "result" gets returned.
It should break on this/these functions and popup a message about using
the online repair tool.
I compared the content of both files for a long time, googled about the
format, but wasn't able to find a proper fix.
More routines will likely need to be added here, but with those I have
it is working so far very well.

Sadly it is not possible to override the default message, so two
messages will appear. Additionally, the URL of the link is not
clickable/executable from the UX. Just acting like normal text.

Contributes to CURA-1223
 2016-07-26 20:21:00 +02:00
Thomas Karl Pietrowski
260b682864 CURA-1923: Slicinfo: Using UM.Job instead 
As suggested by @awhiemstra handling our "thread" here should be done
with UM.Job.
 2016-07-26 18:56:57 +02:00
fieldOfView
35107742d6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 18:55:59 +02:00
fieldOfView
d64eff9947 Fix updating the Per Object Settings color swatch 
CURA-1971
 2016-07-26 18:54:55 +02:00
Thomas Karl Pietrowski
7ab0332a6d Merge branch 'master' of https://github.com/Ultimaker/Cura.git into master-CURA-1923 2016-07-26 18:38:23 +02:00
Thomas Karl Pietrowski
36f4f51804 Adding missing return 
Without the function would be still progressed of course.
 2016-07-26 18:25:54 +02:00
Jaime van Kessel
b3f0c257e4 Flattend profiles are now set to dirty 
This fixes issue where profiles used in g-code writer were saved
 2016-07-26 13:37:28 +02:00
Jaime van Kessel
05b2c147e0 Combined material & hotend message 
Even if all data is different, the update is correctly handled

CURA-1909
 2016-07-26 13:28:53 +02:00
Jaime van Kessel
beca64a5c2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-26 12:10:58 +02:00
Jaime van Kessel
8540e10469 Updating multiple materials with one message box now works 
CURA-1909
 2016-07-26 12:10:25 +02:00
fieldOfView
336dd406b1 Add a reusable mechanism for plugins to add controls to designated areas in the GUI 
contributes to CURA-271
 2016-07-26 11:58:25 +02:00
Jack Ha
9fc09e5bf3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-26 11:46:26 +02:00
Jack Ha
3703ed9eb0 Fix overlapping object with raft/brim/skirt in one-at-a-time mode. 
head_and_fans is extended by an extra margin to prevent overlapping.
CURA-1776

Also fixed: showing one-at-a-time head convex at start.
 2016-07-26 11:45:06 +02:00
fieldOfView
ac4b6c092f Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-26 10:17:05 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
Thomas Karl Pietrowski
8597b5c9be CURA-1923: SliceInfo: Sending data threaded 
The idea is to make the sending process, so it won't block the UI until the data is sent or the timeout has reached.
This commit does the following:
* Increasing the timeout to 5s
-> As we are sending our data threaded now this won't hurt. At least for clients in slow networks.
* Moving section for "sending data to info_url" into a seperate thread.
* Starting the thread instead and collecting all threads in a list
* Removing all threads from the list, if they have already finished their work.
* When the SliceInfo Extension gets __del__'d, it will wait for the threads until they finish.

Contributes to CURA-1923
 2016-07-25 22:25:26 +02:00