GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-21 05:09:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
30,096 Commits 287 Branches 260 Tags
Commit Graph

77 Commits

Author SHA1 Message Date
joeydelarago
ee7c8d1f02 Move creatFlattenedContainerInstnance into CuraStackBuilder so it can be reused. 
CURA-9224
 2022-09-05 10:42:48 +02:00
Jaime van Kessel
ae33053369
Add missing setting version from g-code profile writer 2020-07-22 11:24:23 +02:00
Ghostkeeper
1bb4458dca
Remove use of deprecated extruders property 
This also removes the need to sort them, since the list is already sorted by position.

Done during Turbo Testing and Tooling.
 2020-05-29 17:45:41 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
553b09b6cf Convert doxygen to rst for GcodeWriter, LegacyProfileReader, 
MachineSettingsAction, ModelChecker
 2020-05-08 16:20:55 +02:00
Ghostkeeper
2b96543cd3
Store intent category in metadata of quality_changes as well 
This is necessary in order to restore it properly.

Contributes to issue CURA_6600.
 2019-09-11 16:58:11 +02:00
Ghostkeeper
71b94f6d5b
Create own quality changes profiles instead of asking quality manager 
It was a protected function call on a different class anyway, so that should never have gotten accepted.

Contributes to issue CURA-6600.
 2019-09-05 17:26:48 +02:00
Ghostkeeper
ba608c5987
Use container tree to reset quality after deleting packages 
Contributes to issue CURA-6600.
 2019-08-28 14:57:02 +02:00
Ghostkeeper
b9370f864e
Get quality definition from container tree 
Contributes to issue CURA-6600.
 2019-08-28 14:34:00 +02:00
Ghostkeeper
ef5f9bb0d4
Improve warning when saving g-code before slicing 
This terminology is more consistent with what the rest of the interface uses.

Discovered during work on #4112.
 2018-09-28 12:01:20 +02:00
Lipu Fei
1079a9be2c Do not add saved gcodes to recent files list 2018-08-17 10:53:30 +02:00
Diego Prado Gesto
38a0c9b66d Add some extra information when the Cura can't write the files. 2018-08-03 12:02:11 +02:00
Lipu Fei
af02dc2758 Only use setMetaDataEntry() 2018-07-11 11:14:57 +02:00
Ghostkeeper
75e5a185d9
Don't unnecessarily cast to a set 
The InstanceContainer version of getAllKeys was first casting to a list but I removed that, because everywhere where we were using it we were casting it directly to a set.

Contributes to issue CURA-5330.
 2018-06-15 13:07:55 +02:00
Ghostkeeper
304c23b87e
Fix check for existence of gcode_dict variable 
getattr raises an error if it doesn't exist. It doesn't make the variable None or anything.
 2018-05-08 10:44:19 +02:00
Diego Prado Gesto
2d30315ecf CURA-5220 Skip storing the settings in the GCode if they already are. 2018-04-12 11:49:38 +02:00
Ghostkeeper
4d5013d3ad
Remove unused variable 
The variable name is re-used lower in the code. This value is unused though.
 2018-03-16 15:08:57 +01:00
Lipu Fei
440a56b7fa Fix settings export in gcode 2018-03-15 16:42:11 +01:00
Lipu Fei
68b1a374e0 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 16:53:32 +01:00
Diego Prado Gesto
94ca4fffe3 CURA-4946 In the gcode just store the default machine definition 2018-02-22 16:46:48 +01:00
Lipu Fei
9a354efd19 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-21 14:05:19 +01:00
Diego Prado Gesto
6af5a5d4bc CURA-4946 When storing the gcode profile, the definition must be the 
quality definition if the printer has_machine_quality. Otherwise the
fdmprinter definition must be used as a fallback. If there is no
quality_definition then the printer definition is use.
 2018-02-20 11:11:21 +01:00
Diego Prado Gesto
6a4f519238 Revert "CURA-4946 Add the quality_definition metadata entry to the gcode so when" 
This reverts commit 744313af273ed34a5796d3970c3915f68abaedc7.
 2018-02-20 09:30:05 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Diego Prado Gesto
744313af27 CURA-4946 Add the quality_definition metadata entry to the gcode so when 
parsing, the quality definition is taken into account instead of the
definition.
The message when importing a profile to a different machine,
now shows the expected machine and the current machine definition id.!!
 2018-02-16 14:01:46 +01:00
Ghostkeeper
f91c990fed
Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.) 
This makes it all the same. It is something that came up in our translation pass this time.

Contributes to issue CURA-4883.
 2018-02-13 15:50:59 +01:00
Diego Prado Gesto
a6acf4a4af CURA-4829 Do not save the quality changes profile in the GCode if the 
containers are empty.
Change the message when trying to import a GCode as a profile, but not profile was stored.
 2018-01-19 10:34:04 +01:00
Jack Ha
dab0ebd208 CURA-4525 fix saving empty gcode giving error 2018-01-10 14:25:09 +01:00
Lipu Fei
c8cef9583e rename scene.gcode_list to gcode_dict 
CURA-4741

With the multi build plate feature, scene.gcode_list is now a dict which
stores a list of gcode for a build plate, so it makes more sense to have
it renamed to "gcode_dict" because it's not a list.
 2018-01-08 16:18:41 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Ghostkeeper
e621ace3e4
Remove unnecessarily setting definition 
This definition is included in the metadata of container 2.

Contributes to issue CURA-4243.
 2017-12-08 12:42:19 +01:00
Jack Ha
7d24933835 Fix save to file. 
Changed order of setting metadata for correct overwriting.

