Jaime van Kessel
ac4dbe2304
Decreased the progress added when 0 was returned
...
Turned out that by adding 0.1, it started at 10%
2016-06-14 16:01:06 +02:00
Tim Kuipers
13fd588451
JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646)
2016-06-14 15:47:29 +02:00
Jaime van Kessel
cadf5d85b7
Camera image is now also retrieved
...
CURA-338
2016-06-14 13:46:04 +02:00
Jaime van Kessel
1220d32ca5
No longer possible to send print_jobs when print just started
...
CURA-49
2016-06-14 13:23:05 +02:00
Jaime van Kessel
eb836bfc3f
Merge branch 'master' of github.com:Ultimaker/Cura
2016-06-14 11:52:04 +02:00
Jaime van Kessel
3777acd4cd
Changed order of inheritance.
...
Because the python new is stupid, it fails to notice the qObject if it's not defined first
2016-06-14 11:50:59 +02:00
Jaime van Kessel
1acf155e19
We don't depend on requests lib anymore
...
Intead we use qt network stuff for everything.
CURA-49
2016-06-14 11:49:28 +02:00
Simon Edwards
175b5429b4
Refactor the profile and Cura specific import/export code, put the cura stuff in Cura itself.
...
Contributes to CURA-1667 Profile import/export
2016-06-14 11:44:38 +02:00
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
486fc7f176
When no globalcontainer is set, no check to connect is performed
...
CURA-49
2016-06-14 09:46:01 +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
bd413b9a2b
Added signalemitter
...
CURA-49
2016-06-14 09:42:53 +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
Jaime van Kessel
025bdba516
Changes to make the network plugin play well with setting_rework
...
CURA-49
2016-06-13 13:34:22 +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 0aea7bdb5c
.
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
Thomas Karl Pietrowski
6d43ec700d
CuraEngineBackend: Using Platform.isWindows()
2016-06-12 11:02:15 +02:00
Thomas Karl Pietrowski
c1cf78f662
Merge remote-tracking branch 'refs/remotes/Ultimaker/master' into master-using-platform
2016-06-12 10:53:36 +02:00
Thomas Karl Pietrowski
a9671cdcfd
Deleting a backup
...
This removes a backup, which I made when switching between git branches.
2016-06-11 23:00:44 +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
b047db36fd
Using isLinux() for Linux detection
...
Of course there are more places where we can replace these checks.
2016-06-11 13:43:50 +02:00
Thomas Karl Pietrowski
f11ef0c0c0
Using UM.Platform for Windows detection
...
The diff says everything.
2016-06-11 13:42:09 +02:00
Thomas Karl Pietrowski
0eb5dd94eb
Merge remote-tracking branch 'refs/remotes/Ultimaker/master'
2016-06-11 13:31:52 +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
0d8292df49
Using platform.system() for Windows detection
...
This is just cosmetics. It works the same as system.platform, but looks
better. Additionally "win32" might be misleading, as it sounds like we
are checking for Windows 32bit here.
2016-06-11 12:50:28 +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