Commit graph

9400 commits

Author SHA1 Message Date
Ghostkeeper
c08eb043f0
Merge branch 'fix_float_number_line_width_um3' 2017-05-05 14:45:35 +02:00
Ghostkeeper
ce3b0d9fe4
Convert Kossel platform to binary STL
There were reportedly some errors in the file format. I've opened it and re-saved it in CloudCompare to fix these. And I also converted it to binary STL to reduce the file size somewhat.
2017-05-05 14:26:01 +02:00
14bitVoid
e9d70a8a70 Translate features for time estimates 2017-05-05 02:36:22 +02:00
14bitVoid
05f46c47f7 Dynamically fill tooltip with time estimates 2017-05-05 02:31:16 +02:00
14bitVoid
69a95e37a5 Show time estimates per feature in tooltip 2017-05-05 01:34:09 +02:00
14bitVoid
f15aa66751 Receive time estimates per feature 2017-05-05 00:05:17 +02:00
Ghostkeeper
eb52e4fb7e
Ignore default name of ProfileFlattener too
It already ignored FlatProfileExporter, but that's just a renamed version of what is now called ProfileFlattener.
2017-05-04 17:57:55 +02:00
Ghostkeeper
81ea9556eb
Fix showing layer view if there is no material
The layer view would request the colour of the material. If there is no material, that would give an error.

Contributes to issue CURA-3497.
2017-05-04 17:56:57 +02:00
Tim Kuipers
15367a68d7 WARNING: TO BE REMOVED! impossible settings limit_to_extruder: overlap percentage
CURA-3740

These settings inherently have to do with multiple features and
so we should find a value function which depends on
settings from the extruder trains corresponding to those features (wall, skin, infill).

However, we haven't found those functions yet and we have to do research.

Once we have found the formula these settings shouldn't depend on a single extruder any more
and so we should remove the limit_to_extruder.
2017-05-04 17:45:50 +02:00
Tim Kuipers
8d6862be50 JSON infill/skin value function (CURA-3740)
value function is an initial try to get a better value function based on both feature types of walls and skin/infill
2017-05-04 17:45:03 +02:00
Tim Kuipers
17e9e2ae53 JSON limit_to_extruder becomes enabled (CURA-3740)
Settings which govern the order of features shouldn't depend on any feature,
because the order is overruled by the extruder order.
2017-05-04 17:38:16 +02:00
Tim Kuipers
27a8b59c80 WARNING: TO BE REMOVED! impossible settings limit_to_extruder
CURA-3740

These settings inherently have to do with multiple features and
so we should find a value function which depends on
settings from the extruder trains corresponding to those features (wall, skin, infill).

However, we haven't found those functions yet and we have to do research.

Once we have found the formula these settings shouldn't depend on a single extruder any more
and so we should remove the limit_to_extruder.
2017-05-04 17:34:41 +02:00
Jack Ha
7d787a2188 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-04 16:31:43 +02:00
Jack Ha
0b0011fc88 Multiply dialog now has focus on #, added shortcut Ctrl-M 2017-05-04 16:31:33 +02:00
Lipu Fei
91b22edb06 Fix missing imports in CuraContainerRegistry
CURA-3497
2017-05-04 16:19:18 +02:00
Arjen Hiemstra
51b76acc6d Fix unit test
CuraContainerRegistry::load now has a dependency on the ContainerStack
so we need to account for it in our mocks.
2017-05-04 15:57:47 +02:00
Arjen Hiemstra
230740ed64 Fixup extruders that were converted from ContainerStack on load
We need to make sure the extruder stacks get the proper next stack set,
even when converting them from ContainerStack. Since the conversion can
make no guarantees about the loading order, we need to add an extra step
to post-process the extruders.