Contributes to issue CURA-4243.
 2017-12-05 11:55:54 +01:00
Ghostkeeper
ebe766a7c8
Set definition by their ID 
The new function for setting the definition just adds the ID to the metadata.

Contributes to issue CURA-4243.
 2017-11-24 16:45:09 +01:00
Jack Ha
be6561b575 CURA-4525 fixed material info per build plate, bugfix arrange on load 2017-11-15 10:28:34 +01:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Ghostkeeper
bd75102ee5
Fix saving g-code if no quality profile is set 
If the quality profile was 'empty', then the container type wasn't properly set, so you can't find any quality profile. This gets the quality profile from the stacks, so you will find the empty profile (which has the wrong type but at least you can try to request metadata from it).
 2017-07-06 13:52:54 +02:00
Jaime van Kessel
f2f83750c2 Type is now always added when deserializing profiles to g-code 
CURA-3829
 2017-05-18 16:42:11 +02:00
Lipu Fei
3a5a28cc38 Use CuraStack.qualityChanges to get quality changes 
CURA-3770
 2017-05-08 11:33:50 +02:00
Simon Edwards
74e5798509 Lots of import fixes. Eliminated the import hacks such as those used inside UM/Settings/__init__.py. 
CURA-2917
 2016-12-12 16:05:35 +01:00
Ghostkeeper
3c9ebfab8f
Merge branch '2.3' 
Conflicts:
	resources/definitions/fdmprinter.def.json
	resources/materials/generic_abs.xml.fdm_material
	resources/materials/generic_cpe.xml.fdm_material
	resources/materials/generic_nylon.xml.fdm_material
	resources/materials/generic_pla.xml.fdm_material
	resources/materials/ultimaker_abs_black.xml.fdm_material
	resources/materials/ultimaker_abs_blue.xml.fdm_material
	resources/materials/ultimaker_abs_green.xml.fdm_material
	resources/materials/ultimaker_abs_grey.xml.fdm_material
	resources/materials/ultimaker_abs_orange.xml.fdm_material
	resources/materials/ultimaker_abs_pearl-gold.xml.fdm_material
	resources/materials/ultimaker_abs_red.xml.fdm_material
	resources/materials/ultimaker_abs_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_abs_white.xml.fdm_material
	resources/materials/ultimaker_abs_yellow.xml.fdm_material
	resources/materials/ultimaker_cpe_black.xml.fdm_material
	resources/materials/ultimaker_cpe_blue.xml.fdm_material
	resources/materials/ultimaker_cpe_dark-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_green.xml.fdm_material
	resources/materials/ultimaker_cpe_light-grey.xml.fdm_material
	resources/materials/ultimaker_cpe_red.xml.fdm_material
	resources/materials/ultimaker_cpe_transparent.xml.fdm_material
	resources/materials/ultimaker_cpe_white.xml.fdm_material
	resources/materials/ultimaker_cpe_yellow.xml.fdm_material
	resources/materials/ultimaker_nylon_black.xml.fdm_material
	resources/materials/ultimaker_nylon_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_black.xml.fdm_material
	resources/materials/ultimaker_pla_blue.xml.fdm_material
	resources/materials/ultimaker_pla_green.xml.fdm_material
	resources/materials/ultimaker_pla_magenta.xml.fdm_material
	resources/materials/ultimaker_pla_orange.xml.fdm_material
	resources/materials/ultimaker_pla_pearl-white.xml.fdm_material
	resources/materials/ultimaker_pla_red.xml.fdm_material
	resources/materials/ultimaker_pla_silver-metallic.xml.fdm_material
	resources/materials/ultimaker_pla_transparent.xml.fdm_material
	resources/materials/ultimaker_pla_white.xml.fdm_material
	resources/materials/ultimaker_pla_yellow.xml.fdm_material

Contributes to issue CURA-2737.
 2016-10-20 12:41:31 +02:00
Jack Ha
a030b5bfc3 Fix gcode profile. CURA-2718 2016-10-18 10:26:02 +02:00
Jack Ha
0511906263 Revert "Fix gcode profile. CURA-2718" 
This reverts commit deb360642984cdd6ffa2b13cc182e9d1dfd9855e.
 2016-10-18 10:18:06 +02:00
Jack Ha
deb3606429 Fix gcode profile. CURA-2718 2016-10-18 09:55:45 +02:00
Ghostkeeper
96e516c676
Allow for saving multiple scene nodes at the same time 
The selection saving saves the entire current selection and their child nodes.

Contributes to issue CURA-2617.
 2016-10-17 15:53:33 +02:00
Ghostkeeper
4769b22138
Sort profiles on extruder position before exporting 
In the importer the extruders are sorted on extruder position. In the exporter they need to be in the same order.

Contributes to issue CURA-2655.
 2016-10-14 11:46:39 +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
Jaime van Kessel
bbb211b0f6 Saving profile to g-code with empty container no longer results in empty string 2016-09-07 15:28:58 +02:00
Jaime van Kessel
2c82f5a177 Instead of writing quality + user to g-code, we now write quality_changes + user 2016-09-02 16:36:49 +02:00
Arjen Hiemstra
0f1c59c925 Properly catch when either extruder or global quality is not properly set 
Cornercase, but it avoids bubbling odd error messages to the UI.

Fixes CURA-1997
 2016-08-02 15:20:03 +02:00
Jaime van Kessel
b5d2533820 G-code writer no longer uses duplicate for flattening profile 
Spent to much time fixing this already, so we now just make a new profile by hand based on the profiles to be flattened

CURA-1933
 2016-07-29 09:59:57 +02:00