3207 Commits

Author SHA1 Message Date
fieldOfView
c0b31d85fa Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-14 11:06:18 +02:00
fieldOfView
2498e7110d Allow setting the diffuse_color with a uniform binding
CURA-345
2016-06-14 11:05:50 +02:00
fieldOfView
7faae685e5 Use different default colors for each extruder
CURA-340
2016-06-14 10:58:26 +02:00
fieldOfView
4ece9b0997 Add swatch to extruder tabs
CURA-340
2016-06-14 10:42:33 +02:00
fieldOfView
24e165b964 Remove error on ProfilesPage
CURA-1585
2016-06-14 10:41:06 +02:00
Jaime van Kessel
18a1239443 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-14 09:43:12 +02:00
Jaime van Kessel
b429f98d6a Added signalemitter decoration
CURA-49
2016-06-14 09:42:05 +02:00
fieldOfView
8f86a19d6b Fix bq_hephestos_xl.def.json to valid json 2016-06-13 22:12:45 +02:00
fieldOfView
11b120a483 Redesign extruder selection widget
Adds a colorswatch instead of coloring the whole widget (which looks like a warning state)

CURA-340
2016-06-13 18:23:53 +02:00
fieldOfView
213e20bf4b Enable per object settings for objects inside a group
CURA-1054
2016-06-13 16:55:10 +02:00
fieldOfView
33c4e86163 Change abbreviation of "seconds" to IEEE-recommended "s" (instead of "sec") 2016-06-13 16:14:16 +02:00
fieldOfView
18e69c7580 Add missing "enabled" functions for support_extruder_nr children
CURA-1278
2016-06-13 13:09:52 +02:00
fieldOfView
a545cde4a8 Force setting fields to update when discarding changes
Textfields that have the focus don't (always) update when a new value is set.
CURA-1585
2016-06-13 11:53:57 +02:00
Ghostkeeper
1d89e8c6a9 Merge pull request #796 from thopiekar/master-bq-platform_offset-update
[master] Updating platform_offset for BQ printers
2016-06-13 01:15:10 +02:00
Ghostkeeper
8d4528eb62 Merge pull request #795 from thopiekar/master-removing-duplicate-close-rebase
[master] CuraEngineBackend: Removing duplicate close()
2016-06-13 01:11:30 +02:00
Ghostkeeper
d4f59b0086 Merge pull request #792 from thopiekar/master-code-cleanup
[master] code cleanup
2016-06-13 00:41:54 +02:00
fieldOfView
534a4adc8e Fix showing/hiding variant/material dropdowns when switching between machines
CURA-340
2016-06-12 20:55:25 +02:00
Thomas Karl Pietrowski
f2ed22da2a Updating platform_offset for BQ printers
Fixes the reason why the Cura UI freezes when choosing my printer from
the wizard.
2016-06-12 18:47:49 +02:00
fieldOfView
c592d71051 Make "save" button on AddMachineDialog translatable
CURA-1278
2016-06-12 15:58:52 +02:00
Thomas Karl Pietrowski
bf1cb8ae52 Rename 'attribute' to 'property_name' 2016-06-12 15:49:13 +02:00
fieldOfView
aeccfe3509 Rearrange preferences
Merges general & view into a single page
Introduces sections on general page
Cleans up code
2016-06-12 15:25:39 +02:00
fieldOfView
17d1dbd804 Fix updating the sidebar when a setting is changed in an extruder
CURA-1585
2016-06-12 14:26:12 +02:00
fieldOfView
168415554d Typo and codestyle 2016-06-12 13:56:37 +02:00
fieldOfView
293d7c06d9 Revert "Use callLater to set the active machine in MachineManager"
This reverts commit 0aea7bdb5c67e7dde3be31cfd1a8d48b72c5d322.
Advanced mode showed no settings, and things were generally not working after this commit, so I am reverting the change for now.
2016-06-12 13:55:47 +02:00
Thomas Karl Pietrowski
3df124e3cf CuraEngineBackend: Removing duplicate close()
close() is already defined in this class. This removes the useless code.
2016-06-12 12:46:19 +02:00
Ghostkeeper
e813c2c08e Merge pull request #787 from Ultimaker/exception_handling_fixes
Minor Exception handling Fixes
2016-06-11 15:23:16 +02:00
Thomas Karl Pietrowski
c38e31f0e3 BuildVolume: Remove worthless line
Just a small clean up. skirt_size was initialized twice.
2016-06-11 13:21:52 +02:00
Thomas Karl Pietrowski
41d03536eb Using a save name for variable "property"
Using "property" here might be not save. Just replaced that variable
with "attribute" and added a reminder, so nobody renames it to
"property" again.
2016-06-11 13:16:40 +02:00
Thomas Karl Pietrowski
67a3ae36a5 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2016-06-11 12:45:11 +02:00
Ghostkeeper
49649f4cd8 Mirror Y-axis of head polygon
Apparently, the machine homes to maximum-Y, so the open end of the machine is on the other side. I'm rotating it 180 degrees.
2016-06-11 02:51:48 +02:00
Ghostkeeper
6311cea372 Machine head polygon with measured dimensions
The collision polygon of the machine head is rectangular, but the arm on which the nozzle hangs extends to the edge of the build plate on one side. These measurements were taken also by Calvindog717. The orientation is guessed. Usually the Y+ direction is towards the front... Let's hope it's good!
2016-06-11 00:57:49 +02:00
Ghostkeeper
b321a8a053 Add definition Printrbot Simple by Calvindog717
Source: https://www.reddit.com/r/3Dprinting/comments/4n1lyd/cura_212_has_been_released_it_features_major_ui/d409udf
I've converted Calvin's profile that he was using personally to be up to date after the settings rework.
2016-06-10 23:36:36 +02:00
Ghostkeeper
e8dd67cbde Merge branch 'multiextruder_profiles'. 2016-06-10 17:39:43 +02:00
Jaime van Kessel
cc17c28978 Fixed global stack not being set as next stack for extruder trains 2016-06-10 17:26:09 +02:00
Ghostkeeper
d89c9d8827
Make getSelectedActiveExtruder return its misbegotten gains
It was getting a value from the decorator, then keeping it to itself all greedy like. It must return what it found.

