3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 10:47:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
7424 commits 302 branches 270 tags 773 MiB
Commit graph

7424 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
b25b92a81b Don't allow spaces, commas and other illegal chars in the address 
CURA-2384
 2016-09-29 14:46:31 +02:00
Jaime van Kessel
cd265c1136 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:45:16 +02:00
Jaime van Kessel
d4bb0d4a0b Only use profile reader if extension matches with filename 
CURA-2462
 2016-09-29 14:44:34 +02:00
fieldOfView
ea9ba87fa4 Only allow connecting if the printer has responded to API query 
CURA-2483
 2016-09-29 14:29:33 +02:00
Jack Ha
8934555bd6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 14:09:54 +02:00
Jack Ha
03c66e6e62 use resolveOrValue for adhesion_type. contributes to CURA-2232 2016-09-29 14:09:19 +02:00
Jaime van Kessel
3d8336449f Fixed renaming of quality_changes 
CURA-2479
 2016-09-29 14:07:52 +02:00
Jaime van Kessel
6b323dff01 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 13:56:40 +02:00
Jaime van Kessel
02232f7ca6 Added loging if we could not find profile to rename 
CURA-2479
 2016-09-29 13:56:14 +02:00
fieldOfView
39a005d7e5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-29 13:48:42 +02:00
fieldOfView
040f49e474 Fix cases where there is no "normal" quality 
CURA-2494
 2016-09-29 13:48:23 +02:00
Ghostkeeper
7d57e90260
Remove debug statements 
Oops.

Contributes to issue CURA-844.
 2016-09-29 13:24:15 +02:00
Ghostkeeper
4ab7ea5c0f
Account for support offset in disallowed border 
It is similar to travel avoid distance.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Ghostkeeper
47b9fbc447
Add helper function for getting setting from support extruder 
This splits up the helper function we already had, to prevent code duplication.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Ghostkeeper
d8fe9462dd
Remove property-parameter from calls where it is 'value' 
That is the default value for the argument anyway. Makes the code more legible.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Ghostkeeper
2e3937dd56
Rename _getSettingProperty to _getSettingFromAdhesionExtruder 
This opens up the way for other methods to get settings from different extruders.

Contributes to issue CURA-2407.
 2016-09-29 12:47:10 +02:00
Simon Edwards
2742a4ef65 Show the correct list of qualities and quality change profiles. 
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
 2016-09-29 12:34:46 +02:00
Simon Edwards
4a85ee85c1 Update the model when something changes in the global stack. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-29 12:27:04 +02:00
Tim Kuipers
8206ecbfa8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-29 12:09:39 +02:00
Tim Kuipers
b7ca569b84 JSON fix: prime_tower_wipe_enabled is now true by default (CURA-2420) 2016-09-29 12:09:31 +02:00
fieldOfView
8f09aa8737 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-29 12:04:17 +02:00
fieldOfView
bee955327b Fix quality profile selection for printers that should use generic quality 
Fixes CURA-2489, contributes to CURA-2477
 2016-09-29 12:04:05 +02:00
Ghostkeeper
d29c817289
Actually apply translated settings 
Don't know when this changed or why it hasn't propped up until then...

Contributes to issue CURA-844.
 2016-09-29 11:56:46 +02:00
fieldOfView
a2722c7571 Get firmware version through API... 
...for parity between discovered printers and manual printers

CURA-2384
 2016-09-29 09:41:21 +02:00
Ghostkeeper
f435dcd896
Document parameters of _offsetHull 
Makes it clear that the input is a Polygon instance, not a Numpy array.

Contributes to issue CURA-2407.
 2016-09-29 09:32:43 +02:00
fieldOfView
578b4d3826 Implement Adding, Editing and Removing manual printers 
CURA-2384
 2016-09-29 08:47:29 +02:00
fieldOfView
eba49ee8c2 Always show manual printer instances, even before they are validated 
CURA-2483
 2016-09-28 23:08:23 +02:00
