3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
12694 commits 307 branches 270 tags 779 MiB
Commit graph

12694 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
71bb3c3a22 Added electric print cost calculator plugin 2017-05-29 11:28:23 +02:00
Nicolas Liaudat
b0cbae6c33 Update easyarts_ares.def.json 2017-05-29 08:06:50 +02:00
Nicolas Liaudat
f7f1155504 Create easyarts_ares.def.json 2017-05-28 15:46:18 +02:00
Mark
c70f7404b8 Merge branch 'fix_dialog_sizes' of github.com:Ultimaker/Cura into fix_dialog_sizes 2017-05-26 13:47:40 +02:00
Mark
9ea850e3d1 Give text in labels specific width so icons stay aligned 2017-05-26 13:45:44 +02:00
Mark
8006c0f3b3 resize the rename-dialog 2017-05-26 13:45:44 +02:00
Mark
16b9bd0b14 fixed too big dialogs and hidden checkboxes 2017-05-26 13:45:44 +02:00
Mark Burton
26491da2b2 Rename group_walls setting to optimize_wall_printing_order. 2017-05-24 23:29:36 +01:00
fieldOfView
817de9d39e Get a list of available themes instead of the hardcoded list 2017-05-24 17:42:11 +02:00
Ghostkeeper
03c8e7e62b
Merge branch 'maukcc-master' 2017-05-24 16:37:10 +02:00
Arjen Hiemstra
586050552b Merge branch '2.6' 
* 2.6:
  Error out when trying to import a profile witha quality_type we dont have
  Add default for colour code of material
  When trying to convert None to RGBA, log it and return a usable default
 2017-05-24 15:47:46 +02:00
Arjen Hiemstra
fafb83c5c4 Enable the Python faulthandler 
This will print a Python backtrace to stderr when SIGSEGV and similar
crashes happen. Hopefully it should help a bit when debugging those.
 2017-05-24 15:47:40 +02:00
Arjen Hiemstra
1c620ac621 Always redirect stdout/stderr to file if application is frozen 
This will make stdout/stderr also redirect to file if we are running a
build on OSX or Linux.
 2017-05-24 15:47:40 +02:00
Arjen Hiemstra
9bda7dbaae Error out when trying to import a profile witha quality_type we dont have 
Rather than successfully importing the profile and then not showing
anything, we now display an error. Not the perfect solution but the
easiest for now.

Contributes to #1873
 2017-05-24 15:43:49 +02:00
Ghostkeeper
ce6814d45d Add default for colour code of material 
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
 2017-05-24 15:20:59 +02:00
Ghostkeeper
3ff9ad5d4e
Add default for colour code of material 
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
 2017-05-24 15:19:12 +02:00
Lipu Fei
374b6d4e35 Merge branch '2.6' 2017-05-24 14:10:26 +02:00
Mark
c155fb67a4 Give text in labels specific width so icons stay aligned 2017-05-24 14:05:19 +02:00
Mark
cdcba23f02 resize the rename-dialog 2017-05-24 14:05:19 +02:00
Mark
ba6da4a57b fixed too big dialogs and hidden checkboxes 2017-05-24 14:05:19 +02:00
Jaime van Kessel
e6f61f3bbc When trying to convert None to RGBA, log it and return a usable default 
contributes to #1869
 2017-05-24 11:38:38 +02:00
Jaime van Kessel
3c14545e08 Merge branch 'fix_machine_name_conflicts' of https://github.com/fieldOfView/Cura 2017-05-24 11:27:05 +02:00
Lipu Fei
64ae8bb595 Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-24 10:17:13 +02:00
Lipu Fei
29c883d489 Fix option_extruder case for per object settings panel 
CURA-3814
 2017-05-24 09:36:07 +02:00
Tim Kuipers
eab7ce232a JSON fix: default feature extruder_nr = -1 (CURA-3740) 2017-05-23 14:01:01 +02:00
Lipu Fei
da39ab8093 Remove duplicate "enabled" for "infill_angles" 2017-05-23 13:34:50 +02:00
Moritz Mair
a714d5b370 added 3dator printer profile and mesh 2017-05-23 13:10:47 +02:00
Lipu Fei
9a08e0cc27 Only use <fdmmaterial version> for detecting material file version 
CURA-3540
 2017-05-23 11:51:31 +02:00
