3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
20084 commits 307 branches 272 tags 787 MiB
Commit graph

20084 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
c75b83be21
Resolve circular imports 
Can't import CuraApplication because we create instances of IntentManager from the IntentsModel which is created in CuraApplication.

Contributes to issue CURA-6597.
 2019-07-04 09:08:15 +02:00
Ghostkeeper
36971f0058
Give smooth an intent and increment setting_version 
Smooth needs an intent because otherwise it gets the default intent. None of the default intents are allowed to have files.

Contributes to issue CURA-6597.
 2019-07-03 16:52:33 +02:00
Ghostkeeper
3f29bce263
List intents per category 
This is the naive one. We want to list the default intents multiple times, once for every quality level.

Contributes to issue CURA-6597.
 2019-07-03 16:51:47 +02:00
Lipu Fei
5620ee811f
Merge pull request #5959 from Ultimaker/feature_intent_per_quality 
Feature intent per quality
 2019-07-03 14:11:20 +02:00
Lipu Fei
3a9e97156e Merge commit 'b463b0c35b' into feature_intent_per_quality 2019-07-03 10:54:21 +02:00
Lipu Fei
35e1426231
Merge branch 'feature_intent' into feature_intent_per_quality 2019-07-03 10:52:08 +02:00
Remco Burema
af467d4e16 Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality 2019-07-02 14:44:56 +02:00
Remco Burema
270cf28ea1 Fix comments code review IntentManager. 
part of CURA-6091
 2019-07-02 14:43:56 +02:00
Lipu Fei
b463b0c35b Fix CuraVerison.py configuration 2019-07-02 14:19:56 +02:00
Jaime van Kessel
be1fd2e003 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent_per_quality 2019-07-02 13:52:46 +02:00
Jaime van Kessel
0cb83d2c92 Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent 2019-07-02 13:51:52 +02:00
Lipu Fei
43baca1545 Hardcode Cura SDK version with each release 2019-07-02 13:33:18 +02:00
Remco Burema
50cbf71f68 Fixed test 'selectIntent' for IntentManager-tests. 
part of CURA-6091
 2019-07-02 13:15:18 +02:00
Ghostkeeper
a4093aa6fd
Merge branch 'type_fix_build_volume' 2019-07-02 10:37:22 +02:00
Remco Burema
fee6ec417f Merge branch 'master' into feature_intent_per_quality 2019-07-02 10:21:20 +02:00
Remco Burema
ffe9515236 Refactor: Split up single test method in smaller ones. 
part of CURA-6091
 2019-07-02 08:57:40 +02:00
Remco Burema
f5b0cae554 Prime-brim calculation needs adhesion extruder, not just any. 2019-07-02 07:46:21 +02:00
Jaime van Kessel
bc05587220 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-01 17:29:51 +02:00
Jaime van Kessel
20357dabb3 Merge branch 'feat_line_spacings' of https://github.com/BagelOrb/Cura 2019-07-01 17:19:26 +02:00
Ghostkeeper
ea93490c45
Fix crash when loading multi-extrusion print 
Because getProperty needs a property to get.
 2019-07-01 14:56:03 +02:00
