78 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
Lipu Fei
02291bb6a3 better name: "Compatible material diameter" in Machine Settings
CURA-4832
2018-01-19 11:15:55 +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
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
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
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +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
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
fieldOfView
1b4bd05106 Make doubly sure that settings are changed before closing dialog 2017-07-11 23:27:31 +02:00
fieldOfView
d00bb2524e Fix layout
Dialog is now more robust against being too small
2017-07-11 22:33:05 +02:00
fieldOfView
219d1938c2 Move labels into components with the controls...
...so they are both children of the same TooltipArea
2017-07-11 16:40:05 +02:00
fieldOfView
2ba0dd094e Simplify layout 2017-07-11 15:54:21 +02:00
fieldOfView
aa7ab2e0a7 Remove unnecessary eval() construct 2017-07-10 16:49:03 +02:00
fieldOfView
79e38407c8 Add tooltip to "Number of Extruders" control 2017-07-10 12:34:39 +02:00
fieldOfView
8c2f556616 Switch to an appropriate material when changing the material diameter
If we don't do this, the material will always override the setting in Machine Settings
2017-07-09 16:41:24 +02:00
fieldOfView
b8ea762242 Override some tooltips for clarity in the context of Machine Settings 2017-07-09 14:57:51 +02:00
fieldOfView
cb7b845a32 Add tooltips to the head polygon fields 2017-07-09 14:39:55 +02:00
fieldOfView
4705ada6ef Add tooltip to gcode areas 2017-07-09 13:35:50 +02:00
fieldOfView
1eeb953072 Restructure propertyProviders to be part of setting components 2017-07-09 13:12:25 +02:00
fieldOfView
a2332ae304 Add tooltips to most fields 2017-07-09 12:32:16 +02:00
fieldOfView
910811810b Allow setting negative values on extruder offset x/y fields 2017-05-16 13:54:45 +02:00
Lipu Fei
9060bbf3b2 Update extruderCount when extrudersModel got changed
CURA-3755

The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
2017-05-11 09:47:37 +02:00
Jaime van Kessel
bb0d534f4a Revert "Set machine_extruder_count in sync with defined extruders"
This reverts commit b69f337ddb50bb8e5dc39107f75d4112b14527d1.
2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336 Revert "Starting machineSettingAction no longer resets extruder count to 1"
This reverts commit 452a6a095c0866a080e19d89a71e1857e011456f.
2017-05-08 15:30:39 +02:00
Jaime van Kessel
452a6a095c Starting machineSettingAction no longer resets extruder count to 1 2017-05-08 14:25:13 +02:00
Lipu Fei
a039f9552e Trigger extruderTabsCount update when MachineSettings dialog shows
CURA-3755
2017-05-08 09:47:42 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.

Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
fieldOfView
c9039bb6fc Add a field to set the material diameter for the printer
This is used to filter the list of available materials, see https://github.com/Ultimaker/Cura/pull/1685
2017-04-30 11:08:24 +02:00
fieldOfView
8d42f9c187 Move some convoluted logic from QML into Python 2017-04-22 10:13:58 +02:00
fieldOfView
0966ef5338 Fix QML warnings when switching to an extruder tab 2017-04-21 21:48:20 +02:00
fieldOfView
656e7a8046 Change the scope of the head polygon functions to be inside the main tab 2017-04-21 21:27:15 +02:00
fieldOfView
ba229444b7 Pause autoslicing while the MachineSettingsAction is open
Each setting-change would cause a reslice, which is unnecessary.
2017-04-21 21:05:28 +02:00
fieldOfView
94545ec4ee Restore active extruder after forcing an update of the global extruder stack 2017-04-15 20:09:20 +02:00
fieldOfView
813ee65849 Update printer (& disallowed areas) when setting nozzle offsets 2017-04-15 18:58:25 +02:00