GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,169 Commits 291 Branches 260 Tags
Commit Graph

146 Commits

Author SHA1 Message Date
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +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
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
Mark
ee75b9bdf5 Also accept a comma as input and convert it to a dot 
CURA-4910
 2018-02-02 10:28:37 +01:00
ChrisTerBeke
129f9cc16c Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835 2018-01-22 17:18:09 +01:00
ChrisTerBeke
d035ace40d Add method to set active extruder count to machine manager so other plugins can use it, add empty definitions container template 2018-01-19 13:32:25 +01:00
Lipu Fei
02291bb6a3 better name: "Compatible material diameter" in Machine Settings 
CURA-4832
 2018-01-19 11:15:55 +01:00
Lipu Fei
b0d2ef0f72 Correct default material diameter value for single-extrusion machines 
CURA-4812
 2018-01-16 15:04:21 +01:00
Lipu Fei
7c4a122767 Fix container_index for MachineSettingsAction 
CURA-4708
 2018-01-03 17:04:40 +01:00
Lipu Fei
cbf6f55fd8 Fix perfered material search in auto-update 
CURA-4708
 2018-01-03 16:42:57 +01:00
Lipu Fei
47a12b4128 Prefer materials from the same brand in auto-update 
CURA-4708
 2018-01-03 16:29:19 +01:00
Lipu Fei
b181860f1c Fix afterOnEditingFinished() 
CURA-4708
 2018-01-03 16:29:18 +01:00
Lipu Fei
b246a102ed Fix MachineSettings dialog 
CURA-4708

- Move material diameter and nozzle size to extruder tabs
- Fix value bindings
 2018-01-02 12:40:43 +01:00
Lipu Fei
ae86a838e0 Update extruder count model in MachineSettings dialog 
CURA-4722
 2017-12-20 16:23:39 +01:00
Lipu Fei
6d06d18407 Fix Extruder tabs in MachineSettings dialog 
CURA-4722

The extruder field views should be bound to the actual extruder, not the
active extruder.
 2017-12-20 13:58:02 +01:00
Lipu Fei
49ee2a543e Fix code style 2017-12-20 13:57:48 +01:00
Lipu Fei
b4e7216f5b Always show extruder tabs in Machine Settings dialog 
CURA-4693
 2017-12-08 11:08:24 +01:00
ChrisTerBeke
7cc953d8e7
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials 
Hide material diameter when the machine has no materials
 2017-12-01 14:56:36 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1' 2017-11-30 16:57:01 +01:00
fieldOfView
e8a7237391 Fix updating material container for extruder when changing gcode flavor 
Since single extrusion printers have a single extruder stack now, material container needs to be set on the extruder stack instead of the global stack
 2017-11-30 11:46:06 +01:00
fieldOfView
d5d75aca19 Hide material diameter when the machine has no materials 
eg Ultimaker 2 when using UltiGcode
 2017-11-29 22:46:17 +01:00
ChrisTerBeke
f41759e1dc Fix binding extruder manager in machine actions view - CURA-4568 2017-11-28 15:20:05 +01:00
ChrisTerBeke
657a91c525 Merge pull request #2685 from Ultimaker/container_stack_improvements 
Container stack improvements
 2017-11-20 17:42:26 +01:00
ChrisTerBeke
e29fdbe76d Cleanup - CURA-4482 2017-11-01 14:32:58 +01:00
ChrisTerBeke
8676792ef8 Disable annoying debug message about not found printer definition 2017-10-31 16:23:45 +01:00
ChrisTerBeke
c59e4bb3e1 Cleanup machine settings action - CURA-4482 2017-10-31 16:20:25 +01:00
ChrisTerBeke
cc6be48a79 Always use extruder stack when updating material diameter - CURA-4482 2017-10-31 16:19:16 +01:00
ChrisTerBeke
b8757b46b3 Always use extruder stack in machine settings action plugin, keep support for older project files - CURA-4482 2017-10-31 16:16:51 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01: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
c132300fd5 start 2017-10-23 13:56:26 +02:00
fieldOfView
ad1c0046d9 Fix crash when exiting Machine Settings 
fixes #2609
 2017-10-15 11:54:49 +02:00
Lipu Fei
666ee81fb3 Set label width based on the column width 
CURA-4428

- Remove the magic number solution
- Use a fixed width for labels so the right side widgets can be properly
  left-aligned.
 2017-10-10 10:28:46 +02:00
Lipu Fei
7ca2ae9771 Adjust alignments for ComboBoxes in MachineSettings dialog 
CURA-4428
 2017-10-10 08:20:39 +02:00
Jaime van Kessel
437da52f65 Merge branch 'fix_multiple_extruder_issues' of github.com:Ultimaker/Cura into 3.0 2017-09-29 15:17:11 +02:00
Jaime van Kessel
6d687d6f06 Re-enable changing of multi-extrusion machines to single extrusion 
CURA-4359
 2017-09-29 13:50:31 +02:00
ChrisTerBeke
1b8766b953 CURA-4386 CURA-4379 change stack behaviours to fix crashes 2017-09-28 16:00:16 +02:00
Diego Prado Gesto
e3edc79a3e modified some code to fix the multiple extrusion issues - CURA-4379 2017-09-28 13:21:03 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
Diego Prado Gesto
4b3e83f876 Not allowing to modify the number of extruders in multiextruder printers, except Custom FDM printers - CURA-4359 2017-09-27 15:55:34 +02:00
fieldOfView
3c64175948 Fix setting machine head polygon in Machine Settings 
This typo was spotted by @McAJBen. Fixes #2347
 2017-08-31 22:57:50 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +02:00
Lipu Fei
6e06837084 Remove duplicated function createDefinitionChangesContainer() 
CURA-4107
 2017-08-02 08:50:32 +02:00
Jaime van Kessel
021425ee06 Merge branch 'fix_system_text_rendering' of https://github.com/fieldOfView/Cura 2017-07-26 16:49:28 +02:00
Mark Burton
f66bbf0dac Fix recently broken setting of gcode area value property setting on focus loss. 2017-07-17 22:01:43 +01:00
fieldOfView
b5d7ec5bd2 Round fractional widths and heights in system-themed qml 2017-07-14 12:58:07 +02:00
fieldOfView
c27859ddc5 Fix spelling for consistency 2017-07-11 23:32:47 +02:00