550 Commits

Author SHA1 Message Date
Jaime van Kessel
19d711fb80 Added merging for multi material 2015-07-27 14:25:27 +02:00
Jaime van Kessel
1d4dbcc990 Delting now correctly deletes the group 2015-07-16 11:12:52 +02:00
Jaime van Kessel
cc2f0fc009 Ungroupning with nested groups now works correctly 2015-07-15 17:22:33 +02:00
Jaime van Kessel
ba612f188a Grouping & ungrouping now has correct selection behaviour 2015-07-15 14:36:43 +02:00
Jaime van Kessel
d01279c115 Added ungrouping 2015-07-15 14:32:06 +02:00
Arjen Hiemstra
a84a5d784a Fix the platform activity check
Contributes to #128
2015-07-15 10:15:02 +02:00
Arjen Hiemstra
a3cc4b98b8 Bump application version 2015-07-14 16:02:03 +02:00
Jaime van Kessel
2683fa0958 Added grouping action 2015-07-14 10:25:08 +02:00
Arjen Hiemstra
89b175bc5c Merge branch '15.06'
* 15.06:
  Do not cause "dictionary changed size during iteration" errors when changing view
  Adds an idle-state for the layerview slider
  Adds an idle-state for the safebutton
  Sets the platform activity on true when a model is loaded
  Sets the platform activity on true when a model is loaded
  Create functions that get & set platform activity
  Send M104 to set the temperature to 0
  Do not store files that fail to load in recent files
2015-07-13 13:52:33 +02:00
Tamara Hogenhout
d41f1a410c Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 2015-07-10 17:53:55 +02:00
Tamara Hogenhout
a5f00f30ca Create functions that get & set platform activity
The platform activity is determined by whether there is a mesh in the build platform or not

Contributes to #128
2015-07-10 17:50:15 +02:00
Arjen Hiemstra
3e27c8b791 Do not store files that fail to load in recent files
Contributes to Ultimaker/Cura#103
2015-07-10 15:58:34 +02:00
Arjen Hiemstra
fec2207b50 Merge branch '15.06'
* 15.06:
  Also add the parent class' command line arguments
  Only process the layer data if the layer view is active.
  Write to the correct variable so bed temperature is properly updated
  Correct a copy-paste error in getConnectionList
  Properly close all open USB connections on shut down
  Catch errors when trying to close the connection thread
  Enlarge the zone where you can use scrolling to look trough the layer mode.
  tiniest detail concerning the padding of the layer count label
  Adds layer count
2015-07-10 13:10:15 +02:00
Arjen Hiemstra
8fa0468787 Also add the parent class' command line arguments
Contributes to #96
2015-07-10 11:25:40 +02:00
Arjen Hiemstra
c2e672591c Remove the output_device related stuff from CuraApplication and fix the qml
This is now properly handled by the Output Device API in Uranium
2015-07-08 21:42:20 +02:00
Arjen Hiemstra
6e4300b299 Try to load all plugins, not just plugins with certain metadata 2015-07-08 21:26:23 +02:00
Arjen Hiemstra
032e27c68c Merge branch '15.06' 2015-07-08 13:03:05 +02:00
Arjen Hiemstra
ef86eb480f Do not use a lambda but a member function so reloading works properly
Fixes #99
2015-07-07 13:02:15 +02:00
Arjen Hiemstra
9542819c7f Remove the cleanup code as it causes too many issues 2015-07-01 02:33:44 -07:00
Arjen Hiemstra
8b9dbec188 Reset configuration files on start if old config files were found 2015-06-30 18:06:58 +02:00
Arjen Hiemstra
651b4fdfea Final changes for release
Adds the release splash and changes the version to 15.06
2015-06-30 17:40:58 +02:00
Arjen Hiemstra
16e5b15ba1 Make short description of devices properly translatable
Contributes to #57
2015-06-30 12:27:17 +02:00
Arjen Hiemstra
b7912c30f7 Show a message to indicate we are saving to an SD card
Contributes to Asana issue 39317829262610
2015-06-30 12:26:51 +02:00
Tamara Hogenhout
6a1183f680 Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06 2015-06-25 18:39:25 +02:00
Tamara Hogenhout
c6151c2343 Restyling of the save to toolpath button
The save to button only shows a short description, not the entire description including device-name.

Contributes to #54
2015-06-25 18:38:43 +02:00
Arjen Hiemstra
5a5d85aed5 Bump version to .97 2015-06-25 08:58:44 -07:00
Arjen Hiemstra
58702d0bb7 Merge branch '15.06'
* 15.06:
  Store the disallowed areas as polygons and use those to test for intersection
  Account for skirt size and disallowed areas to set the scale to max size
  Fix the JSON file after moving the initial layer height setting
  Move initial layer thickness from layer height children into category
  Disable the low/high quality slicing and slider settings if we are not in simple mode
  Remove sidebar right margin
  Exclude ConsoleLogger and MLP* and OBJWriter plugins from the windows installer
  Switch to using a proper windows application
  Properly run the vcredist installer in quiet mode
  Use the application as source for the shortcut icon
  Bump version to 15.05.96
  Properly add and set the window icon
  Update UMO start/end gcode to reflect what is used in Cura 15.04
  Do not hide enable retraction check box even if all children are visible
  Update setting ranges to reflect those that are used in the current Cura
  lowers the printbed so the mesh and grid no longer z-fight
  If we skip an object because it does not have a bounding box, retrigger the change timer
  Restyling of the save to toolpath button
