6996 Commits

Author SHA1 Message Date
Ghostkeeper
afd5df283c
Re-filter list of printers when you open the window
When you open the window of a printer that already exists, it doesn't re-create the entire window and therefore didn't re-apply the filter on machine type.

This triggers the filter to be applied again.

Contributes to issue CURA-2475.
2016-10-06 14:33:42 +02:00
fieldOfView
27a4cbbb2e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-06 14:07:17 +02:00
fieldOfView
c056d44785 Made quality profile weights consistent
draft: -2
fast: -1
normal: 0
high: 1

CURA-2549
2016-10-06 14:07:01 +02:00
Jaime van Kessel
39623ba2b8 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 13:50:18 +02:00
Jaime van Kessel
fb24e55268 _getBasicMaterial now correctly filters on variants as well
CURA-2248
2016-10-06 13:49:43 +02:00
Tim Kuipers
7e8ce98f48 JSON fix: typo (CURA-905) 2016-10-06 12:15:57 +02:00
Tim Kuipers
32f506c6e1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 12:13:54 +02:00
Tim Kuipers
e63b572417 JSON fix: fixed raft warnings flawed logic (CURA-905)
For layer_0_z_overlap we are only sure to overextrude when the overlap is more than the airgap.

Layer height warnings are now based on line widths for raft, because the line widths are way larger than the nozzle size.
2016-10-06 12:13:47 +02:00
Tim Kuipers
edd06f860a JSON fix: retractions speed warnings and raft margin warning based on likely possible testing values (CURA-905) 2016-10-06 12:11:40 +02:00
Ghostkeeper
8644fb7113
Never animate progress bars if they are invisible
This is now the responsibility of the theme rather than the interface element, since the theme defines the animation itself. This makes it that the interface element doesn't need to worry about things like its style or animation.

Contributes to issue CURA-2497.
2016-10-06 11:54:21 +02:00
Jack Ha
a39cbb735b Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 11:49:59 +02:00
Jack Ha
1fe574b351 Details of profile changes now shows changes in all stacks. CURA-2558 2016-10-06 11:49:50 +02:00
Ghostkeeper
2d41a992f1
Remove splitting profiles for each material
The material is no longer listed in the profiles and no longer filtered for, so we don't need to create a new profile for each material.

Contributes to issues CURA-844 and CURA-2320.
2016-10-06 11:41:39 +02:00
Jaime van Kessel
9389149064 Type name display is now also updated in print discovery
CURA-2475
2016-10-06 11:36:26 +02:00
Jaime van Kessel
2688928467 Revision number is no longer taken into account
CURA-2475
2016-10-06 11:30:56 +02:00
Simon Edwards
e4f60ccc34 Merge pull request #1027 from Ultimaker/profiles_revert_global_profile
Revert "global_profile" reference changes while refixing import
2016-10-06 11:05:05 +02:00
Jaime van Kessel
dadcf45f45 Added extra checks & logging to 3mf reader
CURA-382
2016-10-06 10:44:38 +02:00
Jaime van Kessel
f71b23c72a Added handling for if there is no global stack
CURA-2475
2016-10-06 09:35:31 +02:00
Arjen Hiemstra
9a0946687b Clean up styling of Changelog dialog
This prevents the button from being positioned on top of the scroll bar
and the horizontal scrollbar from showing.

Contributes to CURA-2519
2016-10-05 14:59:03 +02:00
Arjen Hiemstra
cd2cbcbd66 Only show changelog if we have a global container stack
If we have no global stack we can assume this is a "first run"
situation.

Contributes to CURA-2519
2016-10-05 14:59:03 +02:00
Jaime van Kessel
ec63d6931e Actually perform the filtering based on machine type
CURA-2475
2016-10-05 14:54:22 +02:00
Jaime van Kessel
84defb27cf Merge branch 'master' of github.com:Ultimaker/JediWifiPrintingPlugin 2016-10-05 14:32:17 +02:00
Jaime van Kessel
8cbd6443be UM3 familiy printers now set their machine type
CURA-2475
2016-10-05 14:31:41 +02:00
Jaime van Kessel
2b117c0450 Added printer type to output device
CURA-2475
2016-10-05 14:31:12 +02:00
Jaime van Kessel
f24fd5660d Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 13:49:11 +02:00
Jaime van Kessel
e582607e41 Added todo comment 2016-10-05 13:48:09 +02:00
Ghostkeeper
06a0a0b95e
Progress bar never indeterminate if invisible
Because if the progress bar is indeterminate, it triggers redraws for every frame to create the animation of the progress bar bouncing, regardless of whether it is visible or not. So now we make it indeterminate regardless of what state it is in.

