1219 Commits

Author SHA1 Message Date
Jaime van Kessel
775e7f153b Empty containers now have fdmprinter as definition
CURA-1913
2016-07-14 11:26:56 +02:00
Jaime van Kessel
66a64a7a2b Removing object from a group is now possible
CURA-1891
2016-07-13 16:23:49 +02:00
Simon Edwards
642ea6791b When saving the quality profile data, also incorporate any user settings/changes.
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
2016-07-13 09:29:47 +02:00
Jaime van Kessel
1d2f7b3c36 Added logging to indicate reload all failed
CURA-1622
2016-07-08 15:54:39 +02:00
Jaime van Kessel
d2ad1ad153 Added more logging 2016-07-08 15:52:31 +02:00
fieldOfView
475277069f Add optional arguments to reusable messagebox
Contributes to CURA-1850
2016-07-08 11:25:31 +02:00
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog
Contributes to CURA-1730 and CURA-1850
2016-07-08 11:24:37 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00
Tim Kuipers
4349f6c75b fix: make infill_mesh visible by default because it's the only setting which is only visible in the per-object settings menu which is not normally visible (CURA-833)
Because it should never show up in the normal global/extruder settings tab, people might forget about this setting. It's one of the reasons per-object settings is awesome ^^.
2016-07-07 21:18:25 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing
Material Editing Support
2016-07-07 17:34:57 +02:00
Ghostkeeper
002f43598b Correct storing upgraded config location
Two big things had to happen for this: The resource types of quality and machine stack have to be defined before the initialisation of the version upgrade manager, since the version upgrade manager needs to know those storage locations at initialisation. But the storage location is still prefaced with '.config/UM' at this point, so instead we pass on the resource type (but the resource type still has to be defined before the init).

The other big change is that we now have to name the configuration type 'quality' and 'machine_stack' instead of 'instance_container' and 'container_stack' to coincide with the resource type. This allows us to be more consistent in later plug-ins when we also have to upgrade other instance container types.

Contributes to issue CURA-844.
2016-07-07 13:51:41 +02:00
Arjen Hiemstra
8476090ed2 Also expose the main Cura application object as CuraApplication to QML
This way we can start cleaning things up and moving away from the
"Printer" name

Contributes to CURA-341
2016-07-07 01:36:52 +02:00
Arjen Hiemstra
ce3a5f7e48 Update references to moved classes so things work again
Contributes to CURA-342
2016-07-04 12:08:38 +02:00
Arjen Hiemstra
7008e047f6 Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (76 commits)
  Added UMO upgrade selection
  Added stubs for UMO upgrade selection
  Machine action labels are now translatable
  Code style CURA-1676
  Using the correct placeholder
  SplashScreen: Using system-default fontfamily
  USBPrinting: Let's "Print via USB"
  BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
  Fix warning about missing color in theme
  Automatically show the Print Monitor when starting a print
  Fix USBPrinterOutputDevice to work with the Print Monitor
  Properly prevent warning when no printer is connected.
  ZOffset decorator is now correctly copied
  Force focus instead of requesting it.
  Fix two "critical errors" on startup
  Minor check machine action GUI improvements
  Prevent warning when no printer is connected.
  Fix empty material/quality profiles when switching variants
  Disable monitor buttons when there is no job running
  Move message stack "above" the viewport overlay
  ...
2016-07-04 11:45:59 +02:00
Thomas Karl Pietrowski
7f5f22d472 Moving Nvidia workaround to cura_app.py
* also added "debian" into the list of distributions
2016-07-01 19:37:24 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print
CURA-1036
2016-07-01 15:06:49 +02:00
Simon Edwards
551dc7d757 Fixes for the problem where duplicated objects were broken, missing hull 'shadows' or would fly off the build plate.
Contributes to CURA-1504 Improve performance/simplicity by using Convex Hulls in Scene Graph
2016-06-30 09:35:41 +02:00
Arjen Hiemstra
cd8bc3b60d Introduce a ContainerManager class to handle container actions like duplicate
Because MachineManager is getting rather large

Contributes to CURA-342
2016-06-30 01:53:48 +02:00
Arjen Hiemstra
a746710e26 Introduce a MaterialSettingsVisibilityHandler that will only show those settings relevant for materials
Contriubtes to CURA-342
2016-06-28 17:30:46 +02:00
fieldOfView
2ee745e1f9 Remove hack
i18nCatalog was being abused to do text replacement on HTML
2016-06-25 09:40:22 +02:00
fieldOfView
a4eee2dce6 Show relevant message on splash screen during startup 2016-06-25 09:38:10 +02:00
fieldOfView
55af0af755 Merge branch 'master' into feature_print_monitoring
# Conflicts:
#	resources/qml/Cura.qml
2016-06-24 14:55:12 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring
# Conflicts:
#	cura/CuraApplication.py
2016-06-23 15:53:53 +02:00
Arjen Hiemstra
f6866d703d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (110 commits)
  Rearrange MachineActions on Machines page
  Skip containers that can not be serialized
  Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup
  Use the right property for the property provider
  Clean up indentation
  Remove unused code
  Fix expanded settings for Per Object settings tool
  Use the expanded categories from Cura to expand the proper categories on startup
  Starting UMOCheckup before connection was established now works correctly
  Fixed layout
  Added missing decorator CURA-1385
  Restored accidental delete
  Removed extraneous space
  Refactoring; Renaming firstRunWizard to machineActionsWizard
  Added BedLevel as supported action to UMO
  Refactoring (Renaming variables so they are more clear & update documentation)
  Remove some trailing spaces CURA-1615
  GCodeProfileReader: Removing useless containername
  Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion
  Fix minor codereview issues
  ...
