GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 23:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,097 Commits 290 Branches 260 Tags
Commit Graph

1295 Commits

Author SHA1 Message Date
Jaime van Kessel
666cba0566 Merge branch 'master-CURA-1445' of https://github.com/thopiekar/Cura 2016-09-28 15:59:49 +02:00
Thomas Karl Pietrowski
df63b2d620 Merge remote-tracking branch 'refs/remotes/origin/master-CURA-1445' into master-CURA-1445 2016-09-27 15:40:16 +02:00
Thomas Karl Pietrowski
ca60e517fa Revert "SliceInfo: Defining container_serialized as empty, before trying to serialize" 
This reverts commit 1fd169c6697f268588733e7a6d65e80d587b51ab.
 2016-09-27 15:39:54 +02:00
Ghostkeeper
4ec380ffd9
Quality-changes now have a quality_type instead of referring to quality 
This field was just renamed, I think for CURA-2320. This updates the name for the upgrade process.

Contributes to issue CURA-844.
 2016-09-27 15:12:29 +02:00
Jaime van Kessel
960a390350 Ensure that the correct properties get set for writing profiles to g-code 
CURA-2462
 2016-09-27 14:05:56 +02:00
fieldOfView
cdba3640a0 Move showing eject success message until after the safe to remove message is hidden 
CURA-2341
 2016-09-26 16:10:57 +02:00
Jaime van Kessel
efd3fc3487 Added check to see if a SceneNode has vertices before adding it 
CURA-2460
 2016-09-26 13:13:31 +02:00
Jaime van Kessel
3f9024aeff Added selftest for all objects in 3mf file 
CURA-2460
 2016-09-26 13:03:45 +02:00
Jaime van Kessel
d7cf65258f Minor codestyle changes 2016-09-26 12:55:17 +02:00
Thomas Karl Pietrowski
10d2d7902e Updating the comment about the "settings" keyword 
Contributes to CURA-1445
 2016-09-24 10:19:26 +02:00
Thomas Karl Pietrowski
db6702fbbc CURA-1445: Sending bundle of serialized data 
After an discussion with the developers at YM, we decided to send all data in one keyword.
So now all data is bundled into a JSON dictionary, where "" is the global_container_stack and it's containers go into the same JSON, too, by using their IDs as keywords.
More on JIRA...

Contributes to CURA-1445

Includes/Fixes #1013
 2016-09-22 18:24:01 +02:00
Thomas Karl Pietrowski
1cda5ae163 Merge remote-tracking branch 'upstream/thopiekar-sliceinfo-hotfix' into master-CURA-1445 2016-09-22 18:14:29 +02:00
fieldOfView
1895cd7062 Fix layerview shade for single extrusion printers 
CURA-2025
 2016-09-22 17:16:08 +02:00
fieldOfView
c3d8b6fb8c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-22 16:52:41 +02:00
fieldOfView
e9d44a07cc Fix up layout of Per Model Settings panel 2016-09-22 16:52:29 +02:00
Ghostkeeper
15792b8f09
Code style: Spaces around binary operators 
Also the equal-sign in key-word arguments, though that goes against PEP8, but that's in our code style documentation.

Contributes to issue CURA-2319.
 2016-09-22 15:33:17 +02:00
