GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 18:15:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,268 Commits 294 Branches 267 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
fdf37c2ab0 Codestyle: Start comments with space 
Forgot this one.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
7ad2fbc95d Codestyle: Start comments with space 
We didn't really discuss this one, but apparently it's in PEP8 so I'd better do it.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
0e92929be4 Codestyle: Wrap doxygen documentation at 80 chars 
Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
41ee575cc1 Correct copyright year 
These files were made in 2016.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
cce642a3e1 Extrapolate settings translations 
It is now in one place. Or rather, two: There is another function to translate only setting names.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
f7be4831b8 Add translation for combing 
Combing was made into an enum instead of a boolean.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
17f4703337 Fix self parameter 
It must have access to self to get the values to store in the file.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
149e873eb6 Pass strings to writing configparser 
When setting fields in configparser, it must be a string. No ints.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
aeecdd9e0e Add self to parameters of function 
Yeah this was a method, not a static method.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
816e94c760 Fix multiple exceptions 
Turns out that this syntax needs to be surrounded in brackets.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
ccf9796b51 Remove superfluous import 
Preferences doesn't exist any more.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
724f9ce010 Return None if config file wasn't correct 
This was actually specified in the original function description.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
0d553c10f1 Fix import of SettingsError 
It is in a submodule.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
9bc5f97902 Implement conversion of profiles 2.1->2.2 
This works more or less the same as for machine instances. The code was copied from version 2.1 of the unserialise function of profiles, and optimised a bit. The output function is written from scratch. It has some code duplication. Maybe we have to do something about that.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
00f356f06e Add translation of speed_support_lines 
This setting had its key changed to speed_support_infill

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
242559bd7e Remove preferences upgrade from 2.1->2.2 
No preferences will need to be upgraded.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
b643fe8fd0 Translucent translation of machine instances 
Machine instances are translucently translated from version 1 to version 2. No setting changes are applied yet, nor has the format itself changed.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Ghostkeeper
2f4e63a944 Add boilerplate version upgrade plug-in 
This plug-in does nothing at the moment. It merely says that it is able to upgrade configuration from version 2.1 to 2.2, but then raises exceptions when you actually try to use it. This is by design. I will now implement the functions that do the conversion.

Contributes to issue CURA-844.
 2016-07-07 13:46:39 +02:00
Jaime van Kessel
b072b7935f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 13:44:19 +02:00
Jaime van Kessel
3d1bbeca38 Restarting machine check properly re-enables endstop check 
CURA-1385
 2016-07-07 13:43:45 +02:00
Arjen Hiemstra
8e63016ef3 Add logging to explain why ContainerManager's methods do not complete successfully 
Contributes to CURA-341
 2016-07-07 12:07:16 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing 
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
 2016-07-07 11:29:18 +02:00
Jack Ha
c76a1043b0 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 11:05:00 +02:00
Jack Ha
464fe11123 Fixed profile file case-sensitivity. 
CURA-1720
 2016-07-07 11:04:34 +02:00
fieldOfView
8c22efc4dd Fix UMO Checkup button size 
CURA-1385
 2016-07-07 10:38:08 +02:00
fieldOfView
2ba2599d6b Remove debug statement and commented-out code 
CURA-1385
 2016-07-07 10:23:01 +02:00
fieldOfView
35efea3d11 Show "ready" state when a printer is connected but jobstate is not yet set 
CURA-1036
 2016-07-07 09:52:53 +02:00
Arjen Hiemstra
17ff92bdc9 Add support for import/export to the Materials page 
Contributes to CURA-341
 2016-07-07 01:43:44 +02:00
Arjen Hiemstra
0da07b55ce Display brand and color name in the material menu if they are different than "generic" 
Contributes to CURA-341
 2016-07-07 01:43:18 +02:00
Arjen Hiemstra
19fd2795e1 Mark XmlMaterialProfile as type "material" so the import/export code can find it 
Contributes to CURA-341
 2016-07-07 01:42:39 +02:00
Arjen Hiemstra
fdab77ff6a Also duplicate the base file when duplicating a material profile 
This way serialization will always be correctly performed and we can
generate
a machine/variant specifc ID for the duplicate.

Contributes to CURA-341
 2016-07-07 01:42:05 +02:00
Arjen Hiemstra
f21079b763 Store the base material file as a metadata property of XmlMaterialProfile 
And use the base_file property to check if we should serialize or not.

Contributes to CURA-342
 2016-07-07 01:41:00 +02:00
Arjen Hiemstra
1f6e99f641 Add methods to get name filters, import and export containers to ContainerManager 
We should start replacing the other ways of import/export with this
since this uses the containerregistry provided contaienr types instead
of needing a different plugin type.

Contributes to CURA-341
 2016-07-07 01:39:38 +02:00
Arjen Hiemstra
6e153414a4 Do not try to write to read-only containers 
Contributes to CURA-341
 2016-07-07 01:37:54 +02:00
Arjen Hiemstra
8476090ed2 Also expose the main Cura application object as CuraApplication to QML 
This way we can start cleaning things up and moving away from the
"Printer" name

Contributes to CURA-341
 2016-07-07 01:36:52 +02:00
Jaime van Kessel
a3618c243d Added deepcopy function 
CURA-1578
 2016-07-06 16:38:35 +02:00
Jaime van Kessel
386cd40a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:33:07 +02:00
Jaime van Kessel
57d0ad1bd0 Made exception handling of slice info plugin way more robust 
CURA-1831
 2016-07-06 16:32:24 +02:00
Jack Ha
d3b8c7f8d5 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:22:28 +02:00
Jack Ha
2be8111f1b Restart timer after slicing is performed when not enabled. 
CURA-1502
 2016-07-06 16:21:03 +02:00
fieldOfView
d5d09f32b7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-06 14:32:49 +02:00
fieldOfView
bdd3ecbc1a Update GUID for PLA to match the GUID in the official repository 
CURA-491
 2016-07-06 14:32:37 +02:00
Jaime van Kessel
b3a6fafd97 Set default extruder index to -1 (so global is default) 2016-07-06 14:30:34 +02:00
Jaime van Kessel
a28a9ea86a Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 14:09:30 +02:00
Jaime van Kessel
a5ba68bae3 Ensure that the display matches with the backend active extruder data 2016-07-06 14:09:08 +02:00
fieldOfView
0e6754c0e2 Update UM2 Extended build volume height to value published in marketing materials 2016-07-06 14:06:14 +02:00
Jaime van Kessel
bf53baccee Merge branch 'feature_material_hotend_change' of github.com:Ultimaker/Cura 2016-07-06 13:39:07 +02:00
Jaime van Kessel
f31adbdd5b Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 13:22:31 +02:00
Jaime van Kessel
d42a97f036 Fixed firmware upgrade for um2+ 
CURA-1761
 2016-07-06 13:22:09 +02:00
Ghostkeeper
a65bb14329
Capitalise setting label 
This is in line with the rest of the setting labels.
 2016-07-06 12:56:05 +02:00