Contributes to issue CURA-2497.
2016-10-05 13:35:12 +02:00
Ghostkeeper
8a5026bdb1
Revert "Early cop-out if there is no printer connected"
This reverts commit 99f53cb8322e07f1ff94195e44ecbcde0b82e841. That commit caused the progress bar to be indeterminate if the progress bar was not visible, which is semantically correct but in reality causes QML to redraw the screen constantly for the animation of the indeterminate progress bar. This was taking up CPU. Now the CPU is only taken up during the pausing and resuming states when the progress bar is visible and indeterminate, but then it is actually required.

Contributes to issue CURA-2497.
2016-10-05 13:28:53 +02:00
Ghostkeeper
6f412c0825
Improve translation context for some labels
These translations went sort of wrong in the Turkish translation, because the context was unclear. I've tried to clarify it better.

Contributes to issue CURA-570.
2016-10-05 11:39:29 +02:00
Jaime van Kessel
6e369bec57 Disabled exporting for read-only profiles
CURA-2496
2016-10-05 10:36:33 +02:00
Jaime van Kessel
448c8436dc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-05 09:40:46 +02:00
Jaime van Kessel
ad80678bc2 Gracefully handle case if no material was found
CURA-2494
2016-10-05 09:40:16 +02:00
Simon Edwards
963fac7806 Filter the list of quality changes taking into account the quality(-type) profile they depend on.
Contributes to CURA-2248 Duplicated profile not shown in the profile manager list
2016-10-05 09:32:18 +02:00
fieldOfView
029fda72e3 Fix warning when there is no current printer 2016-10-04 19:09:10 +02:00
fieldOfView
6d0da0d754 Revert "global_profile" reference changes while refixing import
CURA-2518 and CURA-2478
2016-10-04 17:21:33 +02:00
Jack Ha
e66548099a Fixed signal routing when switching between different machines. CURA-2232 2016-10-04 15:25:22 +02:00
fieldOfView
85d1fa8a39 Fix error on profiles page when there is no active machine 2016-10-04 14:51:04 +02:00
Ghostkeeper
8bd3b7ea9b
Revert "Reinitialise Zeroconf network socket upon refresh/start"
This reverts commit a31a4a1e90dd4aaf0f445abc359b3ad4c2875a86.
2016-10-04 14:50:08 +02:00
fieldOfView
77370d8599 Fix error duplicating profiles
CURA-2478
2016-10-04 14:49:56 +02:00
fieldOfView
7b42f52be9 Properly use classmethod to make sure ContainerManager is a singleton
CURA-2478
2016-10-04 14:28:39 +02:00
fieldOfView
4f1000c70e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:15:05 +02:00
fieldOfView
d47f3c482f Static methods cannot call class methods 2016-10-04 14:14:55 +02:00
Jaime van Kessel
e4c6b58611 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 14:08:10 +02:00
fieldOfView
d4556ba4c5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-04 14:06:06 +02:00
fieldOfView
ff12f999be Fixed error when duplicating protected profiles
CURA-2478
2016-10-04 14:05:55 +02:00
Tim Kuipers
93186dedd0 JSON fix: disable prime position by default for each machine (CURA-2521) 2016-10-04 14:02:34 +02:00
Jaime van Kessel
c99b460927 Merge branch 'feature_better_warning_formulas' of github.com:Ultimaker/Cura 2016-10-04 13:51:51 +02:00
Ghostkeeper
a31a4a1e90
Reinitialise Zeroconf network socket upon refresh/start
Reinitialising Zeroconf entirely causes CPU usage to go through the proverbial roof. This is sort of a hack, since we're touching the _listen_socket variable inside Zeroconf, which it hasn't exposed. But it works to still be able to refresh Zeroconf after network switches, and to not have high CPU usage afterwards.

Contributes to issue CURA-2497.
2016-10-04 13:49:01 +02:00
Tim Kuipers
ed0f8c0235 Merge branch 'master' into feature_better_warning_formulas 2016-10-04 13:43:04 +02:00
Jaime van Kessel
601fdf51fc Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-04 13:40:39 +02:00