fieldOfView
8dd8fd740c Add UI for managing manually added printers 
CURA-2483
 2016-09-28 23:05:53 +02:00
fieldOfView
8e26d63390 Get a list of ipadresses/hosts to check for UM3 printers... 
...in case discovery does not work. This uses the API to look up info on the printer instead of relying on zeroconf.

CURA-2483
 2016-09-28 17:45:56 +02:00
Jaime van Kessel
b0c20eafbd Prime colission now blocks slicing 
CURA-2375
 2016-09-28 16:50:13 +02:00
Jaime van Kessel
78b052f66c Only start change timer if there is a global stack 2016-09-28 16:41:04 +02:00
Jack Ha
da4ea2e450 Better refresh button: now emits signal and re-instantiates zeroconf. 
Signal emits let the UI display an empty list.
Re-instantiation copes with network changes.

Contributes to CURA-2372
 2016-09-28 16:36:09 +02:00
Jaime van Kessel
dc6e4f172e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 16:03:58 +02:00
Jaime van Kessel
666cba0566 Merge branch 'master-CURA-1445' of https://github.com/thopiekar/Cura 2016-09-28 15:59:49 +02:00
Simon Edwards
062611a92a Handle the startup situation where there is no global stack. Fixed a bug where the wrong stack was used instead of the first extruder. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:56:10 +02:00
Jaime van Kessel
7b7c161d93 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-28 15:20:59 +02:00
Simon Edwards
a7c58c33f7 Fixed up the profiles menu to handle multiple extruders better. 
Contributes to CURA-2477 Profile menu should only contain valid options for all materials
 2016-09-28 15:15:18 +02:00
Jaime van Kessel
3de4d4987c Prime positions now also intersect with oneother 
CURA-2375
 2016-09-28 15:14:38 +02:00
fieldOfView
299d05fa71 Prepend extruder id to extruder quality profiles 
extruder quality profiles are not shown to the user, so the prepended extruder id is never visible. This way imported profiles behave the same way as normally created profiles.

CURA-2478
 2016-09-28 14:23:29 +02:00
fieldOfView
54d07ae29b Fix error when no machine is active 2016-09-28 14:20:58 +02:00
Jaime van Kessel
bf1cfe9e7e Importing profile now works again if profile name already existed 
CURA-2478
 2016-09-28 12:02:33 +02:00
Ghostkeeper
608c442bb9
Fix remaining merge conflict 
Must've done something wrong? No, it's they who are wrong!

Contributes to issue CURA-2407.
 2016-09-28 11:53:03 +02:00
Ghostkeeper
4fc30615ab
Remove forgotten unused function 
This function is now in the Polygon class in Uranium.

Contributes to issue CURA-2407.
 2016-09-28 11:50:38 +02:00
Ghostkeeper
777a89ce46
Don't offset border with Horizontal Expansion any more 
This is now done in the convex hull of the mesh itself.

Contributes to issue CURA-2407.
 2016-09-28 11:50:38 +02:00
Ghostkeeper
7c573e3c29
Recompute convex hull if xy_offset changes 
With room for more settings.

Contributes to issue CURA-2407.
 2016-09-28 11:48:07 +02:00
Ghostkeeper
0bcc8f9a5d
Rename _roundHull to _offsetHull 
And a few variables that had a similar name. This better reflects the new function of this method.

Contributes to issue CURA-2407.
 2016-09-28 11:48:07 +02:00
Ghostkeeper
f3afcb1b36
Document _roundHull 
The code documentation is generalised and moved to the function documentation.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
aa69c1beee
Re-use _roundHull method 
This code was duplicated.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
5f2533e8a4
Also apply horizontal expansion on normal rounding 
Might have to rename this function later.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00
Ghostkeeper
622233bfd8
Remove duplicate code for creating circle approximations 
This code is now in the Polygon class, so we can re-use it.

Contributes to issue CURA-2407.
 2016-09-28 11:48:06 +02:00