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

1520 Commits

Author SHA1 Message Date
Arjen Hiemstra
c9b1c36cc3 Add some documentation to XmlMaterialProfile 
Contributes to CURA-342
 2016-07-04 11:00:54 +02:00
Jaime van Kessel
53087bd278 Added stubs for UMO upgrade selection 
CURA-1385
 2016-07-04 10:28:37 +02:00
Jaime van Kessel
ea9e7f1755 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 10:27:46 +02:00
Jaime van Kessel
41147b5128 Machine action labels are now translatable 
CURA-1385
 2016-07-04 10:26:59 +02:00
Thomas Karl Pietrowski
c67d2faac3 CuraEngineBackend: Keep the last 200 lines of logged messages 
Don't know how much lines we will need exactly, but I think 200 are
enough for the moment.

Contributes to CURA-1775
 2016-07-03 14:39:16 +02:00
Thomas Karl Pietrowski
ec41fce7bd USBPrinting: Let's "Print via USB" 
Already made that correction in the past. When print monitor was merged it appeared again.
 2016-07-03 13:26:51 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print 
CURA-1036
 2016-07-01 15:06:49 +02:00
fieldOfView
6800991fa1 Fix USBPrinterOutputDevice to work with the Print Monitor 
CURA-1036
 2016-07-01 14:32:40 +02:00
Jaime van Kessel
aaae2aa3d5 Minor check machine action GUI improvements 
CURA-1385
 2016-07-01 09:51:54 +02:00
Arjen Hiemstra
ded4c89cb5 Ensure metadata changes are propagated to the related containers 
Now we properly serialize the new metadata

Contributes to CURA-342
 2016-06-30 17:32:10 +02:00
Arjen Hiemstra
8badb061da Check for definition_id, not variant name 
Since the dict is supposed to be per definition

Contributes to CURA-342
 2016-06-30 15:08:00 +02:00
Arjen Hiemstra
26f7ba0a74 Fix up XmlMaterialProfile::serialize so we can properly serialize duplicated materials 
We now use GUID to look up all containers belonging to a material. In
addition, we handle the multiple containers better

Contributes to CURA-342
 2016-06-30 01:57:58 +02:00
Arjen Hiemstra
ee0160075e Override InstanceContainer::duplicate in XmlMAterialProfile 
So that we can set a new GUID for the material on duplicate

Contributes to CURA-342
 2016-06-30 01:55:53 +02:00
Johan Kristensen
41503d7d5b Adapting code to merge of simple_convex_hull and code cleanup. 2016-06-28 23:50:00 +02:00
Johan K
788f79f5ba Changing the message used from the engine from Layer to LayerOptimized. 2016-06-28 22:29:29 +02:00
Johan K
f184baadf0 Formulate layerview logic using numpy to speed up. Also changed layer data packets from engine to make it possible. 2016-06-28 22:29:29 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData. 
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
 2016-06-28 11:43:02 +02:00
Thomas Karl Pietrowski
d376719500 Better call it "Print via USB" 
I think this sounds better, because I understand "USB" as an technology. So you wouldn't say "Print with USB", but would fit if you say "Print with USB cable". So "Print via USB" should be more correct here.
 2016-06-27 09:48:16 +02:00
Thomas Karl Pietrowski
93cdce7b33 GCodeProfileReader: Fixing read of profiles from GCode 2016-06-24 16:01:47 +02:00
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