1319 Commits

Author SHA1 Message Date
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +02:00
Arjen Hiemstra
9888a6eb42 Fix a merge error 2015-08-21 18:28:53 +02:00
Arjen Hiemstra
f099c30dfd Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (98 commits)
  15.10 Restyling of the message stack
  Fixed machine head polygons
  Removed unused settings from fdmprinter
  Added action for togling fullscreen
  Fixed usage of wrong checkbox in viewpage
  Added preference to disable automatic push free
  Added preference to disable auto center when selecting object
  Cleanup
  15.10 Restyling toolbar, viewmode button
  Update README.md
  Update README.md
  Added rudementary 3 point bed leveling
  15.10 New font for Cura
  15.10 Changes the styling for the open file button
  15.10 Changes the label names for the different action buttons
  Fixed typo
  Endstop now stops listening upon destruction
  15.10 Re-alignment of the messagestack
  Cleaned up code a bit
  Added heated bed check
  ...
2015-08-21 13:29:30 +02:00
Tamara Hogenhout
3cb3cce31c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-21 10:55:44 +02:00
Tamara Hogenhout
720577ff8e 15.10 Restyling of the message stack
specifically the progressbar, styling of the messages and colors

Contributes to: issue CURA-60
2015-08-21 10:54:39 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Arjen Hiemstra
a425036c4c Merge branch '15.06'
* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
2015-08-18 17:59:16 +02:00
Jaime van Kessel
49e39d637c Added cutoff distance 2015-08-13 11:25:34 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00
Arjen Hiemstra
ae79139cc4 Handle Open File events on Mac OSX 2015-08-11 16:48:50 +02:00
Jaime van Kessel
2119d76ab2 Changes to meshreading, which now returns node instead of mesh 2015-08-11 11:35:25 +02:00
Arjen Hiemstra
f60dc01e66 Disable machine detection code for the moment as it needs to be ported 2015-08-05 21:12:21 +02:00
Arjen Hiemstra
1947d773a3 Update all usage of activeMachine to the new API 2015-08-05 20:12:29 +02:00
Arjen Hiemstra
842689d88e Update all uses of the Resources API with the changed API 2015-08-05 17:26:52 +02:00
Arjen Hiemstra
1819caaed4 Merge branch 'output_device'
* output_device:
  Update all plugin metadata to specify API version
  Remove LocalFileStorage from required plugins and add LocalFileOutputDevice
  Add RemovableDrive plugin that has been moved from Uranium
  Add an icon for "save all" and only enable the action when it makes sense
  Disable recent files if there are no recent files and add an icon
  Properly implement Save Selection
  Return empty string so we get no errors about assigning undefined to string
  Update SaveButton to the changed OutputDevicesModel API
  Update GCodeWriter to the new API
  Add mime types to GCodeWriter plugin
  Write to the right device after changes in Uranium API
  Remove the output_device related stuff from CuraApplication and fix the qml
  Use the OutputDeviceModel for selecting output device
  Try to load all plugins, not just plugins with certain metadata
2015-07-31 17:37:25 +02:00
Arjen Hiemstra
b96b069c21 Remove LocalFileStorage from required plugins and add LocalFileOutputDevice 2015-07-31 17:07:06 +02:00
Arjen Hiemstra
a8c36282fb Merge branch 'master' into output_device
* master: (22 commits)
  Added grouping action
  LayerData now works by using decorators
  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
  feat: infill wipe dist; wireframe restructure & renaming; bugfix: draft_shield_height inherit_function
  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.
  included retraction_extra_prime_amount
  tiniest detail concerning the padding of the layer count label
  ...
2015-07-31 12:15:18 +02:00
Arjen Hiemstra
b22b79dcb6 Bump version 2015-07-27 16:39:05 +02:00
Jaime van Kessel
4318b7e5ab Original center is now used for merging 2015-07-27 14:36:24 +02:00
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