Jaime van Kessel
8f6cb26a1f
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-12-14 16:39:23 +01:00
Tim Kuipers
cde6e4c655
JSON: extruder trains were reversed (CURA-494)
2015-12-14 15:20:09 +01:00
Arjen Hiemstra
379ba357cf
Merge branch '2.1'
...
* 2.1: (60 commits)
Fix documentation of XRayView class and add a note about RenderPass ctor
Uranium -> Cura and drop some unused code
Update XRayView to render properly
Render Convex Hull below 0 to avoid z fighting artifacts
Render the grid a bit below 0, so we avoid some z fighting artifacts
Add a working X-Ray view
Remove commented out code
Update with the changed default for backface culling
Fix convex hull and layer view rendering
Default Cura to SolidView, not MeshView
Add SolidView plugin, which is what used to be Uranium's MeshView
Fix ConvexHullNode so it renders
Update BuildVolume and ConvexHullNode to use new API
Remove setLightPosition call
Revert "Displays settings based on whether they are global-only or not"
Revert "Adds a global-only role to the SettingOverrideModel"
Tweak Setting Category header size
Add warning to PerObjectSettingsPanel when Print Sequence is set to All at Once
Fix PerObjectSettingsPanel layout
Remove Print Speed setting from simple mode
...
2015-12-14 14:05:51 +01:00
Arjen Hiemstra
bcaea7db09
Fix documentation of XRayView class and add a note about RenderPass ctor
2015-12-14 13:58:24 +01:00
Arjen Hiemstra
b229769c4e
Uranium -> Cura and drop some unused code
2015-12-14 13:58:24 +01:00
Arjen Hiemstra
042c575b18
Update XRayView to render properly
2015-12-14 13:58:24 +01:00
Arjen Hiemstra
45d797515f
Render Convex Hull below 0 to avoid z fighting artifacts
2015-12-14 13:58:24 +01:00
Arjen Hiemstra
3e0a06e7ee
Render the grid a bit below 0, so we avoid some z fighting artifacts
2015-12-14 13:57:31 +01:00
Arjen Hiemstra
8a5f2b347a
Add a working X-Ray view
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
e0d6cd6f90
Remove commented out code
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
7e87f2d1ce
Update with the changed default for backface culling
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
435186e6d1
Fix convex hull and layer view rendering
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
63c80c42ce
Default Cura to SolidView, not MeshView
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
c5689e6256
Add SolidView plugin, which is what used to be Uranium's MeshView
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
9900a0b327
Fix ConvexHullNode so it renders
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
7395f37efe
Update BuildVolume and ConvexHullNode to use new API
2015-12-14 13:56:32 +01:00
Arjen Hiemstra
090f912a55
Remove setLightPosition call
...
This should be replaced by a proper light object
2015-12-14 13:54:42 +01:00
Kurt Loeffler
88c8765ee2
Changed the name of the Lone Width field to Nozzle Diameter in the UI to make its use more clear. When the active machine profile is an Ultimaker 2 it will also mention the Olsson Block.
2015-12-11 12:55:28 -08:00
Tamara Hogenhout
e61d3e4f3e
Merge pull request #562 from Ultimaker/feature_ux2-1
...
Design rework for 2.1 release
2015-12-10 11:05:19 +01:00
Tamara Hogenhout
18df633837
Revert "Displays settings based on whether they are global-only or not"
...
This reverts commit 2e5bac5392f35d43c701abdfc2340e907258cfaa.
2015-12-10 11:00:40 +01:00
Tamara Hogenhout
7e12269ca4
Revert "Adds a global-only role to the SettingOverrideModel"
...
This reverts commit f8dbe056b2c53ac76f2ad124e26c7b8dbfd55b07.
2015-12-09 16:49:13 +01:00
Tim Kuipers
fa7a434de4
Merge branch 'master' of https://github.com/Ultimaker/Cura
2015-12-09 16:38:39 +01:00
Tim Kuipers
99d9348c38
extruder trains can now be overridden (CURA-494)
2015-12-09 16:28:48 +01:00
Tim Kuipers
17e372820c
JSON: machine_show_variants was never defined in fdmPrinter.json (CURA-494)
2015-12-09 16:28:31 +01:00
fieldOfView
f29e03f7e7
Tweak Setting Category header size
2015-12-09 15:40:57 +01:00
fieldOfView
5fe1de2153
Add warning to PerObjectSettingsPanel when Print Sequence is set to All at Once
2015-12-09 15:05:39 +01:00
Tim Kuipers
ff500e4315
JSON: machine_extruder_trains array refactored to objcet with int children (CURA-494)
2015-12-09 14:15:23 +01:00
Tim Kuipers
a390aa73a8
JSON: machine_settings ==> overrides (CURA-494)
2015-12-09 14:06:33 +01:00
fieldOfView
03e9694e32
Fix PerObjectSettingsPanel layout
2015-12-09 13:02:30 +01:00
daid
3d4b626c50
When running Cura from the master branch, there is no version set. Which puts the version at "master". The splash screen tries to split this into major-minor, but cannot draw the minor and throws an exception. This patch just skips drawing of the minor version number when it is not available.
2015-12-09 10:40:09 +01:00
Tim Kuipers
11f7f521c9
Merge branch '2.1'
2015-12-08 16:15:43 +01:00
fieldOfView
6863e15e20
Remove Print Speed setting from simple mode
2015-12-08 15:03:54 +01:00
Tamara Hogenhout
9388fd9e55
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2015-12-08 13:45:28 +01:00
Tamara Hogenhout
70b221b33a
Proof of concept to test the global-only functionalities
...
Contributes to #CURA-460458
2015-12-08 13:44:59 +01:00
Tamara Hogenhout
f8dbe056b2
Adds a global-only role to the SettingOverrideModel
...
Also adds a reload function
Contributes to #CURA-458
2015-12-08 13:43:37 +01:00
Tamara Hogenhout
2e5bac5392
Displays settings based on whether they are global-only or not
...
blobal-only means it's not allowed to be used as a per object setting
Contribute to #CURA-458
2015-12-08 13:42:16 +01:00
Tim Kuipers
4932ef819c
JSON fix: Min Volume Before Coasting doesn't include Coasting Volume anymore (CURA-528)
2015-12-08 13:30:12 +01:00
Tim Kuipers
5009ac99e6
retrieve brim_width instead of brim_line_count * skirt_line_width (CURA-550)
2015-12-08 10:51:07 +01:00
Tim Kuipers
a4e824464c
JSON bugfix: coasting_min_volume had an inherit_function and the inherit property (CURA-550)
2015-12-08 10:47:09 +01:00
Tim Kuipers
71c8393f8c
JSON bugfix: default brim width (CURA-550)
2015-12-08 10:13:23 +01:00
Tim Kuipers
26a7fc7bdc
JSON: made brim_line_count default match brim_width_default for 0.4 nozzles (CURA-550)
2015-12-08 09:50:34 +01:00
Tim Kuipers
8a853e5b05
JSON bugfix: infill_density ==> infill_sparse_density (CURA-550)
2015-12-08 09:48:01 +01:00
Tim Kuipers
6ef68ca5c1
JSON: made coasting_min_volume depend on coasting_volume (CURA-550)
2015-12-08 09:47:20 +01:00
Tim Kuipers
67bbb5478e
JSON: (bugfix) introduced brim_width (CURA-550)
2015-12-08 09:38:21 +01:00
Tim Kuipers
e69bdd4fe5
JSON: introduced brim_width (CURA-550)
2015-12-07 18:11:48 +01:00
Tim Kuipers
b86a219315
JSON: fix: coasting min volume should be at least as high as coasting volume (CURA-528)
2015-12-07 18:05:00 +01:00
Arjen Hiemstra
c854221d4f
Update default profiles with values as supplied by Paul
2015-12-04 17:12:27 +01:00
Arjen Hiemstra
48a3e06fd6
Update default profiles with values as supplied by Paul
2015-12-04 17:09:05 +01:00
Arjen Hiemstra
fd4943b18a
Fix variant selection dropdown in sidebar so it actually selects a variant
2015-12-04 16:46:45 +01:00
Arjen Hiemstra
92ff7e9360
Fix variant selection dropdown in sidebar so it actually selects a variant
2015-12-04 16:46:12 +01:00