Contributes to CURA-3497
2017-05-04 15:44:16 +02:00
Lipu Fei
314fa8b1c8 Fix Enter key trigger for UM3 Add Printer dialog 2017-05-04 15:27:29 +02:00
Lipu Fei
0171d9637c Fix mode switching issue in LayerView
CURA-3730
2017-05-04 15:15:38 +02:00
Lipu Fei
f06562bc6e Remove kitten image and related text from CrashDialog 2017-05-04 14:33:19 +02:00
MaukCC
7ee1498962 Update cartesio.def.json 2017-05-04 14:11:00 +02:00
MaukCC
3c4d3779b1 Update cartesio.def.json 2017-05-04 13:47:14 +02:00
Arjen Hiemstra
fe112d5d81 Fix extruderstack test on CI
We do not need a complete CuraApplication just so registerExtruder
can work. Instead, we just mock away the extruder manager so the rest of
the test can proceed.
2017-05-04 13:06:34 +02:00
Ghostkeeper
45a369e31b
Merge branch 'Sidebar-fix' 2017-05-04 13:00:03 +02:00
Lipu Fei
25be8d9abb Fix default Line Width float value representation for UM3 2017-05-04 12:55:37 +02:00
Ghostkeeper
c25e2b9b95
Revert "Include recommended/custom switch in theme"
This reverts commit a1f32b74e5. The fix was correct but we allow the honour for Randyxxl.
2017-05-04 12:53:05 +02:00
Mark
baf10a3441 Merge branch 'feature_extra_gradual_infill_icon' of github.com:Ultimaker/Cura into feature_extra_gradual_infill_icon 2017-05-04 12:36:04 +02:00
Mark
68f5995b19 [WIP] Add place for the extra gradual infill icon
CURA-3732
2017-05-04 12:35:40 +02:00
Mark Burton
53b7e1a8ca Add smooth_spiralized_contours setting to control smoothing of contours when spiralizing.
Smoothing the contours minimises the visibility of the z-seam and for most models is
probably a good idea. Where it is less good is when the model has a fine surface details
which will get mangled by the smoothing. So we should let the user decide whether they
want to smooth or not. The default is true as most of the time it's a good thing.

# Conflicts:
#	resources/definitions/fdmprinter.def.json
2017-05-04 09:02:38 +01:00
Ghostkeeper
a1f32b74e5
Include recommended/custom switch in theme
Otherwise it stays white.
2017-05-04 09:48:54 +02:00
Robert Colbert
7d7b0eaabb Delete slnx.sqlite 2017-05-03 14:58:35 -05:00
Robert Colbert
c5bcaf2d72 Delete ProjectSettings.json 2017-05-03 14:58:27 -05:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack'
Contributes to issue CURA-3497.
2017-05-03 17:11:55 +02:00
Ghostkeeper
ea9e0e2e9c
Replace material without needing to find its index
We have an easy setter for this.

Contributes to issue CURA-3497.
2017-05-03 17:09:33 +02:00
Mark
b590e7b86c [WIP] Add place for the extra gradual infill icon
CURA-3732
2017-05-03 17:05:56 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.

Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
41e444714f
Fix spacing
Minor code style stuff.
2017-05-03 16:54:20 +02:00
Ghostkeeper
cd78ab850d
Remove semicolons
Semicolons, a relic of the past.

Contributes to issue CURA-3497.
2017-05-03 16:03:47 +02:00
awhiemstra
cee0539146 Remove version field from Desktop file
Apparently, it is not required and we are specifying an invalid version.

Fixes #1784
2017-05-03 15:54:09 +02:00
Ghostkeeper
1778751397
Fix travel speed override
Was a typo by the contributor of this definition.
2017-05-03 15:39:20 +02:00
Ghostkeeper
337be1b9be
Fix setting machine changes profile with new specified container stacks
Don't need to insert it, because there's already a slot for it on the stack. In fact, you're not allowed to insert anything.

Contributes to issue CURA-3497.
2017-05-03 15:38:20 +02:00
Randall Wessel
687d326fae Changed color to transparancy and spaces instead of tabs 2017-05-03 15:34:56 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack 2017-05-03 15:21:01 +02:00
Ghostkeeper
86f1a0559f
Add documentation and further specify except around disconnecting signals
Catch just a TypeError instead of all exceptions. Added documentation to say why we catch a TypeError there. Also splitted up the try-except block for the 3 disconnects, just so that if the first fails we still try to disconnect from the other two.

Contributes to issue CURA-3497.
2017-05-03 14:56:52 +02:00
Randall Wessel
163543b86b Make background color of toggle button themeable
Background of toggle button gets same color as toolbar surrounding the
button.
2017-05-03 14:26:44 +02:00
Jaime van Kessel
4920646d85 Merge branch 'bugfix_CURA-3711_cli_open_file_jobname' of github.com:Ultimaker/Cura 2017-05-03 14:17:52 +02:00
Jaime van Kessel
8d6450111a Merge branch 'feature_CURA-3730' of github.com:Ultimaker/Cura 2017-05-03 14:15:50 +02:00
Jaime van Kessel
5159894d5b Merge pull request #1780 from LipuFei/fix_jobspec_tofix
Fix TypeError in JobSpec.qml due to material cost being undefined
2017-05-03 14:12:03 +02:00
Jaime van Kessel
b2d0642269 Merge pull request #1782 from LipuFei/enter_for_UM3_network_dialog
Accept Enter key on UM3 Add Printer Dialog
2017-05-03 14:11:10 +02:00
Lipu Fei
c2dff9fcd9 Accept Enter key on UM3 Add Printer Dialog 2017-05-03 13:58:58 +02:00