16106 Commits

Author SHA1 Message Date
Ghostkeeper
c6fa9474d6
Merge branch '3.5' 2018-09-17 14:41:45 +02:00
Diego Prado Gesto
6c9c68e004 Active the focus when the selected item changes.
In this case, if the user was updating some information in one material
and then select other material, the new data is stored.

Contributes to CURA-5682.
2018-09-17 14:41:45 +02:00
Ghostkeeper
1bf05e6701
Merge branch 'CURA-5718_fix_upgrade_for_bundled_plugins' into 3.5 2018-09-17 14:36:17 +02:00
Diego Prado Gesto
dfae4a9a86 Add a property that indicates when the layer slider or the path slider
has changed manually.

With this we can differentiate when the layer changed automatically
(during simulation) or manually (by user interaction). In case it was
changed manually, the simulation will stop.

Contributes to CURA-5725.
2018-09-17 14:02:04 +02:00
Lipu Fei
2bf617b53a
Merge pull request #4376 from Ultimaker/CURA-5682_material_manager_leftovers
Material preference page leftovers
2018-09-17 13:23:59 +02:00
Diego Prado Gesto
74fcc10f59 Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-17 12:11:00 +02:00
Diego Prado Gesto
bafc2b98c9 Reuse MaterialBrandSection component for Favorites, Generic and branded
materials.

This component will show different children depending on the
hasMaterialTypes flag.

Adjust some small UI issues.

Contributes to CURA-5682.
2018-09-17 12:08:41 +02:00
Lipu Fei
3ac5a316d3 Check package upgradable using PM first, old plugins later
CURA-5718

For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed Exclude bundled plugins in the old plugins list 2018-09-17 12:05:10 +02:00
Jaime van Kessel
2d7e41263d Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-17 11:39:29 +02:00
Jaime van Kessel
58c7524164 Also rename dagoma_neva_magis profiles to dagoma_magis 2018-09-17 11:38:51 +02:00
Jaime van Kessel
0c9ec8d455 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-17 11:35:46 +02:00
Orel
093c5487bf - Rename Dagoma Magis profile.
- Remove machine_gcode_flavor definition as the default value fits the
needs.
2018-09-17 11:30:00 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5' 2018-09-17 10:54:44 +02:00
Ghostkeeper
8a94042a1f
Fix icon name role
The icons were not displaying in the context menu of the settings.
2018-09-17 10:51:56 +02:00
Ghostkeeper
ade2b565bc
Add 3.5 change log
Contributes to issue CURA-5710.
2018-09-17 10:30:08 +02:00
Diego Prado Gesto
f871a89825 Clean up the code by removing duplicate code. Also try to unify the
MaterialsBrandSection to use the same component for favorites, generic
and branded materials.

Contributes to CURA-5682.
2018-09-17 09:09:14 +02:00
fieldOfView
9c865e80d1 Remove debug print 2018-09-14 19:15:23 +02:00
Mark Burton
8efc5fe345 Now zig_zaggify_infill is enabled for gyroid infill. 2018-09-14 18:05:55 +01:00
Ghostkeeper
a870060a34
Remove unused parameter 2018-09-14 17:00:55 +02:00
Ghostkeeper
2369a10ce1
Disallow setting support wall line count per mesh
Because as soon as support is generated it can merge with the polygons of other support areas that are not directly beneath this model. They cannot have a different number of walls any more then because it is the same polygon.

Contributes to issue CURA-5603.
2018-09-14 16:31:40 +02:00
Jaime van Kessel
4c460b6fa5 Prevent crash if sdk_version is "dev" 2018-09-14 16:15:56 +02:00
Jaime van Kessel
41860b1e89 Merge branch 'CURA-5689_dont_ignore_small_z_gaps_by_default' of github.com:Ultimaker/Cura 2018-09-14 15:44:37 +02:00
Jaime van Kessel
2590b03540 Merge branch 'master' of github.com:Ultimaker/Cura 2018-09-14 15:42:11 +02:00
Jaime van Kessel
c9d3847fdb Update description of ignore small_z_gaps 2018-09-14 15:41:51 +02:00
Ghostkeeper
177f5dc7db
Merge branch '3.5' 2018-09-14 15:34:02 +02:00
Remco Burema
5c73921943 [CURA-5725] Revert "Set simulation path to 0 after updating layer"
This reverts commit 3da6e3c4535db85a921bf5770903bd1a729946e1.
2018-09-14 14:35:10 +02:00
fieldOfView
66aeb95e28 Fix opening port after baudrate detection 2018-09-14 14:06:55 +02:00
fieldOfView
6bf91d2b3a Fix updating temperature while preheating bed or extruder
While preheating the bed/extruder with M190 or M109, the firmware keeps outputting temperature lines, but these do not contain "ok" because no new command was acknowledged.

