GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 21:59:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,631 Commits 287 Branches 260 Tags
Commit Graph

59 Commits

Author SHA1 Message Date
fieldOfView
66f8a62e6c Move busy handling into LayerPass and cleanup 
CURA-1601
 2016-09-07 14:01:59 +02:00
fieldOfView
17b12b9048 Move layer data into LayerPass for cleaner access 
CURA-1601
 2016-09-07 14:01:58 +02:00
fieldOfView
2c35f0196d Code cleanup 
CURA-1601
 2016-09-07 14:01:10 +02:00
fieldOfView
b090eab221 Use renderpass to render layers above ghosts 
CURA-1601
 2016-09-07 14:01:09 +02:00
fieldOfView
90a1f5f8ed Revert "Revert "Show "ghosts" for all objects on the buildplate in layerview"" 
This reverts commit 0f9b989ae86fa319269a715d960b533f2a51c09d.
 2016-09-07 14:01:09 +02:00
fieldOfView
aa689dc2fb Fix layerview for grouped objects 
The "ghosts" would be rendered over grouped objects, thereby making them not visible. Note that this quick fix comes at the price of slightly "muddying" all the layerview colors. A better fix was proposed here (but it is not yet working correctly): https://github.com/Ultimaker/Cura/pull/906

CURA-2246
 2016-09-01 13:34:18 +02:00
fieldOfView
46ee6c0713 Show "ghosts" for all objects on the buildplate in layerview 
Simpler implementation that works.
CURA-1601
 2016-08-30 13:27:19 +02:00
fieldOfView
0f9b989ae8 Revert "Show "ghosts" for all objects on the buildplate in layerview" 
This reverts commit b765855ba5d3bb96d7113e485e34c4e8b8f3cd49.
 2016-08-02 12:30:22 +02:00
fieldOfView
b765855ba5 Show "ghosts" for all objects on the buildplate in layerview 
CURA-1601
 2016-08-01 17:33:00 +02:00
Jaime van Kessel
102a0793e6 Codestyle & documentation 2016-07-29 17:38:35 +02:00
Jaime van Kessel
b9a1d50e05 Added option to only display top layers in layerview 2016-07-29 13:17:41 +02:00
Jaime van Kessel
8d59d7187f Deleting old toplayer data is now only done when new data is complete. 
This prevents the pretty annoying blinking behavior that we had before
 2016-07-29 13:01:03 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
Johan K
bbd49cee85 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-12 00:37:27 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small. 
CURA-1671
 2016-07-07 16:23:27 +02:00
Johan Kristensen
41503d7d5b Adapting code to merge of simple_convex_hull and code cleanup. 2016-06-28 23:50:00 +02:00
Johan K
f184baadf0 Formulate layerview logic using numpy to speed up. Also changed layer data packets from engine to make it possible. 2016-06-28 22:29:29 +02:00
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
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
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
Jaime van Kessel
41d00af345 Moved timer back again, as arjen fixed the real issue 2016-03-01 10:57:29 +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
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
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
Arjen Hiemstra
435186e6d1 Fix convex hull and layer view rendering 2015-12-14 13:56:32 +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
a0a0f3ea01 Added exception handling to layerview 
Fixes Ultimaker/Cura#362
 2015-09-10 11:16:55 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +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
Arjen Hiemstra
6b5c3d5878 Display progress information during processing of layer data 
Contributes to Asana issue 38547857084327
 2015-06-24 11:59:10 +02:00
Arjen Hiemstra
995b76fad9 Implement rendering the top 5 layers solid and with infill 
Fixes #52
 2015-06-16 13:20:22 +02:00