Commit graph

5235 commits

Author SHA1 Message Date
Arjen Hiemstra
c550dd5072 Use the active container stack for determining activeQualityVariantId
Contributes to CURA-2271
2016-10-06 16:41:51 +02:00
Ghostkeeper
62d6b1fcdd
Adjust max warning for coasting volume
It now depends on the machine nozzle size.

Contributes to issue CURA-905.
2016-10-06 16:06:14 +02:00
fieldOfView
2aa3e1e931 Fix documentation
CURA-2248
2016-10-06 15:41:20 +02:00
Jack Ha
ab23637f3b Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 15:23:14 +02:00
Jack Ha
8b61215270 Added infill_mesh and infill_mesh_order to excluded list in SettingView. CURA-1993 2016-10-06 15:23:04 +02:00
fieldOfView
7e0667a181 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-10-06 15:20:24 +02:00
fieldOfView
593687afee Fix display of custom profiles for printers that have no materials (UM2)
CURA-2565
2016-10-06 15:20:16 +02:00
Tim Kuipers
f62a120533 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-06 15:08:27 +02:00
Tim Kuipers
aaaf1dfc58 JSOn fix: cap extruder switch retraction speed to machine_max_feedrate_e (CURA-905)
just like the normal retraction speeds.
2016-10-06 15:08:17 +02:00
fieldOfView
081ca8ea8d Merge current quality_changes values into newly created profiles
Creating a profile with a custom profile as the active profile would ignore the settings of that custom profile.

CURA-2565
2016-10-06 14:47:35 +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
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
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
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 99f53cb832. 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
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
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
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