Fixes #3741
2018-09-14 13:59:05 +02:00
Remco Burema
0ff893c349 [CURA-5689] Make 'Ignore Small Z Gaps' false by default. WARNING: Increases default slicing time! 2018-09-14 13:49:56 +02:00
Ghostkeeper
e9ac0e5564
Merge branch '3.5' 2018-09-14 12:41:35 +02:00
Ghostkeeper
fb9c21e914
Fix imports 2018-09-14 12:41:03 +02:00
Ghostkeeper
3b36223681
Merge branch '3.5' 2018-09-14 12:40:29 +02:00
Ghostkeeper
e9cdd47a03
Fix types of getGlobalContainerStack call results
We know in these places that there must be a global stack at this point. So to hide the type error we'll cast it here.
Of course, the danger in this is that someone might call this function that doesn't know about this requirement and calls it when there is potentially no global stack yet. Hopefully they'll discover this crash when that happens then.
2018-09-14 12:38:16 +02:00
Ghostkeeper
f8da8c14e5
Fix running tests with PyQt 5.11
This was causing the test runner to crash.
2018-09-14 11:38:14 +02:00
Ghostkeeper
2e6401b7dc
Don't depend on the name of resource folders not changing
If we choose to rename the resource folders, then this plug-in should still look in the old resource folders. So hard-code these resource folders in the state that they were in at version 2.5 so that we can freely change them in a modern version.
2018-09-14 11:36:31 +02:00
Ghostkeeper
572afb052e
Remove unused import
This import was actually causing the test to fail on my computer due to a dependency on the order of importing libArcus vs. PyQt.
2018-09-14 11:30:25 +02:00
Diego Prado Gesto
972f0bef43 WIP Fix an error in which the current selected material was not
correctly selected when there is more than one brand (stupid mistake).
Also fix problems when the user changes some material information.

Contributes to CURA-5682.
2018-09-14 10:54:07 +02:00
Lipu Fei
8298f76d91 Add material_diameter into fdmprinter
When saving a material to a file, it will save all the settings in that
container, which needs to create SettingInstances for all the cached
ones, and for those instances, their definitions will be retrieved from
the machine definition.

material_diameter is one of the settings, but it only exists in the
extruder definitions, so when it tries to save a material profile, a lot
of warnings/errors will occur due to the missing "material_diameter" in
fdmprinter. Adding it back fixes this problem.
2018-09-14 09:43:26 +02:00
Ghostkeeper
c962b519b1
Clarify PRIME_CLEARANCE global better 2018-09-13 16:56:14 +02:00
Ian Paschal
942d20a8d8 Monitor Tab - Fix pause button
Contributes to CL-1050
2018-09-13 16:31:07 +02:00
Ghostkeeper
5a374f31ef
Merge branch '3.5' 2018-09-13 16:27:49 +02:00
Ghostkeeper
c840680e68
Merge branch '3.5' of ssh://github.com/Ultimaker/Cura into 3.5 2018-09-13 16:26:48 +02:00
Jaime van Kessel
757c8754b1 Merge branch '3.5' of github.com:Ultimaker/Cura 2018-09-13 16:23:55 +02:00
Jaime van Kessel
9627f216b2 Actually ensure that walls don't get slower than 1 mm/s
CURA-5724
2018-09-13 16:22:36 +02:00
Mark Burton
3ee9ed0cf3 Add gyroid infill pattern. 2018-09-13 15:15:29 +01:00
Lipu Fei
ccef0843c2
Merge pull request #4273 from Kriechi/pause-at-height-rrf
add PauseAtHeight post-processing script for RRF
2018-09-13 15:11:30 +02:00
Ian Paschal
f93413d3a3 Monitor Tab - Context menu improvements
Fixed:
- In the Queued jobs area, the context menu doesn't close when clicking on the right half of the card.
- Context menu trigger button should be more in the corner for both the print job tiles and the printer tiles
- Context menu text should not be centered
- Context menu should be closer to the context menu trigger button
- Context menu should be aligned further right in relation to the context menu trigger button
- Context menu options that are not available should not be shown.
- Context button dots should be grey.

Contributes to CL-1050
2018-09-13 14:52:52 +02:00
Lipu Fei
b39d6c7d87 Package upgrade should also check SDK version 2018-09-13 13:42:53 +02:00
Aleksei S
f0e8746a22 Code style, duplicate material
CURA-5673
2018-09-13 13:23:10 +02:00