Mark Burton
6720e1c2ee Added "group_walls" setting. 2017-05-23 09:22:34 +01:00
fieldOfView
93a36a8503 Add Type A Machines series 1 2014 definition and mesh 2017-05-22 22:12:36 +02:00
Tim Kuipers
6887bcf232 JSON fix: feature extruder settings now use optional_extruder type (CURA-3740) 2017-05-22 16:57:33 +02:00
Ghostkeeper
0f97dd6fde
Let global stack handle limit to extruder 
Contributes to issue CURA-3738.
 2017-05-22 16:56:54 +02:00
Ghostkeeper
884067d844
Merge branch 'master' into feature_extruder_per_feature 2017-05-22 16:22:32 +02:00
Ghostkeeper
2a6a968540
Merge branch 'master' into feature_extruder_per_feature 2017-05-22 16:05:57 +02:00
Ghostkeeper
1f33a0d4cd
Use per-parameter-value compression for signals 
This will only emit one signal for each unique combination of parameters.

Contributes to issue CURA-3803.
 2017-05-22 15:36:46 +02:00
Ghostkeeper
bec43d5b9a
Make sure that the preferred material name variable exists 
Another small bug I found when looking through this MachineManager code. My IDE was complaining that the preferred_material_name was not always initialised and that preferred_material was an unused variable.

Doesn't contribute to issue CURA-3803.
 2017-05-22 15:36:46 +02:00
Jaime van Kessel
cc3402ab81 Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:50:03 +02:00
Jaime van Kessel
f9f0fa852f Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:48:42 +02:00
Jaime van Kessel
c474642744 Removed debug ID 
CURA-3814
 2017-05-22 14:25:29 +02:00
Jaime van Kessel
92192ff411 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-22 14:10:27 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder 
This is more in line with the other properties

CURA-3814
 2017-05-22 14:05:10 +02:00
Ghostkeeper
c14294d1f7
Merge branch '2.6' 
Conflicts:
cura/Settings/ExtrudersModel.py

Contributes to issue CURA-3803.
 2017-05-22 14:02:48 +02:00
Ghostkeeper
5f0fb3f9bd
Don't squash signals updating materials and variants 
These may have different parameters, such as which machine and extruder they are updating the material and variant of. If we only pass the last signal on, then we're missing the update of other extruders.

Contributes to issue CURA-3803.
 2017-05-22 14:01:58 +02:00
Ghostkeeper
8c166ea770
Use CuraContainerStack.definition instead of ContainerStack.getBottom() 
We know now that it must be a Cura Container Stack. This should be a bit faster, and makes the error message I was getting a bit more clear.

Contributes to issue CURA-3803.
 2017-05-22 14:01:58 +02:00
Ghostkeeper
5ae02fb4c6
Listen to changes on all extruders 
Not just the active extruder. The non-active extruder may change when loading a project file which happened to have the same printer (so no new printer is created) and the same material and variant in the active extruder but not the same material or variant in another extruder.

Contributes to issue CURA-3803.
 2017-05-22 14:01:58 +02:00
Ghostkeeper
6315947156
Modify parameter types from DefinitionContainer to DefinitionContainerInterface 
It may also be any other class that implements the Definition Container Interface.

Not really related to CURA-3803 but I'm putting it there anyway as I found it during that development.
 2017-05-22 14:01:57 +02:00
Arjen Hiemstra
8e5cfd9566 Add last missing settings that should still use extruderValue 
Contributes to CURA-3738
 2017-05-22 13:57:08 +02:00
Jaime van Kessel
b69ced5766 Set color of "Not Overriden" option to white 
CURA-3814
 2017-05-22 13:45:28 +02:00
Jaime van Kessel
20cb3ea01f Added "optional_extruder" setting type 
CURA-3814
 2017-05-22 13:24:41 +02:00
Jaime van Kessel
4d853d5d52 Build volume no longer gives issue if -1 is provided as an int 
CURA-3814
 2017-05-22 13:22:03 +02:00