203 Commits

Author	SHA1	Message	Date
Jack Ha	efbc624ea8	More defensive setExtruderOpacity, removed unnecessary part. CURA-3321	2017-03-07 10:40:59 +01:00
Jack Ha	c10dc2f07c	Set old permissions back. CURA-3321	2017-03-07 10:36:30 +01:00
Jack Ha	42d939b34e	Solved merge conflict. CURA-3321	2017-03-07 10:34:53 +01:00
Jack Ha	b2e06bed37	Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321	2017-03-06 14:03:42 +01:00
Jack Ha	1f61017946	Fix updateLegend function. CURA-3321	2017-03-06 13:20:14 +01:00
Jack Ha	1c40c94c44	Fix compatibility options. CURA-3321	2017-03-06 11:55:39 +01:00
Jack Ha	e89b1afa2c	Initial layer view color mode -> legend. CURA-3321	2017-03-02 16:55:54 +01:00
U-ULTIMAKER\j.ha	c54d5ce707	Fixed compatibility mode active extruder. CURA-3321	2017-03-02 13:15:29 +01:00
Jack Ha	bdd07bd160	Removed commented out stuff. CURA-3321	2017-03-01 14:54:12 +01:00
Jack Ha	f9a5dc885c	Solved merge conflicts #1479 CURA-3321	2017-03-01 14:47:54 +01:00
Jack Ha	f22299c80d	Added option for show_travels in compatibility mode top layers. CURA-3321	2017-02-28 14:43:46 +01:00
Jack Ha	ba6a8eb869	Legend is now in the switching layer type area, removed legend upper right. CURA-3321	2017-02-28 13:34:58 +01:00
Jack Ha	27f013fd81	Cleanup layout, finalizing	2017-02-28 11:52:51 +01:00
Jack Ha	8b7aee1664	Adjusted menu, added View Mode: Layers. CURA-3321	2017-02-27 14:16:56 +01:00
Jack Ha	fa1b332733	Moved layer view menu to left, next to sliders. CURA-3321	2017-02-27 14:06:17 +01:00
Jack Ha	8237421bcf	Undo testing QVector3D. CURA-3334	2017-02-27 13:33:55 +01:00
Jack Ha	ccac9277a9	Undo old testcode, added testcode for CURA-3334	2017-02-27 11:20:22 +01:00
Jack Ha	36476a14bb	Solved merge conflicts	2017-02-23 14:40:49 +01:00
fieldOfView	7a336bbe67	Change separator for extruder_opacities to | ... Comma as a separator might cause confusion/(user-)errors with localised floating point numbers.	2017-02-21 22:37:32 +01:00
fieldOfView	aef34d4688	Fix i18n context	2017-02-21 22:28:47 +01:00
Jack Ha	2f7644c34e	Travel moves are now flat planes, on top of the 'tubes'. CURA-3273	2017-02-21 10:00:29 +01:00
Jack Ha	24d04558f0	Merged LayerView show_adhesion and show_support into show_helpers. CURA-3273	2017-02-20 15:56:29 +01:00
fieldOfView	73253d3807	Fix loading opacities from preferences	2017-02-20 13:31:59 +01:00
fieldOfView	26fe46ce1f	Translate layerview mode types	2017-02-20 12:32:49 +01:00
fieldOfView	f8a3c3b0ba	Factor out repeated extruder visibility checkboxes	2017-02-20 12:27:37 +01:00
fieldOfView	61e0cd4ff5	Move legacy options to layerview options	2017-02-20 11:09:34 +01:00
Jack Ha	e82bb29e1d	Revert translation of listmodel text. CURA-3273	2017-02-20 09:57:25 +01:00
Jack Ha	fd2525768d	Capitalized labels, made them translatable. CURA-3273	2017-02-20 09:55:07 +01:00
Jack Ha	cd54552498	Merge branch 'master' of github.com:Ultimaker/Cura	2017-02-20 09:45:51 +01:00
Jack Ha	b229d38a88	LayerView checkboxes are not remembered; added switching Legend on for compatibility mode. CURA-3273	2017-02-20 09:45:37 +01:00
fieldOfView	04ab33b913	Fix legend in compatibility mode	2017-02-17 14:07:19 +01:00
fieldOfView	9229027001	Refactor properties that start with 'get' to avoid confusion between slots & properties ... Case in point: LayerViewProxy.getLayerViewType was decorated as a property but was used/intended as a slot.	2017-02-17 13:35:01 +01:00
Jack Ha	aab17608ff	Fixed shader bugs, lines are now nice and smooth again. CURA-3273	2017-02-15 11:53:20 +01:00
Jack Ha	ce226ebbea	Fix layerview checkboxes. CURA-3273	2017-02-15 11:35:49 +01:00
Jack Ha	9e973732f5	Fixed remember coloring type in Layer View. CURA-3273	2017-02-15 10:50:21 +01:00
Jack Ha	488b952815	Fix 4.1 shader for line types. CURA-3273	2017-02-13 13:21:30 +01:00
Jack Ha	7000717f6e	Fixed warning non-NOTIFYable properties, added signals for propertiesChanged. CURA-3273	2017-02-13 09:58:33 +01:00
Jack Ha	81e575da31	Added comment. CURA-3273	2017-02-08 13:39:19 +01:00
Jack Ha	811f40d294	Renamed lightDir to light_dir. CURA-3273	2017-02-08 13:34:54 +01:00
Jack Ha	0d444298bc	Added myEmitVertex function in layers3d.shader. CURA-3273	2017-02-08 13:29:24 +01:00
Jack Ha	8e80593232	Added comment. CURA-3273	2017-02-08 13:03:48 +01:00
Jack Ha	cc950732b6	Added comment. CURA-3273	2017-02-08 11:57:59 +01:00
Jack Ha	47ab49795f	Added comments, changed small layout and id thing. CURA-3273	2017-02-08 11:48:00 +01:00
Jack Ha	6c19bc1c16	Only show legend in color: line_type	2017-02-08 11:08:59 +01:00
Arjen Hiemstra	74bef2ff95	Fix OpenGL 2.0 fallback shader for Layer View	2017-02-07 17:34:02 +01:00
Jack Ha	4057996e23	Made layers.shader compatibility shader compatible. CURA-3273	2017-02-07 14:28:22 +01:00
Jack Ha	4b02a425d8	Let Layer View compatibility mode depend on OpenGL version we asked for (may be different than actual). CURA-3273	2017-02-07 11:55:51 +01:00
Jack Ha	1d77864915	Added force layer view compatibility mode. CURA-3273	2017-02-07 09:36:21 +01:00
Jack Ha	7c964045db	Removed unused line in shader. CURA-3273	2017-02-06 13:16:47 +01:00
Jack Ha	0889722350	Finishing up opengl 4.1 core profile things, it all works. CURA-3273	2017-02-02 17:08:20 +01:00