16749 Commits

Author SHA1 Message Date
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
Tim Kuipers
945cc7c3e6 JSon feat: support brim settings 2018-09-13 14:25:57 +02:00
Tim Kuipers
eb253827be JSON setting: option to let support be replaced by brim or not 2018-09-13 13:48:08 +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
Tim Kuipers
6068ed10c1 JSON fix: connect_infill_polygons by default only when polygons can be connected via the outline.
Also let the user be able to edit the setting in some more situations,
for example when choosing concentric infill when the infill_line_distance = nozzle_size
2018-09-13 13:12:51 +02:00
Aleksei S
5db008f763 New duplicated favorite material will be added to favorite category
CURA-5673
2018-09-13 12:56:51 +02:00
Ghostkeeper
cc77632357
Merge branch 'master' into refactor_singleton_settingsbase 2018-09-13 11:52:13 +02:00
Lipu Fei
7a3e61e8f1 chmod a+x check_shortcut_keys.py
CURA-5642
2018-09-13 10:56:31 +02:00
Lipu Fei
e629ea89ff Improve shortcut check script
CURA-5642

More information in the output.
2018-09-13 10:55:37 +02:00
Lipu Fei
7ec62315e0 Remove shortcut for About
CURA-5642

It has conflict with "&Add Printer".
2018-09-13 10:54:46 +02:00
Ian Paschal
7226bc45b5 Monitor Tab - Queued header is properly aligned
Contributes to CL-1052
2018-09-13 10:35:31 +02:00
Diego Prado Gesto
6dc53cc60a Select the next selected material when it is activated or removed.
Contributes to CURA-5682.
2018-09-12 18:39:19 +02:00
Diego Prado Gesto
7e1a833e9c Merge branch '3.5' into CURA-5682_material_manager_leftovers 2018-09-12 17:12:40 +02:00
Lipu Fei
efdec50614 Fix typo 2018-09-12 17:08:58 +02:00
Ian Paschal
0b66bf0448 Monitor Tab - Use camera button on camera stream
- Fixes: Video feed close button is always out of sight
- Makes improvement to camera icon

Contributes to CL-1049
2018-09-12 17:07:10 +02:00
Lipu Fei
d1301d16a9 Skip the do-not-handle URLs instead of returning
CURA-5718

The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
2018-09-12 16:58:22 +02:00
Diego Prado Gesto
3368428dbb Fix text field alignment.
The color text field was too short in many cases, when the color name is
long.

Contributes to CURA-5682.
2018-09-12 16:57:43 +02:00
Aleksei S
3da6e3c453 Set simulation path to 0 after updating layer
CURA-5677
2018-09-12 16:56:54 +02:00
Ian Paschal
08d5e48407 Monitor Tab - Create reusable button
Contributes to CL-1049
2018-09-12 16:52:26 +02:00
Ian Paschal
dccc95f817 Monitor Tab - Camera button toggles
Contributes to CL-1049
2018-09-12 16:46:18 +02:00
Diego Prado Gesto
e3f67f1147 Fix code style.
Contributes to CURA-5682.
2018-09-12 16:37:16 +02:00
Diego Prado Gesto
6183a07d76 Activate the material right after it was created or duplicated.
Contributes to CURA-5682.
2018-09-12 16:35:01 +02:00
Ian Paschal
0a01e7c25b Monitor Tab - Improved camera icon
- Fixed: Camera icon is too small, and the icon does not look centred
- Fixed: No hover effect for the camera button

Contributes to CL-1049
2018-09-12 16:31:59 +02:00
Diego Prado Gesto
921b11974c Improve the way the categories are highlighted.
When a material is selected, but the brand or the type is collapsed,
those components are also highlighted to indicate the path to the
material.

Reuse the MaterialBrandSection also for the generic materials, that
allow us to only mantain one component.

Contributes to CURA-5682.
2018-09-12 15:42:02 +02:00
Jaime van Kessel
ecc66fe05b Merge branch 'CURA-5672_fix_s5_extruder_start_end_locations' of github.com:Ultimaker/Cura into 3.5 2018-09-12 14:17:45 +02:00
Diego Prado Gesto
56dcc2dded Highlight the material that is currently selected.
Contributes to CURA-5682.
2018-09-12 14:09:29 +02:00