2015-06-25 14:24:35 +02:00
Arjen Hiemstra
886dac5781 Store the disallowed areas as polygons and use those to test for intersection
This prevents issues when trying to print larger things

Contributes to Asana issue 37107676459484
2015-06-25 13:54:36 +02:00
Arjen Hiemstra
753e9826e0 Bump version to 15.05.96 2015-06-24 10:47:04 -07:00
Arjen Hiemstra
22fecc4cd0 Properly add and set the window icon 2015-06-24 10:43:24 -07:00
Arjen Hiemstra
a429e362ad Merge branch '15.06'
* 15.06:
  Update changelog
  Correct the bottom offset we add when setting the volume for scale to max
  Display progress information during processing of layer data
  If findObject returns none but object_id != 0 use the selected object
  Offset the displayed rotation angle so it does not overlap the mouse cursor
  Abort attempts to connect if an error is thrown when connecting to the serial port
  Fix recent files on Windows
  Defer opening the webbrowser until the next run of the event loop
  Disable slicing and platform physics when an operation is being performed
  Rework LayerData mesh generation for improved performance
  Performance: Only calculate the platform center once, not for every poly
  Add application icons for all three platforms
2015-06-24 12:06:39 +02:00
Arjen Hiemstra
cbfdd08800 Correct the bottom offset we add when setting the volume for scale to max
Contributes to Asana issue 37107676459484
2015-06-24 11:59:10 +02:00
Arjen Hiemstra
3faccd5b3e If findObject returns none but object_id != 0 use the selected object
This works around an issue where the tool handles overlap the selected
object and thus context menu entries would not work.

Fixes #64
2015-06-24 11:59:10 +02:00
Arjen Hiemstra
8a63b8d110 Fix recent files on Windows
Contributes to Asana issue 33694049548880
2015-06-23 11:56:15 +02:00
Arjen Hiemstra
2c139c4037 Bump version to 15.05.95 2015-06-19 06:10:55 -07:00
Arjen Hiemstra
7949385764 Merge branch '15.06'
* 15.06:
  Format after translating, not before
  Change "Update" back to "Update Firmware"
  Properly translate mode menu
  Add russian translations
  Add missing translations to the list of translations to build
  Remember the previuos active tool on selection change
  Use python's webbrowser instead of Qt.openUrlExternally for opening urls
  adds styling for both the regular as the indeterminate progressbar
  adds styling for a regular progressbar
2015-06-17 16:15:00 +02:00
Arjen Hiemstra
2486030584 Format after translating, not before
Contributes to #57
2015-06-17 16:14:11 +02:00
Arjen Hiemstra
e795aaa45a Remember the previuos active tool on selection change
This prevents issues where activating a tool before selecting something
would change to the translate tool.

Fixes #53
2015-06-16 17:12:35 +02:00
Arjen Hiemstra
3c5096cebc Use python's webbrowser instead of Qt.openUrlExternally for opening urls
Qt.openUrlExternally crashes on Windows, but python webbrowser works. So
use that instead.

Fixes Asana issue 33694049548892
2015-06-16 17:12:35 +02:00
Tamara Hogenhout
38346dd95f Merge branch '15.06'
Conflicts:
	cura/CuraApplication.py
2015-06-10 15:18:45 +02:00
Arjen Hiemstra
5019a157a1 Bump version to .95 2015-06-09 05:22:28 -07:00
Arjen Hiemstra
fc33b34060 Save the state of collapsed/expanded categories
Fixes Asana issue 36436828173802
2015-06-09 13:38:23 +02:00
Arjen Hiemstra
56454a9c7a Add support for listing recent files
Fixes Asana issue 33694049548880
2015-06-08 17:50:29 +02:00
Arjen Hiemstra
8c12426760 Merge branch '15.06'
* 15.06:
  Add a background to the tool additional controls
  Rescale the current layer number based on the maximum layer
  Add a text field style that can be used for generic text fields
  Implemented feature described by #30
  Handle finished signal for the ReadMeshJob started from command line args
  Updated name in menu for firmware update
  Added exception handling to listen thread join
  Render a transparent ghost of the selection when things are selected.
  Fix for #29
2015-06-08 16:41:46 +02:00
Arjen Hiemstra
a53e56e282 Handle finished signal for the ReadMeshJob started from command line args
This puts the actual mesh into the scene rather than just loading it and
discarding it afterwards. Now file arguments supplied to the application
actually work.

Fixes "Open With" on Windows and the related Asana issue.
2015-06-05 13:26:51 +02:00
Arjen Hiemstra
3b03cfa949 Bump version to 15.05.93 2015-06-03 15:14:56 +02:00
Arjen Hiemstra
65781eee84 Set version to 15.05.92 2015-05-27 15:13:36 +02:00
Arjen Hiemstra
c5fd957170 Set version back to master for master branch 2015-05-27 15:12:56 +02:00
Arjen Hiemstra
f6fc819009 Fix context menu entries
Fixes Asana Issue 12
2015-05-18 17:20:02 +02:00
Arjen Hiemstra
ae71c309ac Move src to cura so we can use the same package for installed and source
Contributes to #41
Contributes to #42
2015-05-18 15:03:42 +02:00