Jaime van Kessel
a7d419f497 Fix deprecation decorator breaking the getExtruder function 2019-07-01 11:18:54 +02:00
Jaime van Kessel
d48b173118 Merge branch 'master' of github.com:Ultimaker/Cura 2019-07-01 11:15:53 +02:00
Jaime van Kessel
6544c123a4 Add camera view selector to the view application menu 2019-07-01 11:15:26 +02:00
Ghostkeeper
17e86a28b7
Guard against broken import 2019-07-01 10:58:08 +02:00
Ghostkeeper
f86cf06b88
Add typing 2019-07-01 10:57:08 +02:00
Jaime van Kessel
db3d6aae83 Add boundingbox test for buildvolume 2019-07-01 09:55:04 +02:00
Jaime van Kessel
6136f5a2f2 Further simplify the build volume code 2019-06-28 15:22:58 +02:00
Jaime van Kessel
691d106719 Remove old unused code 2019-06-28 15:09:08 +02:00
Jaime van Kessel
f329d7aed9 Made typing hint a bit more specific 2019-06-28 15:08:46 +02:00
Jaime van Kessel
2133fc78e0 Remove unused code 2019-06-28 15:01:09 +02:00
Jaime van Kessel
47cc87ec47 Add tests for calculating the bed adhesion size 2019-06-28 14:17:18 +02:00
Jaime van Kessel
b240ede21c Add test for computing the static disallowed areas 2019-06-28 13:45:05 +02:00
Jaime van Kessel
efc6ef2905 Add missing typing 2019-06-28 13:44:47 +02:00
Remco Burema
810fee37eb Start to test other IntentManager functions. 
Very rudimentary at the moment, need to split the method into 3, and make a class for the setup.
This also uncovered that the currentAvailableIntents doesn't (unless the global stack is missing) retrun any default intents, while currentAvailableIntentCategories does do that.
Since it's not clear how we're going to handle that right now, I made a TODO in the code, which of course will have to be fixed before this/these branch/es are merged.

part of CURA-6091
 2019-06-28 12:10:39 +02:00
Remco Burema
6b918dbd1d Fix typing in IntentCategoryModel. 2019-06-28 12:04:04 +02:00
Remco Burema
2843fc903b First OK test-case for 'currentAvailableIntents'. 
part of CURA-6091
 2019-06-28 11:09:42 +02:00
Remco Burema
e8a1c68d92 Added (partial) test for 'currentAvailableIntents'. 
part of CURA-6091
 2019-06-27 17:07:26 +02:00
Lipu Fei
67f10d8bc3
Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting 
Add deprime settings
 2019-06-27 16:09:36 +02:00
Ghostkeeper
fe0fcc6eec
Change human-readable names of renamed settings too 
Forgot about those.

Contributes to issue CURA-6329.
 2019-06-26 16:43:11 +02:00
Ghostkeeper
faf256b2f0
Rename deprime settings with the new name 
These have been renamed for greater clarity. We also have to rename them on this side now.

Contributes to issue CURA-6329.
 2019-06-26 16:41:51 +02:00
Remco Burema
ad4e78c8e4 Merge branch 'master' into feature_intent_per_quality 2019-06-25 18:09:30 +02:00
Remco Burema
9e3f3c194c Small refactor: Dont retrieve global-stack twice. 
Part of CURA-6091
 2019-06-25 18:00:58 +02:00
pkuiper-ultimaker
67191c4040
Merge pull request #5863 from Ultimaker/CURA-6414_no_blob_for_one_at_a_time 
Don't prime-blob when print-sequence is one-at-a-time. [CURA-6414]
 2019-06-25 17:44:51 +02:00
Ian Paschal
48a69afbcf
Merge pull request #5912 from Ultimaker/cloud-print-job-actions 
CS-134: Print job actions via cloud
 2019-06-25 15:52:10 +02:00
Lipu Fei
934248e218
Merge pull request #5578 from curso007/master 
Adding Geeetech A30 & FLSUN QQ-S machine definitons
 2019-06-24 13:27:03 +02:00
Lipu Fei
92d029d18f
Update flsun_qq_s.def.json 2019-06-24 13:22:18 +02:00
Lipu Fei
7bd297bef5
Fix setting_version 2019-06-24 13:21:04 +02:00
Jaime van Kessel
d9358d56cc Update issue templates 
Added a bit more clarification to the issue template.
 2019-06-24 13:20:05 +02:00
Lipu Fei
544e7a1614
Rename Geeetech_A30.def.json to geeetech_a30.def.json 2019-06-24 13:20:04 +02:00
Lipu Fei
6a7da56057
geeetech_a30.def.json 
Fix geeetech_a30.def.json
 2019-06-24 13:19:24 +02:00