3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-03-17 16:55:31 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
16649 commits 370 branches 340 tags 770 MiB
Commit graph

4445 commits

Author SHA1 Message Date
ChrisTerBeke
a9fedb4f66 Restore NetworkedPrinterOutputDevice for now 2018-11-26 15:05:53 +01:00
Marijn Deé
579522857a Fix the code-style test 2018-11-26 14:42:50 +01:00
ChrisTerBeke
014b1d6e4e test 2018-11-26 13:45:37 +01:00
ChrisTerBeke
21c81603b4 Use application singleton instead of locally cached application 2018-11-26 13:33:14 +01:00
ChrisTerBeke
620ba8f21d Merge branch 'master' into cloud-output-device 2018-11-26 11:17:39 +01:00
Ghostkeeper
5469613c17
Don't fail the samefile check if second file didn't exist 
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
 2018-11-26 09:40:14 +01:00
Ghostkeeper
c9eb57cead
Don't copy preference file to the same location 
This crashes Cura on start-up for some people.
 2018-11-26 09:32:59 +01:00
ChrisTerBeke
1adf1096a3 Merge branch 'master' into cloud-output-device 2018-11-23 14:17:26 +01:00
ChrisTerBeke
2fc5061c41 Fix some PR comments, cleanup imports 2018-11-23 14:11:43 +01:00
ChrisTerBeke
8453cd693e
Make QNetworkReply optional 2018-11-21 00:04:34 +01:00
ChrisTerBeke
8ad8489af0
Fix returning reply on postFormWithParts 2018-11-21 00:03:36 +01:00
ChrisTerBeke
c7bb6931f4
Refactor networked output device 
All networking related stuff is moved to a separate class called NetworkClient for reusability.
As example it is now also used in the WIP CloudOutputDeviceManager to clean up network calling there.
 2018-11-20 23:44:28 +01:00
ChrisTerBeke
4e8979334e
Switch Ultimaker Account OAuth2 client 
The new client has access to more permissions and is labeled as "Ultimaker Cura" instead of "Cura Backups Plugin".
Also removes `self._cloud_api_root` as that's not used anymore now that `self._oauth_root` is used for the redirect URLs.
 2018-11-20 19:18:48 +01:00
ChrisTerBeke
228325eb89
Add CloudOutputDeviceManager, test implementation 2018-11-19 21:59:57 +01:00
ChrisTerBeke
951a21ead7 Merge branch 'master' into tests-for-um3networkplugin 2018-11-19 10:58:07 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +01:00
Jaime van Kessel
93bd5fee53 Fix wrong push free shadow for one at a time. 
It was applying the size twice. CURA-5822
 2018-11-16 13:44:46 +01:00
Jaime van Kessel
401a6b5f8b
Merge pull request #4794 from fieldOfView/fix_adhesion_type_error 
Fix adhesion type error during startup
 2018-11-16 11:24:29 +01:00
fieldOfView
b671a3153a Catch an error getting an extruder value before extruders are added to the global stack 2018-11-14 14:21:39 +01:00
fieldOfView
66c3cc9204 Prevent an error during start up 2018-11-14 14:20:42 +01:00
alekseisasin
103d79c89d
Merge pull request #4781 from Ultimaker/fix_legacy_profile_importer 
Fix legacy profile importer
 2018-11-14 13:00:39 +01:00
Remco Burema
5f4e3948d3 Merge branch 'master' into CURA-5840-make-plugin-sdk-use-semantic-versioning 2018-11-13 13:16:22 +01:00
Ghostkeeper
6d1b64465a
Fix URL in error message 
Contributes to issue CURA-5929.
 2018-11-12 12:50:18 +01:00
Ghostkeeper
27aff4e5da
Fix typing issues 
Because this function now has typing, it's raising a load of issues with it.

Contributes to issue CURA-5929.
 2018-11-12 12:48:49 +01:00
Ghostkeeper
9c555bf67f
Add typing and always add error message if loading failed 
There were some places where it would return None. Then in the QML it would give a QML error that the null object has no dictionary items.

Contributes to issue CURA-5929.
 2018-11-12 11:02:43 +01:00
Ghostkeeper
161b200a67
Fix typo in label ID 2018-11-09 11:41:43 +01:00
Diego Prado Gesto
3ab8568a87
Merge pull request #4679 from fieldOfView/fix_create_new_material 
Use preferred material instead of generic PLA when creating a new material
 2018-11-08 17:16:36 +01:00
