64 Commits

Author SHA1 Message Date
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
2016-06-21 14:47:10 +02:00
Thomas Karl Pietrowski
c0472e0068 LayerView: Using resetLayerData()
Currently resetLayerData() is not used at all, but found in two places
the same code like found in resetLayerData().
So replaced them with resetLayerData().
2016-06-10 13:57:52 +02:00
Tim Kuipers
21ad4713a7 Merge branch '2.1' 2016-06-08 15:35:45 +02:00
Arjen Hiemstra
a81cab5eac Merge branch '2.1' 2016-06-04 19:11:59 +02:00
Arjen Hiemstra
070e791b94 Add a preference to change LayerView top layers between 1 and 5
Fixes CURA-1643
2016-06-02 11:23:18 +02:00
Arjen Hiemstra
49e5b1938a Reduce number of top layer to increase processing speed 2016-06-01 15:45:54 +02:00
Arjen Hiemstra
ea5dc00080 Bump LayerView API version to 3
It does not use any setting API so it is safe
2016-05-23 18:21:23 +02:00
Simon Edwards
0b858f3878 Introduced a LayerDataBuilder. Made LayerData immutable just like its superclass. Fixed the layer view which broke.
Contributes to CURA-1504
2016-05-23 09:49:31 +02:00
Simon Edwards
c810c22eb5 Set the default number of layers and current layer to 0. Now the layer view slider is empty while the initial slicing process is running.
Fixes CURA-1273 Layer number doesn't fit
2016-04-28 13:07:57 +02:00
Jaime van Kessel
3ed7d60adb Increased size of the label for layerview a bit more.
CURA-1273
2016-04-04 14:42:42 +02:00
Jaime van Kessel
4ad88f3498 Layerview number is now correctly displayed
CURA-1273y
2016-04-01 14:50:47 +02:00
Thomas-Karl Pietrowski
0b93328aeb Using PyDev compatible tags 2016-03-15 12:52:29 +01:00
Thomas-Karl Pietrowski
7bc99c8c19 Removing unneeded imports and marking unused variable
Not sure whether there is a WIP on the unused variable
2016-03-14 17:18:45 +01:00
Jaime van Kessel
c4c5ba6c22 Top layers are now correctly updated when object is selected
CURA-992
2016-03-03 11:36:28 +01:00
fieldOfView
5cb1e9e2a6 Tweak layer slider appearance 2016-03-03 09:00:52 +01:00
Jaime van Kessel
41d00af345 Moved timer back again, as arjen fixed the real issue 2016-03-01 10:57:29 +01:00
Arjen Hiemstra
3afd3f2209 Use the right style for the layer view slider and add a busy indicator to the current layer field
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
110c3fa754 Do not react to all Scene changes in LayerView but just childrenChanged
When the layer data is updated, a new node is attached to the scene
root. We can thus watch for only children changes since everything else
can be ignored.

Contributes to CURA-938
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
f2d98cfba3 Do not show a message when processing top layers but rather leave it up to QML
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
c684e96ef1 Expose the new busy property to QML
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Arjen Hiemstra
e0afc1535a Add a busy property to LayerView that indicates whether we are currently building top layers
Contributes to CURA-957
2016-03-01 02:11:46 +01:00
Jaime van Kessel
67d10ef0a2 UpdateTopLayer timer is now only triggered when max layers changes
CURA-969
2016-02-29 15:51:40 +01:00
Arjen Hiemstra
220146b0a9 Also trigger an update of the top layers when recalculating the layer count
Contributes to CURA-938
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
f37b422ccb Display a message when processing the top layers takes a long time
Contributes to CURA-957
2016-02-29 08:57:23 +01:00
Arjen Hiemstra
a60bfa3d32 Perform creation of top solid layers in a background thread
This way we have a much more responsive layer view
2016-02-23 17:53:51 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Jaime van Kessel
01ecd9357c Max size & value are now set in correct order for layerview
CURA-763
2016-02-04 12:14:59 +01:00
Ghostkeeper
0d16fdf3ba Use a uniform-color shader for selection
In layer view, the selection shader is now a uniform-color shader. This shader does not use the vertex colours but makes the entire silhouette the same colour.