Contributes to issue CURA-340.
2016-06-10 17:04:26 +02:00
Ghostkeeper
204bf4d7dd
Update visibility of extruder dropdown on change
It currently only works when switching to a dual-extrusion printer, since the model is not updated when switching away to a non-dual-extrusion printer...

Contributes to issue CURA-340.
2016-06-10 17:04:26 +02:00
Jaime van Kessel
8c43d4c4cb Quality is now set for extruder, regardless if the machine has machine specific qualities 2016-06-10 17:04:25 +02:00
Jaime van Kessel
fa72630c0a Merge branch 'multiextruder_profiles' of github.com:Ultimaker/Cura into multiextruder_profiles 2016-06-10 16:54:24 +02:00
Jaime van Kessel
9626cddf34 Extruder trains are now correctly saved 2016-06-10 16:53:59 +02:00
fieldOfView
e150b1887e Update active variant, material and quality id when switching extruders
CURA-1585
2016-06-10 16:50:11 +02:00
fieldOfView
57dfc2ae79 Change active containerstack when the global containerstack is changed
CURA-1585
2016-06-10 16:37:43 +02:00
fieldOfView
c4a1bd2fd3 Automatically use global- or extruder- containerstack
CURA-1585
2016-06-10 16:13:47 +02:00
Jaime van Kessel
717b9574b9 Merge branch 'feature_accelerations_and_jerk_per_feature_settigns_rework' of github.com:Ultimaker/Cura 2016-06-10 15:36:31 +02:00
Arjen Hiemstra
a4e37d9ae7 Mark certain types of exceptions as fatal and abort the application if they occur
We simply cannot recover properly from things like an uncaught
MemoryError since that usually means any follow up operation will also
fail. So Instead of silently ignoring it and having the application in a
broken state we properly abort.

Right now the list of fatal exceptions is a bare minimum that contains
the most prominent things we cannot recover from.
2016-06-10 15:08:16 +02:00
Arjen Hiemstra
44f8744c84 Use the Logger to report uncaught exceptions
Makes for a nicer and clearer output of uncaught exceptions
2016-06-10 14:56:08 +02:00
Tim Kuipers
78fbb988cf Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 14:56:03 +02:00
Arjen Hiemstra
0aea7bdb5c Use callLater to set the active machine in MachineManager
This prevents exceptions in setActiveMachine from preventing Cura to
start.
2016-06-10 14:54:21 +02:00
Tim Kuipers
67058c3d45 fix: definition visibility got borked (CURA-1443)
machine definition visibility should be a metadata property and should be set to true for only those definitions which are actually machines
2016-06-10 14:52:15 +02:00
Jaime van Kessel
3cc7549c5f Merge pull request #786 from thopiekar/master
[master] LayerView: Using resetLayerData()
2016-06-10 14:33:16 +02:00
Ghostkeeper
f302e06654
Reslice when per-object extruder changes
Not when you activate the dropdown but it doesn't change though.

Contributes to issue CURA-340.
2016-06-10 14:24:21 +02:00