GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 08:48:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 290 Branches 260 Tags
Commit Graph

5951 Commits

Author SHA1 Message Date
Thomas Karl Pietrowski
d49ba80117 GCodeWriter: Getting always the correct container with the currently used profile. 2016-06-24 16:00:38 +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
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
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
Arjen Hiemstra
38ce6cd4b8 Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup 2016-06-23 13:33:51 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +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
fieldOfView
51259e2684 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-23 10:18:37 +02:00
fieldOfView
7c606b21b5 Remove some trailing spaces 
CURA-1615
 2016-06-23 10:18:27 +02:00
Aldo Hoeben
cf718a3a42 Merge pull request #818 from thopiekar/master-CURA-1445 
[CURA-1445] SliceInfo: Providing data from all containers
 2016-06-23 09:55:53 +02:00
Aldo Hoeben
097bcad427 Merge pull request #810 from thopiekar/master-CURA-1615 
[CURA-1615] Plugins: Updating GCodeProfileReader and SliceInfo
 2016-06-23 09:45:56 +02:00
Thomas Karl Pietrowski
c9ec81cbe2 Merge pull request #3 from thopiekar/master-CURA-1615 
GCodeProfileReader: Removing useless containername
 2016-06-22 23:25:36 +02:00
Thomas Karl Pietrowski
688accfab7 GCodeProfileReader: Removing useless containername 2016-06-22 23:25:04 +02:00
fieldOfView
08411e943c Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion 
and tweak Per Object Settings panel size

CURA-333
 2016-06-22 18:46:24 +02:00
Arjen Hiemstra
a3ea042d4b Implement serialization of XmlMaterialProfile 
Contributes to CURA-342
 2016-06-22 17:40:17 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
cbbb204718 Merge branch 'master' of github.com:Ultimaker/Cura into feature_multi_materialsnozzles 2016-06-22 16:32:37 +02:00
Jaime van Kessel
23ca2a3f54 Fixed layout issues 
CURA-1385
 2016-06-22 15:37:22 +02:00
Jaime van Kessel
1912722d31 Fixed requesting size of machine for bedLeveling 
CURA-1385
 2016-06-22 15:35:23 +02:00
Jaime van Kessel
4e854700f1 Machine_action plugin objects are now added as list 
CURA-1385
 2016-06-22 15:24:37 +02:00
Simon Edwards
6548930d46 Merge branch 'master' into simple_convex_hull 2016-06-22 15:09:53 +02:00
Jaime van Kessel
5aab4686ca Layout fixes 
CURA-1385
 2016-06-22 14:50:05 +02:00
Jaime van Kessel
c297b14e03 Added UMO checkup action 
CURA-1385
 2016-06-22 14:40:58 +02:00
Thomas Karl Pietrowski
3ea11d3063 SliceInfo: Removing debug code 2016-06-22 14:35:19 +02:00
Thomas Karl Pietrowski
4bc5883ad7 SliceInfo: Check for available data before submitting it 
The code here is self-explaining again..
 2016-06-22 14:30:20 +02:00
Thomas Karl Pietrowski
f1ac2405a7 Merge branch 'master-CURA-1615' of https://github.com/thopiekar/Cura.git into master-CURA-1445 2016-06-22 14:02:41 +02:00
Thomas Karl Pietrowski
1dc29fb984 SliceInfo: Correctly output the print time 2016-06-22 14:02:11 +02:00
Thomas Karl Pietrowski
e78bd92b7f SliceInfo: Adding all containers as serialized data 2016-06-22 14:01:23 +02:00
Jaime van Kessel
4ad7731efd Merge branch 'master' of github.com:Ultimaker/Cura into MachineActions 2016-06-22 12:45:29 +02:00
Jaime van Kessel
8cfc0737ac First run actions are now properly handled 
CURA-1385
 2016-06-22 11:49:35 +02:00
fieldOfView
6adc4ef284 Revert "Change spelling of "colour" to "color" for consistency" 
This reverts commit 963a2092efefb62f8f8b1216f0a7d05bbebb884d.

I still say we should use "colour" for consistency, but that change should not be part of this branch.

CURA-333
 2016-06-22 10:19:44 +02:00
fieldOfView
3fcfbb4e48 Fix extruder color when no extruder_nr has been added to an object 
CURA-345
 2016-06-22 09:55:24 +02:00
fieldOfView
963a2092ef Change spelling of "colour" to "color" for consistency 
I know "colour" is the more correct spelling, but Qt uses the spelling "color" and we have already adopted that spelling in a number of places.

CURA-333
 2016-06-22 09:55:23 +02:00
fieldOfView
f5bdc0295c Use color specified by material or nozzle to render objects 
CURA-345
 2016-06-22 09:55:23 +02:00
Jaime van Kessel
6f6d70ad0f Added upgradeFirmware as machineAction 
CURA-1385
 2016-06-21 17:00:26 +02:00
fieldOfView
8a206b74fd Use new-style signalemitter decorator instead of SingalEmitter subclass 
CURA-1615
 2016-06-21 16:24:07 +02:00
Jaime van Kessel
fb1313ceda BedLevel action now resets once it did all the steps 
CURA-1385
 2016-06-21 16:23:31 +02:00
Jaime van Kessel
65751d7400 Added completed signal to machine action, so model can notify display that it is completed 
CURA-1385
 2016-06-21 16:19:44 +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
181d16aad8 Running machine actions outside of first run is now possible 
CURA-1385
 2016-06-21 14:34:53 +02:00
Jaime van Kessel
924af37dff Fleshing out of bedleveling action 
CURA-1385
 2016-06-21 13:30:36 +02:00
Jaime van Kessel
8af2b076a7 Added plugin for UM machine actions 
CURA-1385
 2016-06-20 13:51:27 +02:00
Thomas Karl Pietrowski
eb6abdf773 Move f.close() into try: 
In case urlopen() fails, e.g. because of a missing internet connection,
f will be indefined.
 2016-06-18 14:07:14 +02:00
Thomas Karl Pietrowski
8f450d0d2f Sending serialized global_settings 
Containers currently don't have a function to return their content as
JSON or dict
 2016-06-18 14:05:32 +02:00
Thomas Karl Pietrowski
cbb8eebf72 Correcting and adding different things to SliceInfo 
* Replace regular print() with Logger.logException()
* Adding log message that reporting is turned off
* Rename variable "settings" to "global_container_stack". Should be less
misleading.
 2016-06-17 12:52:14 +02:00
Thomas Karl Pietrowski
4ca247cf37 Changing the profile name to something unique. 
Imported profiles will be now called "Custom profile (<G-code
filename>)"
 2016-06-17 12:41:24 +02:00