2016-06-23 14:37:00 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions
Machine actions
2016-06-23 12:59:03 +02:00
Arjen Hiemstra
3cc31fd9c2 When saving containers, use the mime type's preferred suffix instead of a hardcoded value
Contributes to CURA-342
2016-06-22 17:39:50 +02:00
Simon Edwards
9641a25f31 Fixed up the convex hull 'shadow' creation and deletion after the merge.
Contributes to CURA-1504
2016-06-22 14:48:15 +02:00
Simon Edwards
fd42a43270 Merge branch 'master' into simple_convex_hull
Conflicts:
	cura/BuildVolume.py
	cura/ConvexHullDecorator.py
	cura/ConvexHullJob.py
	cura/CuraApplication.py
2016-06-21 14:47:10 +02:00
Jaime van Kessel
8237047907 Actions are now added as buttons to machinePages
CURA-1385
2016-06-20 13:46:05 +02:00
Jaime van Kessel
6f7affa2bf Machine actions can now be triggered from QML
CURA-1385
2016-06-17 17:22:49 +02:00
Jaime van Kessel
af3e4e3a15 Machine actions can now be used as a plugin type for Cura
CURA-1385
2016-06-17 15:45:10 +02:00
Jaime van Kessel
3a46bb8d8a Added CameraImageProvider & camera handling
CURA-1036 and CURA-338
2016-06-16 09:34:43 +02:00
Thomas Karl Pietrowski
6a89062b0a Differencing between Platform from UM.* and UM.Scene.* 2016-06-15 16:03:18 +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
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
Jaime van Kessel
9626cddf34 Extruder trains are now correctly saved 2016-06-10 16:53:59 +02:00
Tim Kuipers
6bb1793d12 fix: moved jerk_travel visibility from json to CuraApplication (CURA-1443) 2016-06-10 13:48:43 +02:00
Tim Kuipers
149af8af28 Merge branch 'master' into feature_accelerations_and_jerk_per_feature_settigns_rework 2016-06-10 12:29:06 +02:00
Tim Kuipers
12a7b99cf7 fix: merge b3cfa62 went wrong, no slicing happened (CURA-1558) 2016-06-09 15:43:18 +02:00
Simon Edwards
c03588c6e5 Profile export now goes via the plugin system, and does the same filename checks as before.
Contributed to CURA-1667 Profile import/export
2016-06-09 14:14:48 +02:00
Tim Kuipers
b3cfa62775 Merge branch 'feature_settings_restricted_to_settingsbases' 2016-06-09 13:11:30 +02:00
fieldOfView
485ae53660 Show quality profile and user profile settings side-by-side on Profiles manager
Introduces ContainerSettingsModel, which can combine the settings of instances from multiple containers into one model.

Towards CURA-1668
2016-06-08 16:35:10 +02:00
Ghostkeeper
59c8a4e66d
Fix validation of extruder-type settings
Based on how ints are validated, since the data is the same.

Contributes to issues CURA-1278 and CURA-340.
2016-06-08 14:16:13 +02:00
Tim Kuipers
56b00ad425 JSON cleanup: removed settable_per_x when they were obvious and default (CURA-1560)
removed:settable_globally: true
settable_per_meshgroup: true
settable_per_extruder: true when settable_per_mesh was also true
2016-06-08 11:54:25 +02:00
Tim Kuipers
2e2437d163 feat: use settable_per_[mesh|extruder|meshgroup|globally] instead of global_only (CURA-1560) 2016-06-08 10:50:40 +02:00
Ghostkeeper
8b1c363932
Load current machine's extruders upon creation, start and switch of machines
This requires some trickery of initialising the extruder manager before the machine manager is initialised, so that it properly listens to global container stack changes.

Contributes to issues CURA-340 and CURA-1278.
2016-06-08 10:40:10 +02:00
Ghostkeeper
dff94b4559
Make ExtruderManager a QML context item
There were two singletons of this manager: One created by QML and managed by QML, and one created by us and managed by our own singleton pattern. That won't work! So we now manage just our own singleton type, and make it a context item for QML so it can use the manager too.

Contributes to issues CURA-340 and CURA-1278.
2016-06-07 11:55:14 +02:00
Ghostkeeper
927d33145f Move creating extruder manager logic to ExtruderManager
This logic was both in Extruder.py and in MachineManagerModel.py due to a planning mishap.

Contributes to issues CURA-1278 and CURA-340.
2016-06-06 15:15:33 +02:00
fieldOfView
b88f2847ef Fix saving machine instances to the cura profile
CURA-340, see c79b7bdd7a
2016-06-06 08:39:38 +02:00