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

5951 Commits

Author SHA1 Message Date
fieldOfView
2ba2599d6b Remove debug statement and commented-out code 
CURA-1385
 2016-07-07 10:23:01 +02:00
Arjen Hiemstra
19fd2795e1 Mark XmlMaterialProfile as type "material" so the import/export code can find it 
Contributes to CURA-341
 2016-07-07 01:42:39 +02:00
Arjen Hiemstra
fdab77ff6a Also duplicate the base file when duplicating a material profile 
This way serialization will always be correctly performed and we can
generate
a machine/variant specifc ID for the duplicate.

Contributes to CURA-341
 2016-07-07 01:42:05 +02:00
Arjen Hiemstra
f21079b763 Store the base material file as a metadata property of XmlMaterialProfile 
And use the base_file property to check if we should serialize or not.

Contributes to CURA-342
 2016-07-07 01:41:00 +02:00
Jaime van Kessel
386cd40a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:33:07 +02:00
Jaime van Kessel
57d0ad1bd0 Made exception handling of slice info plugin way more robust 
CURA-1831
 2016-07-06 16:32:24 +02:00
Jack Ha
d3b8c7f8d5 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:22:28 +02:00
Jack Ha
2be8111f1b Restart timer after slicing is performed when not enabled. 
CURA-1502
 2016-07-06 16:21:03 +02:00
Jaime van Kessel
d42a97f036 Fixed firmware upgrade for um2+ 
CURA-1761
 2016-07-06 13:22:09 +02:00
Jaime van Kessel
6bf10bbbb3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 11:23:16 +02:00
Jaime van Kessel
59020fd98c CHeckup action now correctly resets every time you start it 
CURA-1385
 2016-07-06 11:20:06 +02:00
fieldOfView
c06e5f4d39 Remove unused name/id when importing a profile from a gcode file 
A unique name will be set from the filename by ContainerRegistry
CURA-1615
 2016-07-05 21:58:47 +02:00
Aldo Hoeben
c865bb13ea Merge pull request #821 from thopiekar/master-CURA-1615 
[CURA-1615] GCodeProfileReader/-Export: Rework
 2016-07-05 21:19:37 +02:00
Thomas Karl Pietrowski
25c81ce1f8 Just a little typo 2016-07-05 18:55:13 +02:00
Arjen Hiemstra
750ecfc2e1 Remove some now-useless code relating to spool weight 
Contributes to CURA-341
 2016-07-05 16:51:28 +02:00
Arjen Hiemstra
2bc3a10776 Properly handle machines that have no variants 
Contributes to CURA-341
 2016-07-05 16:51:02 +02:00
Arjen Hiemstra
827c7b84fd Do not try to set a property of a read-only material 
Contributes to CURA-341
 2016-07-05 16:47:26 +02:00
Arjen Hiemstra
e80a999740 Fix up readOnly property of XmlMaterialProfile 
Contributes to CURA-341
 2016-07-05 16:46:52 +02:00
Jaime van Kessel
aba0392728 Saving g-code no longer crashes 2016-07-05 10:46:38 +02:00
Jaime van Kessel
fc99cac05e Removed update firmware from extensions; This is now handled by machine actions 2016-07-05 09:39:18 +02:00
Jaime van Kessel
08502b9240 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-05 09:37:27 +02:00
Jaime van Kessel
44e4fc383e Changing active extruder no longer trigger re-slice 
CURA-1729
 2016-07-05 09:37:01 +02:00
fieldOfView
793f7824c7 Quick fix to restore slicing 
This list of zeros may have to match the number of extruders
CURA-1687
 2016-07-04 19:14:48 +02:00
Jack Ha
012484a4f1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 17:35:32 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder 
CURA-1687
 2016-07-04 17:11:03 +02:00
U-ULTIMAKER\j.ha
84b736df07 first commit in Cura! fix CURA-1085, time estimate is reset before every slice action 2016-07-04 17:08:35 +02:00
Arjen Hiemstra
6f3fa19890 Fix up plugins that use ExtruderManager 
Since it has been moved to cura.Settings
 2016-07-04 13:16:04 +02:00
fieldOfView
90fa0f0564 Make Select Upgrades page look like the other pages 
CURA-1385
 2016-07-04 13:14:40 +02:00
Jaime van Kessel
0e098e38eb More fixes for changed setting object location 2016-07-04 13:10:29 +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
Jaime van Kessel
1242d6bf52 Added UMO upgrade selection 
CURA-1385
 2016-07-04 11:24:31 +02:00
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