Commit graph

7768 commits

Author SHA1 Message Date
fieldOfView
12079fc9da Add documentation 2017-04-15 18:55:59 +02:00
fieldOfView
f15345a0cb Restore material on global stack when switching back to single extrusion
MachineManager._onGlobalContainerChanged removes the global material of multiextruder machines
2017-04-11 12:18:33 +02:00
fieldOfView
31ecb30c03 Allow setting the nozzle size through the extruder definition 2017-04-10 22:30:43 +02:00
fieldOfView
6dd642469a Set value before activating another extruder
Because all extruder tabs share the same SettingPropertyProvider, we want the property provider value to update before its container stack is changed, or the value carries over to the other containerstack, leaving the value for the initial containerstack unchanged
2017-04-10 20:37:41 +02:00
fieldOfView
df7f039826 Store extruder settings in definition_changes containers 2017-04-10 18:26:10 +02:00
fieldOfView
499971d55c Fix loading values on 1st extruder tab 2017-04-10 17:24:02 +02:00
fieldOfView
c89669e73e Layout & code style: move unit into numeric textfield component 2017-04-10 16:22:20 +02:00
fieldOfView
7bad718823 Don't update the global container stack unnecessarily 2017-04-10 13:36:16 +02:00
fieldOfView
064f744bc0 Make sure we're not trying to get/set extruder values on machine stacks 2017-04-09 20:09:05 +02:00
fieldOfView
5b37353b08 Fix stuck extruder tabs when switching number of extruders 2017-04-07 11:55:07 +02:00
fieldOfView
7bc28a7e48 Make sure a valid stack is activated after changing the number of extruders 2017-04-06 21:02:33 +02:00
fieldOfView
818043854d Set active extruder when switching extruder tabs in Machine Settings
We can only get/set profiles for the active extruder.
2017-04-06 11:44:09 +02:00
fieldOfView
af280047d1 Add extruder fields for start/end gcode, offset, nozzle size (non-functional) 2017-04-06 11:35:56 +02:00
fieldOfView
91bc023d2a Add tabs for extruder settings 2017-04-06 09:41:16 +02:00
fieldOfView
940a60a4cb Fix font rendering on second column 2017-04-06 09:41:16 +02:00
fieldOfView
a41bc77e5a Hide nozzlesize field for multiextrusion printers...
and hide extruder count combobox when no extruders are defined
2017-04-06 09:41:15 +02:00
fieldOfView
e853d87779 Add control to set the number of extruders in Machine Settings 2017-04-06 09:41:15 +02:00
fieldOfView
0c74b4d108 Don't create extruder tabs for "inactive" extruders
If a printer definition defines more extruders than machine_extruder_count, these are no longer shown as tabs in the sidebar.
2017-04-06 09:41:15 +02:00
fieldOfView
e6121039d9 Add extruders to Custom FDM Printer definition 2017-04-06 09:41:14 +02:00
Jaime van Kessel
8f6a210c75 Merge branch 'fix_workspacedialog_typo' of git://github.com/fieldOfView/Cura 2017-04-05 17:03:44 +02:00
Jaime van Kessel
064b823ce3 Arrange job now groups all transformations.
This ensures that we can un & re do the aranging
2017-04-05 16:59:30 +02:00
Jaime van Kessel
03db47afd9 Added progress message to arrangeObjectsJob 2017-04-05 16:42:13 +02:00
Jaime van Kessel
d5682e6e29 ArrangeObjectsJob now yields after each object 2017-04-05 16:26:34 +02:00
Jaime van Kessel
a9234e0196 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-05 16:25:57 +02:00
Jaime van Kessel
7ea8017bb4 Moved arranging of nodes to it's own job 2017-04-05 16:25:34 +02:00
Jack Ha
07ed1bedc3 Fix boo boo with open multi files including project files. 2017-04-05 16:07:02 +02:00
Jaime van Kessel
1d10caf1ec Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-05 15:26:19 +02:00
Jaime van Kessel
ad4e1b3b18 ConvexHull Scene node no longe re-builds the shader every time it's created
This took about 12ms per object, which was quite noticable if there were multiple objects
2017-04-05 15:25:20 +02:00
fieldOfView
8b694e1787 Fix typo in WorkspaceDialog.qml 2017-04-05 15:12:55 +02:00
Jack Ha
667fa08770 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-05 15:05:28 +02:00
Jack Ha
6a3d8504a1 Fix g-code reader after adding arranger. CURA-3239 2017-04-05 14:27:04 +02:00
Jaime van Kessel
ae95f41a3e Removed include of cpack from cmake lists 2017-04-05 13:29:25 +02:00
Jaime van Kessel
1278b09b01 Delete CPackConfig.cmake 2017-04-05 13:24:52 +02:00
Jack Ha
30484461cf Faster arranging for same sized objects. CURA-3239 2017-04-05 11:41:18 +02:00
Jack Ha
4c9ec3c22d Better result (but slower) for arranger. CURA-3239 2017-04-05 11:29:57 +02:00
Jack Ha
87577f3e23 Improve ugly code for Arranger. CURA-3239 2017-04-05 11:26:29 +02:00
Jaime van Kessel
4626bc37a9 Improved documentation 2017-04-05 11:05:48 +02:00
Jaime van Kessel
ecf905f580 Merge branch 'feature_arrange_cleanup' of github.com:Ultimaker/Cura 2017-04-05 10:45:42 +02:00
Jack Ha
4e91d55bdf Fix Arranger bestSpot. CURA-3239 2017-04-05 10:41:54 +02:00
Jack Ha
ddd8f12a60 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-05 10:19:27 +02:00
Jack Ha
1a01d1b193 Change permissions back to 644 2017-04-05 10:19:12 +02:00
Jack Ha
2d6df1ae4a Fix workspacedialog booboo typo. 2017-04-05 10:18:36 +02:00
Ghostkeeper
210e9b5869
Merge branch '2.5' 2017-04-05 09:53:53 +02:00
Ghostkeeper
7b4375e3d1
Adjust minimum value warnings for line width
This was discussed with Tom from materials. The minimum warning value is now a linear function with a y-intercept. I tuned it so that it just sails under the minimum values of all of our profiles.
2017-04-05 09:53:14 +02:00
Arjen Hiemstra
43c7373368 Ignore any files not ending in .qml when adding QML resources
Qt 5.8 includes compiled QML caching, which creates .qmlc files on disk.
These shouldn't be added as actual QML objects. In addition, anything
that does not end in .qml is probably not something that can actually be
parsed as QML, so ignore those too.
2017-04-04 17:35:32 +02:00
Ghostkeeper
0dfe3f4109 Merge branch '2.5' 2017-04-04 17:25:50 +02:00
Ghostkeeper
81e639522d
Streamline headers of translation files
They now show correct attribution and sort of correct times, and they are consistent. Only ptbr isn't updated yet, because I expect an update soon from our translator.

Contributes to issue CURA-3487.
2017-04-04 17:24:33 +02:00
Lipu Fei
3f82eae73c Use layer_id to determine total layer count
CURA-3615
2017-04-04 16:52:53 +02:00
Ghostkeeper
20ca0720ea
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-04-04 16:51:32 +02:00
jack
38fe709736 Merge pull request #1648 from Ultimaker/bugfix_CURA-3615_fix_raft_layer_count
CURA-3615 Fix total layer count when raft is enabled
2017-04-04 16:47:07 +02:00