3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-20 21:27:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
26315 commits 307 branches 270 tags 779 MiB
Commit graph

26315 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
696f904f3e isGlobalStack valid no longer remains false after it has been invalid once 2016-06-24 15:59:31 +02:00
Jaime van Kessel
727c34b535 HasUser settings now returns False when no container stack is found 2016-06-24 15:45:11 +02:00
Tim Kuipers
4eaf09e982 JSON fix: the height of the extruder switch z hop is now equal to the zhop height (CURA-1506 CURA-1061) 
making the height configurable is quite difficult with how retraction currently works and there is not a lot of added value
 2016-06-24 15:25:18 +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
8bc2c6e042 Tweak styling 
CURA-1036
 2016-06-24 14:41:52 +02:00
fieldOfView
f6e31cd97a Fix updating monitored values 
Though the PrintMonitorModel was a nicer solution, it broke the binding of values coming from the PrinterOutputDevices

CURA-1036
 2016-06-24 14:35:31 +02:00
Jaime van Kessel
07c25edb0f Removed unused code 2016-06-24 13:47:52 +02:00
fieldOfView
00ad7b23ff Prevent QML warnings when there is no connected printer 
CURA-1036
 2016-06-24 13:39:24 +02:00
Tim Kuipers
3e67291e41 Merge branch 'master' into feature_zhop_over_other_material 2016-06-24 13:30:59 +02:00
Tim Kuipers
ccd97f1994 JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061) 2016-06-24 13:29:40 +02:00
fieldOfView
beff54e5b1 Refactor print monitor as styleable listview 
Listview updates when print monitor values becomes available.

CURA-1036
 2016-06-24 12:50:39 +02:00
fieldOfView
2143fc14ab Add print job name 
CURA-1036
 2016-06-23 21:58:45 +02:00
fieldOfView
d613863d83 Tweak colors and icons for print monitor 
CURA-1036
 2016-06-23 21:50:51 +02:00
Thomas Karl Pietrowski
1fdf835c19 GCodeProfileReader: Increasing the setting version 2016-06-23 19:40:52 +02:00
Thomas Karl Pietrowski
6a1942c254 GCodeWriter: Exporting the data as done on regualar exports 2016-06-23 19:40:00 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
Arjen Hiemstra
b2ef607cb6 Fix the material setting list to use a simple placeholder 
Contributes to CURA-342
 2016-06-23 17:34:35 +02:00
Arjen Hiemstra
1cb836aea5 Add a ReadOnlySpinBox control that provides a spinBox with a readOnly property 
Contributes to CURA-342
 2016-06-23 17:33:55 +02:00
Arjen Hiemstra
f71ddc4b9f Start implementing view and edit support in the materials page 
Contributes to CURA-342
 2016-06-23 17:31:50 +02:00
fieldOfView
fe05aa18cb Resize camera-image with viewport 
CURA-338
 2016-06-23 17:27:12 +02:00
Jaime van Kessel
d6aacf24b9 Added JobName to network output device 
CURA-1036
 2016-06-23 17:07:20 +02:00
Jaime van Kessel
d0aa33f57f Added jobName property 
CURA-1036
 2016-06-23 17:05:45 +02:00
Jaime van Kessel
85942583b1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-23 16:39:09 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change 
CURA-1385
 2016-06-23 16:38:04 +02:00
Jaime van Kessel
a1c9f055c8 UI updates 
CURA-336
 2016-06-23 16:24:17 +02:00
Jaime van Kessel
a61ac82433 Linking a key to a printer now re-checks connection 
CURA-336
 2016-06-23 16:20:20 +02:00
Jaime van Kessel
bb9d3a47ef Printer can now actually be linked 
CURA-336
 2016-06-23 16:15:56 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	cura/CuraApplication.py
 2016-06-23 15:53:53 +02:00
Jaime van Kessel
3b51c31772 Meta data of the printer is now also visible 
CURA-336
 2016-06-23 15:46:12 +02:00
Jaime van Kessel
01eb65f303 Removed accidental profile_reader stuff 2016-06-23 15:02:45 +02:00
Jaime van Kessel
e94f94767e Updated UX of detected printers 
CURA-336
 2016-06-23 14:39:50 +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
Jaime van Kessel
0cee5b78df Print discovery now lists all found human readable names 
CURA-336
 2016-06-23 14:25:46 +02:00
Jaime van Kessel
16fcf2208b Refactoring & exposing of properties 
CURA-336
 2016-06-23 14:19:56 +02:00
Jaime van Kessel
9a4fc0345c All found devices are now listed in the discover action 
CURA-336
 2016-06-23 14:17:50 +02:00
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page 
CURA-1385
 2016-06-23 14:15:39 +02:00
fieldOfView
19412c5bda Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-23 14:08:49 +02:00
fieldOfView
3f7f6f8a23 Skip containers that can not be serialized 
CURA-1445
 2016-06-23 14:08:38 +02:00
Jaime van Kessel
f199d490bb Action now has a list of found UM3 keys 
CURA-336
 2016-06-23 14:04:50 +02:00
Jaime van Kessel
d7bb807e2b Added stub QML page for discovery action 
CURA-336
 2016-06-23 13:35:25 +02:00
Arjen Hiemstra
38ce6cd4b8 Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup 2016-06-23 13:33:51 +02:00
Arjen Hiemstra
8c8caa2cac Use the right property for the property provider 
Otherwise we get a bunch of errors from the per object settings tool
 2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +02:00
Jaime van Kessel
b14ae94190 Starting UMOCheckup before connection was established now works correctly 
CURA-1385
 2016-06-23 13:10:57 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
6909cf211a Fixed layout 
CURA-1385
 2016-06-23 11:42:18 +02:00
Jaime van Kessel
35a8e7ca94 Added missing decorator 
CURA-1385
 2016-06-23 11:41:13 +02:00