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

5199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Simon Edwards
c902fef372 Removed a dead line. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-27 14:16:25 +02:00
Jaime van Kessel
5a49457bfe Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 14:13:34 +02:00
Jaime van Kessel
829d341f7f When import multi extrusion profile, they now all get the same name 
CURA-2462
 2016-09-27 14:13:06 +02:00
Simon Edwards
4bb6ddaf28 Correctly update the quality profiles in the extruders when changing quality changes, taking the different materials into account. 
Contributes to CURA-2320 Filtering Quality-Changes profiles on material?
 2016-09-27 14:11:19 +02:00
Jaime van Kessel
fc69b110f3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-27 14:06:41 +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
Ghostkeeper
f4d13713a2
Replace progress bar with actual ProgressBar element 
QML has this progress bar that has more functionality than the progress bar we're using. We need an indeterminate state for the pausing and resuming states, so instead of implementing that myself, I'm using the QML ProgressBar element.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
3b2c173cd6
Keep showing progress while pausing/resuming 
I've chosen the blue 'progress' colour to be displayed while pausing and resuming.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Ghostkeeper
22f0a2dabf
Add TODOs for text to be added after string freeze 
We currently have a string freeze, so we can't add these cases here.

Contributes to issue CURA-2060.
 2016-09-27 14:03:49 +02:00
Jaime van Kessel
9e47a87375 If no quality container can be found, use empty instead 
CURA-2462
 2016-09-27 13:26:44 +02:00
Jaime van Kessel
a43713e27f Offset distances are now not added, but used if they are larger 
CURA-2407
 2016-09-27 11:09:14 +02:00
Jaime van Kessel
5ac609edc9 Settings are now obtained from right extruder 
CURA-2407
 2016-09-27 09:36:04 +02:00
Jaime van Kessel
dccf18c4e7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 17:23:20 +02:00
Jaime van Kessel
8e07a94d68 Use the right settings for wipe & avoid distances 
CURA-2407
 2016-09-26 17:22:49 +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
Jack Ha
962381be59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 16:06:47 +02:00
Jack Ha
e038016ead Comment. CURA-2232, CURA-2274 2016-09-26 16:06:36 +02:00
Arjen Hiemstra
c92dfc8af3 Remove "ExtraBold" font variant from Theme 
For some reason, on OSX ExtraBold seems to replace Regular font style. Since
it is unused anyway, just drop the ExtraBold for now.

Contributes to CURA-879
 2016-09-26 15:23:36 +02:00
Jaime van Kessel
4299dbb90b Force refresh display when activating profile 
CURA-2448
 2016-09-26 15:22:23 +02:00
Jaime van Kessel
87b0063266 Ooze & draft shield distances are now only used if greater than brim / skirt 
CURA-2407
 2016-09-26 13:51:42 +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
Jack Ha
f3f1bf664a Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-26 11:26:13 +02:00
Jack Ha
1cc5d699c4 Update build volume (including prime tower visualization) after quality change. CURA-2274 and CURA-2232 2016-09-26 11:26:03 +02:00
fieldOfView
3d7680a983 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-26 10:58:57 +02:00
fieldOfView
3d61b7fb75 Prevent signal storm when changing a property 
Contributes to CURA-2429
 2016-09-26 10:58:15 +02:00
Jack Ha
4547cfe504 Introduced resolveOrValue which fixes resolvement with dependencies for the most part. CURA-2232 2016-09-26 10:37:44 +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
Aldo Hoeben
281f9e18a3 Merge pull request #994 from Ultimaker/optimise_machine_switch 
Speed up switching between multiextrusion machines
 2016-09-23 12:01:17 +02:00
fieldOfView
f23af4f295 Optimise icons 
Mostly done using svgo:
svgo -f resources/themes/cura/icons --pretty --enable=removeDimensions
 2016-09-23 11:50:50 +02:00
fieldOfView
774eadc7d1 Recolor toolbar icons 
While cleaning up the theme icons I discovered that the toolbar icons were incorrectly relying on the color specified in the icon.
 2016-09-23 10:40:49 +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
Jaime van Kessel
0d8dd08830 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-22 16:38:20 +02:00
Jaime van Kessel
0b6c196659 Moved getAllExtruderValues to extruder manager 
CURA-2407
 2016-09-22 16:36:27 +02:00
Ghostkeeper
8bf8a483ec
Code style: Spaces around binary operators 
Contributes to issue CURA-2407.
 2016-09-22 16:07:48 +02:00
Jaime van Kessel
e0109a1857 Infill wipe distance and travel avoid distance are now also taken into account 
CURA-2407
 2016-09-22 16:00:18 +02:00
Jaime van Kessel
2820ef6236 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-22 15:42:43 +02:00
Jaime van Kessel
4141a87887 BuildVolume now takes the extra line by extra extruders into account 
CURA-2407
 2016-09-22 15:42:04 +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
fieldOfView
10af3ee5ab More defensive coding to prevent division by zero 
CURA-2443
 2016-09-22 15:16:39 +02:00
Jaime van Kessel
4e3384e640 Merging with groups no longer causes devision by zero 
CURA-2443
 2016-09-22 14:33:01 +02:00
Jaime van Kessel
7a85430f70 Merging no longer crashes if node has no meshdata 
CURA-2443
 2016-09-22 14:25:00 +02:00
Jaime van Kessel
4792aadc3a Platform collision no longer crashes if node has no parent 
CURA-2443
 2016-09-22 14:11:44 +02:00
fieldOfView
847d6429d0 Speed up switching between multiextrusion machines 
ExtruderManager.addMachineExtruders is supposed to create a cache, but this cache was always rebuilt because of an indentation error.
 2016-09-22 13:49:18 +02:00