3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-10 08:17:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
12148 commits 302 branches 270 tags 770 MiB
Commit graph

3150 commits

Author SHA1 Message Date
Lipu Fei
b5904cd239 Fix code style 
CURA-4501
 2017-10-30 15:43:40 +01:00
Mark
ca8127c047 Fixed code comments 
CURA-4501
 2017-10-30 15:43:39 +01:00
Mark
9aebb395ab Refactor and cleanup 
CURA-4501
 2017-10-30 15:43:39 +01:00
Mark
b45e44b388 Add useragreement screen on first run of Cura 
CURA-4501
 2017-10-30 15:43:39 +01:00
Ghostkeeper
3a9c8d16a2
Fix remaining references to instance_container._id 
These must've slipped through the cracks.

Contributes to issue CURA-4243.
 2017-10-30 15:07:46 +01:00
Lipu Fei
e6e61e9a3c
Merge pull request #2697 from Ultimaker/feature_add_user_agreement 
Feature add user agreement
 2017-10-30 14:50:52 +01:00
fieldOfView
7a9dda4022 Disable jogging for UM3 
NetworkPrinterOutputDevice does not have the API to control jogging
 2017-10-30 14:46:31 +01:00
Aleksei S
22aaf64b63 Simplified version for validation need to show user agreement 
CURA-4501
 2017-10-30 14:42:46 +01:00
Lipu Fei
0096fe0de3 Fix project loading to handle "Not Supported" quality profiles 
CURA-4451
 2017-10-30 12:54:21 +01:00
Lipu Fei
b6dd87081c Add upgrade script for 3.0 to 3.1 
CURA-4451

- Add upgrade script for 3.0. to 3.1
- Upgrade old stack files so they will use "empty_quality" as the
  "Not Supported" quality profile.
- Increase SettingVersion to 4
 2017-10-30 12:45:25 +01:00
Lipu Fei
c0f1af94ab Show Add Machine dialog after User Agreement dialog is closed 
CURA-4501
 2017-10-30 10:33:50 +01:00
Lipu Fei
85f7b1ac03 Fix code style 
CURA-4501
 2017-10-30 10:32:46 +01:00
Mark
0bdc1aad00 Fixed code comments 
CURA-4501
 2017-10-29 09:04:23 +01:00
Mark
8bfd10f9aa Refactor and cleanup 
CURA-4501
 2017-10-28 20:29:26 +02:00
Mark
910386eaf7 remove unused import 2017-10-28 15:43:26 +02:00
Mark
5db0fc7785 Add useragreement screen on first run of Cura 
CURA-4501
 2017-10-28 15:43:01 +02:00
Ghostkeeper
8bbb6c1af5
Load and serialize container ID and name properly: not in metadata 
We shouldn't write the name or ID, who are now in the metadata.
Also we should load the name and ID properly from the file.

Contributes to issue CURA-4243.
 2017-10-27 16:50:13 +02:00
Ghostkeeper
a31c39b225
Use setters and getters for name and ID 
Because their implementation changed, these would have been implemented in some other way. Instead I use the getters and setters which are inherited from the parent class and therefore are already updated.

Contributes to issue CURA-4243.
 2017-10-27 16:35:58 +02:00
Ghostkeeper
7ac3c1446b
Make ignored metadata keys a set 
It needs to be a set now for Uranium.

Contributes to issue CURA-4243.
 2017-10-27 16:25:52 +02:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Lipu Fei
fe70e19089 Reset extruder numbers whose values are no longer valid 
CURA-4176