Lipu Fei
75f2f40534 Make API version configuration for Application 
CURA-5840
 2018-11-08 12:04:43 +01:00
Lipu Fei
59b8bdec54
Merge pull request #4678 from fieldOfView/fix_networkprinter_post 
Fix type error in NetworkedPrinterOutputDevice.post
 2018-11-08 11:02:57 +01:00
Diego Prado Gesto
98534533a2 Merge branch '3.6' 2018-11-07 11:27:31 +01:00
Remco Burema
94924783b6 Defensive coding: Old file-extensions may have been saved as all-caps. [CURA-5896] 2018-11-06 17:16:29 +01:00
Lipu Fei
3db85b2493 Try to strip extra curaproject extensions 
CURA-5896
 2018-11-06 13:48:22 +01:00
Lipu Fei
ce517f1517 Merge from 3.6 2018-11-06 11:26:09 +01:00
Lipu Fei
fad8ad5d47
Merge pull request #4730 from Ultimaker/CURA-5898-duplicating-material-results-in-not-supported-warning 
Make quality manager also include profiles with same GUID in fallback.
 2018-11-06 11:23:10 +01:00
Lipu Fei
9c9e81b30c Move InstanceContainer import into type checking closure 
CURA-5898
 2018-11-06 11:04:18 +01:00
Jaime van Kessel
93467dc29f Ensure that weeding out the duplicates doesn't mess up the order 
CURA-5898
 2018-11-05 17:33:12 +01:00
Ghostkeeper
e2e08879d7
Merge branch '3.6' 2018-11-05 15:42:06 +01:00
Lipu Fei
3f1e0cc610 Fix delayed convex hull recomputation 
CURA-5896

If the current tool operation is still active, we need to delay the
convex hull recomputation after the tool becomes inactive.
 2018-11-05 14:25:18 +01:00
Lipu Fei
93afaf64c6 Strip the old "curaproject" extension from project name 
CURA-5896
 2018-11-05 13:28:21 +01:00
Jaime van Kessel
412e5977a6 Fix type issues 2018-11-05 11:30:02 +01:00
Jaime van Kessel
eded0f0297 Make quality manager also include profiles with same GUID in fallback. 
This ensures that if a (duplicated) material does not have a generic variant, that
the material it was copied from will be added to the fallback list.

CURA-5898
 2018-11-05 11:17:39 +01:00
Diego Prado Gesto
a39449c48b
Merge pull request #4704 from Ultimaker/CURA-5842_update_update_text 
CURA-5842 Set CuraApplication display name
 2018-11-02 16:03:10 +01:00
Ghostkeeper
2852674499
Adjust state of API call 
It can just be an arbitrary string, as long as it is kept consistent I suppose.

Discovered during test of CURA-5784.
 2018-11-01 15:50:18 +01:00
Jaime van Kessel
90726ecbff Fix situation where the setting visibility model could cause a crash. 
Yay for crash logging
 2018-11-01 15:28:08 +01:00
Lipu Fei
ff4dfcf9a6 Make Cura app display name configurable 
CURA-5842
 2018-11-01 12:15:00 +01:00
Lipu Fei
cb24549d7d Set CuraApplication display name 
CURA-5842
 2018-11-01 08:29:54 +01:00
Ghostkeeper
779496f846
Don't require MirrorTool, RotateTool, ScaleTool or SimulationView 
This was changed last April without consulting the rest of the team. We're reverting it because there is really no reason why these should not be disabled.
 2018-10-31 10:37:25 +01:00
Ghostkeeper
8a52fd2c2c
Document why these plug-ins are required 
For the SimulationView, MirrorTool, RotateTool, ScaleTool and TranslateTool I couldn't really find a reason why this is required, so I can't document it.
 2018-10-31 10:34:26 +01:00
Lipu Fei
02681a5700 Change camera URL to non-optional QUrl 
Otherwise pyqt property will complain when it tries to convert a None to
a QUrl.
 2018-10-29 13:25:23 +01:00
fieldOfView
0c1b3931db Revert "WIP: Add custom CameraView for UM camera feed" 
This reverts commit b00ea4719a.
 2018-10-29 11:18:55 +01:00