alekseisasin
2a302a3e27
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
2017-09-28 13:24:13 +02:00
alekseisasin
5402092bb4
During adding a new printer the printer name generated from default name and not from custom name (changed by user)
...
CURA-4345
2017-09-28 13:22:15 +02:00
Diego Prado Gesto
e3edc79a3e
modified some code to fix the multiple extrusion issues - CURA-4379
2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5
Changing AGPLv3 to LGPLv3
2017-09-28 13:00:43 +02:00
Diego Prado Gesto
568535e3e2
Adapting the code in case a multiextruder printer will use only one extruder - CURA-4359
2017-09-26 17:49:53 +02:00
Diego Prado Gesto
b82309fb6a
Merge branch 'custom_profiles' into 3.0
2017-09-25 15:52:31 +02:00
Diego Prado Gesto
2ae1700a15
Solved the issue with the slider that was no showing in gray the unavailable profiles - CURA-4327
2017-09-25 14:43:29 +02:00
Diego Prado Gesto
c22928f5d1
Change behavior when there is no suitable item - CURA-4327
2017-09-25 08:43:57 +02:00
Diego Prado Gesto
cf94c8d37d
Working on fixing several issues with profiles - CURA-4327
2017-09-22 14:47:20 +02:00
Ghostkeeper
c02c2201e2
Merge branch '3.0'
2017-09-22 12:58:40 +02:00
Ghostkeeper
2020e355a2
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
...
Contributes to issue CURA-4357.
2017-09-22 12:58:20 +02:00
Ghostkeeper
261089eed3
Fix type hinting imports
...
Because circular imports. I hate our current import technique...
Contributes to issue CURA-4357.
2017-09-22 11:53:10 +02:00
Ghostkeeper
3d921c1b4e
Add type hinting of return values
...
I thought this might help find some bugs there.
Contributes to issue CURA-4357.
2017-09-22 11:30:35 +02:00
Diego Prado Gesto
4d113a746c
Merge changes
2017-09-22 11:29:29 +02:00
Diego Prado Gesto
37da9f654b
Reverted changes done that makes sliders fail - CURA-4327
2017-09-22 11:20:57 +02:00
Ghostkeeper
1596437bbd
getActiveGlobalAndContainerStacks may return None
...
Change the code to reflect on this. Mostly this is to fix up the type warnings, because we were already checking for there being no global container stack but that was not thread-safe.
Contributes to issue CURA-4357.
2017-09-22 11:17:42 +02:00
Ghostkeeper
88155d35e8
Correct signature of activeMachine
...
Because there isn't always a global container stack.
Contributes to issue CURA-4357.
2017-09-22 11:11:34 +02:00
Ghostkeeper
12ccc8abe0
Merge branch '3.0'
2017-09-22 09:55:05 +02:00
ChrisTerBeke
ab8bcc4ae3
small code fixes
2017-09-22 09:51:59 +02:00
ChrisTerBeke
fd41f3d17f
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-21 17:35:19 +02:00
ChrisTerBeke
ecafa24888
code cleanup
2017-09-21 17:35:12 +02:00
Diego Prado Gesto
e73e218c4e
Detecting whether the profile is created for multiple extrusion printers or not - CURA-4327
2017-09-21 16:28:50 +02:00
Ghostkeeper
382fcdb4fe
Better title for export succeeded message
2017-09-21 12:54:04 +02:00
Diego Prado Gesto
4d99fb067f
After disconnect a signal, now is reconnected the correct one - CURA-4327
2017-09-20 17:19:44 +02:00
Diego Prado Gesto
ebd180bfdc
Custom profiles are now shown in the preference panel - CURA-4327
2017-09-20 08:50:58 +02:00
Ghostkeeper
2901b832a5
Sync setting visibility with XmlMaterialProfile
...
This is why we shouldn't do double-data.
2017-09-18 09:00:39 +02:00
Lipu Fei
84ad9c6ad1
Add "available" flag for quality profiles
...
CURA-4182
Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
2017-09-13 16:40:59 +02:00
alekseisasin
204019702d
Added Title for messages
...
CURA-4203
2017-09-13 13:58:08 +02:00
Lipu Fei
0eb63637d4
Merge branch 'master' into feature_dark_colours_icons
2017-08-28 16:54:36 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7'
2017-08-28 16:21:40 +02:00
Lipu Fei
b84500f742
Import Application instead of inline import CuraApplication
...
CURA-4186
2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7
Fix code style: double quotes instead of single quotes
...
CURA-4186
2017-08-28 14:34:53 +02:00
Lipu Fei
3fbdb27e8e
Merge branch 'master' into feature_dark_colours_icons
...
CURA-4148
Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported
...
So I added a function that checks the support on all extruders and the global stack.
Contributes to issue CURA-4148.
2017-08-25 14:27:45 +02:00
Lipu Fei
141aad5513
Trigger to re-evaluate default settings in per-object settings when the active stack gets changed.
...
CURA-4186
Trigger signals to re-evaluate default settings in pre-object settings
when the active stack gets changed. Otherwise the values won't be
updated directly.
2017-08-25 12:48:47 +02:00
Lipu Fei
a320784a6d
For a per-object setting, use the user-defined value first
...
CURA-4186
In a per-object setting, if there is user defined value, use that first.
If the value is default, then evaluate it with the normal routine.
2017-08-25 12:19:05 +02:00
Lipu Fei
c44e527305
Remove warning in /PerObjectContainerStack
...
CURA-4186
2017-08-25 11:57:52 +02:00
Lipu Fei
50a7e8146f
Add a dedicated stack class for per-object settings
...
CURA-4186
Add a dedicated stack class PerObjectContainerStack for per-object
settings to evaluate limit_to_extruder values correctly.
2017-08-24 17:09:28 +02:00
Lipu Fei
365379f735
Add missing context in getProperty() in global and extruder stacks
...
CURA-4186
All getProperty() calls should use the provided context.
2017-08-24 17:01:03 +02:00
Lipu Fei
759d44dbef
Add stack context for function evaluation
...
CURA-4186
2017-08-23 14:39:08 +02:00
fieldOfView
32a863d9dc
Find a material with the correct diameter when adding a printer
2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1
Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura
2017-08-23 11:11:45 +02:00
alekseisasin
9363f93467
Merge pull request #2224 from fieldOfView/fix_multiextruder_menus
...
Fix multiextruder menus
2017-08-23 09:08:48 +02:00
fieldOfView
43c6801e58
Find a material with the correct diameter when adding a printer
2017-08-20 16:52:56 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7'
2017-08-18 10:42:14 +02:00
Lipu Fei
b20711ef7c
Remove incorrect maximum extruder count check
...
CURA-4188
2017-08-17 16:36:57 +02:00
Lipu Fei
9aa65eab44
Merge branch '2.7'
2017-08-15 14:43:36 +02:00
Lipu Fei
e67286c0d8
Do not add extruder stacks for single-extrusion machines
...
CURA-4167
In the current architecture, single-extrusion machines don't have
extruder stacks.
2017-08-15 14:19:23 +02:00
alekseisasin
bc4b1d9c4d
Merge remote-tracking branch 'origin/2.7'
2017-08-14 15:11:33 +02:00
Ghostkeeper
3316f3aa13
Add warning contexts to not translate XML tags
...
This went wrong a few times with previous translations. Let's hope that this prevents it from happening again.
Contributes to issue CURA-4113.
2017-08-14 14:06:20 +02:00