After the user changes the number of extruders for a machine, some
extruder number settings may not have valid values any more. These
settings need to be reset.`
 2017-10-27 10:59:03 +02:00
ChrisTerBeke
152f6f8405 More profiles model refactoring - CURA-4482 2017-10-26 11:51:24 +02:00
ChrisTerBeke
c54dc0a723 Merge branch 'master' into container_stack_improvements 2017-10-26 10:19:45 +02:00
Diego Prado Gesto
87ba4056ee CURA-4485 Minor changes 2017-10-25 13:55:30 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer 
Also fixes code style
 2017-10-25 11:52:43 +02:00
Ghostkeeper
9ad0fd2b83
Remove dash if plug-in author is empty 
Contributes to issue CURA-4477.
 2017-10-25 11:28:41 +02:00
Aleksei S
d2873dc65a The view class were not added after to the rendering list after changing them 
CURA-4062
 2017-10-25 11:06:12 +02:00
Aleksei S
0f807cd03e Wfter changing the view the old view is removed from rendering 
CURA-4062
 2017-10-24 17:38:06 +02:00
Diego Prado Gesto
6dfd04928f CURA-4485 Activate configuration option disabled in printers within a 
cluster.
Just allow when there is a cluster with just one printer.
 2017-10-24 14:51:35 +02:00
Jack Ha
d8e1b5b9b4 CURA-4481 add setting Remove Empty First Layers 2017-10-24 11:25:12 +02:00
fieldOfView
a9f2ad7ca3 Hide manual controls for outputdevices that don't support it 2017-10-24 11:03:51 +02:00
ChrisTerBeke
c132300fd5 start 2017-10-23 13:56:26 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible 
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
 2017-10-20 15:09:45 +02:00
ChrisTerBeke
64bcf4b44d Remove debug log when XML material file contains unused property 2017-10-20 10:22:09 +02:00
Ghostkeeper
7745113704
Re-use stack variable 
We're creating the variable but then requesting the 0th element from the list each time... That can be more logical and more efficient.

Contributes to issue CURA-4243.
 2017-10-19 15:32:21 +02:00
ChrisTerBeke
795eda64e3 Merge branch 'master' into CURA-4248_BAM 2017-10-18 15:08:51 +02:00
ChrisTerBeke
78ba3c3aa0 Move BAM equations to BAM quality profiles as they are very specific - CURA-4248 2017-10-18 13:51:06 +02:00
Ghostkeeper
b119119ed2
Merge branch '3.0' 2017-10-18 13:09:38 +02:00
Ghostkeeper
4d0c0f606e
Use new version for downloading plugins 2017-10-17 16:44:27 +02:00
ChrisTerBeke
c0903f539e Merge branch 'master' into CURA-4248_psp 2017-10-17 13:07:22 +02:00
ChrisTerBeke
91589ed29d Add surface energy property to get correct behaviour - CURA-4248 2017-10-17 13:03:29 +02:00
Diego Prado Gesto
40f548ba99 Merge branch 'CURA-4252_improve_zeroconf_service' 2017-10-17 13:02:58 +02:00
ChrisTerBeke
205ac7c50c Merge branch 'master' into CURA-4253_psp 2017-10-16 17:16:00 +02:00
ChrisTerBeke
a444e5c883 update material xml parser to support psp values - CURA-4253 2017-10-16 15:55:46 +02:00
Lipu Fei
f4718162d3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 15:01:15 +02:00
Lipu Fei
8ef918829f Fix quality profile upgrade for UM2 family 2017-10-16 15:00:29 +02:00
Lipu Fei
38b9df80f3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 14:54:40 +02:00
Lipu Fei
aa7b456594 Fix custom quality profile upgrade for UM2 family 
The custom quality profiles for the UM2 family used to be saved as
profiles for "fdmprinter". They now should be updated to set for
"ultimaker2".
 2017-10-16 13:59:22 +02:00
alekseisasin
eebe4028ff Merge pull request #2610 from fieldOfView/fix_machinesettings_backend_crash 
Fix crash when exiting Machine Settings
 2017-10-16 13:46:03 +02:00
Lipu Fei
b55efdd70e Remove timeout = 0 for get_service_info 
CURA-4252
 2017-10-16 10:36:14 +02:00