Contributes to issue CURA-625.
2016-01-21 14:24:57 +01:00
fieldOfView
a900b02ae8 Added weight to viewmode plugins for sorting in the viewmode 2015-12-30 09:53:25 +01:00
Arjen Hiemstra
435186e6d1 Fix convex hull and layer view rendering 2015-12-14 13:56:32 +01:00
fieldOfView
4d29fccb0b Remove cursorShapes for now 2015-12-03 12:09:30 +01:00
fieldOfView
47c53860fd Add hover cursorShape to open/viewmode buttons and layerslider 2015-12-03 12:09:29 +01:00
fieldOfView
2477617155 Reorient LayerView slider
Fix toolbar tooltip collisions
Refactor use of colors.text_default
2015-12-03 12:09:26 +01:00
fieldOfView
1ba1009b60 Initial theme rework:
* Move buttons around
* Resizing
* Colors
* Splash screen
2015-12-03 12:09:23 +01:00
Arjen Hiemstra
9267b517d6 Fix coding style issues 2015-11-27 16:53:32 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Arjen Hiemstra
7982e79940 Merge branch '15.10'
* 15.10: (37 commits)
  Tweak the initial camera position
  Never disable the view button
  Use selection status to disable/enable tools rather than platform activity
  JSON: bugfix: skirt_speed was the only child of speed_layer_0, which meant you couldnt tweak them separately
  Fix Windows build
  Move all contributed profiles to an "Other" manufacturer
  Bump version
  Make the Infill buttons and support checkboxes in Simple mode functional
  Fix the variants menu so the variants actually get added
  Try to add a page when the name of a wizard page is unknown
  Catch any exception that happens while trying to eject
  Set High Quality to 0.08 layer height
  Capture stdout and stderr on Windows to prevent py2exe messages
  Add missing Ulti and Low quality profiles
  JSON: bugfix/feat: wall_line_width defaults to nozzle size and wall_line_count computed properly
  When you click [Manage Printers..] it brings you to the right page
  Delay showing the Add Machine dialog until after the main window is properly shown
  Adds a smaller cross icon
  Use the job name for saving files
  Update RemovableDrive and USB output devices to use the new file_name parameter
  ...
2015-10-01 15:47:18 +02:00
Jaime van Kessel
c21ad3df08 Added checks to prevent nonetype issues
Fixes Ultimaker/Cura#417
2015-09-22 11:56:13 +02:00
Hajo Nils Krabbenhöft
24fc2d8154 add _current_layer_jumps 2015-09-20 22:58:07 +02:00
Jaime van Kessel
4639be180d Layerview now uses ctrl+ arrow to move through layers (just like legacy cura) 2015-09-14 15:18:45 +02:00
Jaime van Kessel
d72ec68d8c Added more checks to LayerViewProxy
Contributes to asana issue 49817948603866
2015-09-14 14:00:05 +02:00
Jaime van Kessel
a0a0f3ea01 Added exception handling to layerview
Fixes Ultimaker/Cura#362
2015-09-10 11:16:55 +02:00
Tamara Hogenhout
4a9bf2b4d6 adds/adapts translation context markers
all nescessary in folder: Cura/plugins

Contributes to: issue CURA-116
2015-09-08 15:26:49 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
2015-09-01 15:44:19 +02:00
Tamara Hogenhout
534c277b00 15.10 restyling of the layerview slider
Adds a textfield to the handle for per layer selection and removes the display of the min- and maxvalue

Contributes to: issue CURA-60
2015-08-25 12:20:13 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00
Arjen Hiemstra
a7780d9e42 Update all plugin metadata to specify API version 2015-07-31 17:07:33 +02:00
Jaime van Kessel
c6f5ceaf56 LayerData now works by using decorators 2015-07-13 14:03:40 +02:00
Tamara Hogenhout
ae89ef37c0 Enlarge the zone where you can use scrolling to look trough the layer mode.
Also make it more visible

fixes #118
2015-07-09 16:27:31 +02:00
Tamara Hogenhout
53a94c23e1 Adds layer count
Brings back the layer count, the min & max. And it does not display these untill Cura is done slicing.

Fixes #117
2015-07-08 18:01:03 +02:00