Thomas Karl Pietrowski
1fd169c669 SliceInfo: Defining container_serialized as empty, before trying to serialize 
While discussing with Jordy about the code I just found a problematic case where sending slice info could fail.
(This shouldn't happen, but..) If the first container is not serializable, then the for-loop will crash because container_serialized is not set for the if clause.
Additionally the if-clause is at the moment useless, because it is always true, because the content of container_serialized gets never resetted.

Contributes to CURA-1445
 2016-09-22 11:43:21 +02:00
Jaime van Kessel
89c78fa2da Increased difference between display color for active/inactive extruder 
CURA-2025
 2016-09-22 11:41:52 +02:00
fieldOfView
cd483882eb Shade objects printed with the non-active extruder in solid view 
Aid in learnability of CURA-2025 by fixing CURA-2117
 2016-09-22 07:44:59 +02:00
Arjen Hiemstra
baa24370f6 Force garbage collection during ProcessSlicedLayersJob 
For some reason, Python likes to hold on to LayerData and friends.
Forcing a GC run here will clean them up properly.

Contributes to CURA-2406
 2016-09-22 00:57:44 +02:00
Arjen Hiemstra
8e5183bad4 Ensure we remove ProcessLayersJob once it has finished 
Since it holds on to a fairly large amount of data.

Contributes to CURA-2406
 2016-09-22 00:57:43 +02:00
fieldOfView
57cd7f43db Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-21 21:22:00 +02:00
fieldOfView
9300489796 Shade layerview elements printed with non-active extruder(s) 
CURA-2025
 2016-09-21 21:21:20 +02:00
Tim Kuipers
d8b1486637 doc: better documentation of limit_to_extruder and resolve properties in the JSON (CURA-2308) 2016-09-21 17:54:47 +02:00
Ghostkeeper
3f85ac264c
Properly serialise the machine instance name 
Otherwise we get spaces and unescaped plusses in the file name of the user profile.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Ghostkeeper
ebb9507083
Add extension to new file 
The upgrade plug-in can do this because he know that he's upgrading to version 2.3.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Ghostkeeper
7d41c1dcb3
Give canonical name to user settings 
All user profiles are named Current settings, so we should just give it the same name as well.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Ghostkeeper
d962cad347
Ensure directory exists to store user profile in 
Create it if it doesn't exist. Also fix up the directory to be absolute instead of relative.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Ghostkeeper
c1a593c3d8
Create new user profile upon upgrading machine instance 
This defines a new configuration type: 'user', for the user profile.

Contributes to issue CURA-844.
 2016-09-21 17:34:22 +02:00
Jaime van Kessel
a94d98dfed X3D reader no longer creates critical exceptions in the rest of cura 
CURA-2083
 2016-09-21 17:28:38 +02:00
Jaime van Kessel
b7351a56e4 Added forcefull property changed if perobjectsettings extruder was changed 
CURA-2319
 2016-09-21 15:07:37 +02:00
Jaime van Kessel
c13003c960 Switching between stacks now ensures that right value is used for perobject 
CURA-2319
 2016-09-21 14:15:48 +02:00
Jaime van Kessel
ddc4c73f8b Updated documentation for perobject visiblity 
CURA-2319
 2016-09-21 13:56:02 +02:00
Jaime van Kessel
6b613fd86b If the stack number is 0 it's now correctly used by perobject settings 
CURA-2319
 2016-09-21 13:37:41 +02:00
Jaime van Kessel
0aad5ef5ed Prevent exceptions when spine is empty 
CURA-2083
 2016-09-21 11:33:25 +02:00
Jaime van Kessel
48fc957695 We now throw an exception when trying to read legacy profile when multi extrusion machine is selected 
CURA-2421
 2016-09-21 09:45:05 +02:00
Jaime van Kessel
426b48323f Merge branch 'feature_layerview_ghosts' of github.com:Ultimaker/Cura 2016-09-20 13:32:58 +02:00
Jaime van Kessel
a684e4def9 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-20 13:12:59 +02:00
Jaime van Kessel
cf06a918a8 Per object tool now also triggers recenter 
CURA-2401
 2016-09-20 13:12:27 +02:00
Ghostkeeper
bc6e7dd24e
Merge branch 'sevaa-feature_x3d_file_format' 2016-09-20 11:49:39 +02:00
Ghostkeeper
d3a9b349d1 Merge pull request #999 from Ultimaker/thopiekar-CURA-1445-use-HTTPS-again 
[CURA-1445] SliceInfo: Using HTTPS again
 2016-09-20 10:44:34 +02:00
fieldOfView
4911eaed00 Fix merge mistakes 
CURA-2299
 2016-09-19 18:30:23 +02:00
fieldOfView
087ad6f472 Move layerdata and busy handling back into LayerView 
This reverts commits 17b12b904809cae093aa59cfdd2e5958978eb6e0 and 66f8a62e6c1cf376ab6fb089a8d4911fc311e4b0.

# Conflicts:
#	plugins/LayerView/LayerPass.py
#	plugins/LayerView/LayerView.py
 2016-09-19 17:59:24 +02:00
fieldOfView
155fe326b7 Remove unnecessary bools 
CURA-2199
 2016-09-19 17:17:03 +02:00
fieldOfView
b05caa8bdc Remove unused uniforms from composite shaders 
CURA-2299
 2016-09-19 17:15:22 +02:00
fieldOfView
7bca6a648a Merge branch 'feature_layerview_ghosts' into ghosts 
# Conflicts:
#	plugins/LayerView/LayerView.py
 2016-09-19 16:43:17 +02:00
Jaime van Kessel
3c0971c375 Legacy profile reader no longer creates profiles for multi-extrusion machines 
CURA-2421
 2016-09-19 16:22:47 +02:00
fieldOfView
a62b0587ad Show correct selected gcode flavor now there are more than 2 options 
CURA-2304
 2016-09-19 14:35:54 +02:00
Jaime van Kessel
799e66c3ac Legacy profiles are now loaded as quality_changes 
CURA-2344
 2016-09-19 14:33:38 +02:00
Aldo Hoeben
9fb4fc3e65 Merge pull request #1000 from thopiekar/master-CURA-1852 
[CURA-1852] Sending material volumina per extruder
 2016-09-19 12:42:56 +02:00