GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 02:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,533 Commits 295 Branches 268 Tags
Commit Graph

3533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arjen Hiemstra
0da07b55ce Display brand and color name in the material menu if they are different than "generic" 
Contributes to CURA-341
 2016-07-07 01:43:18 +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
Arjen Hiemstra
1f6e99f641 Add methods to get name filters, import and export containers to ContainerManager 
We should start replacing the other ways of import/export with this
since this uses the containerregistry provided contaienr types instead
of needing a different plugin type.

Contributes to CURA-341
 2016-07-07 01:39:38 +02:00
Arjen Hiemstra
6e153414a4 Do not try to write to read-only containers 
Contributes to CURA-341
 2016-07-07 01:37:54 +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
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
aba60b0105 Remove "Rename" button from Materials page and make the other ones work 
Since the name is generated from the metadata

Contributes to CURA-341
 2016-07-05 16:48:43 +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
Arjen Hiemstra
ce065d110d Finish implementation of ContainerManager 
Contributes to CURA-341
 2016-07-05 16:45:23 +02:00
Arjen Hiemstra
ff9e4c9bb7 Add some more documentation to ContainerManager 
Contributes to CURA-341
 2016-07-05 16:44:13 +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
Jaime van Kessel
0e098e38eb More fixes for changed setting object location 2016-07-04 13:10:29 +02:00
Arjen Hiemstra
6fbe354839 Fix ExtrudersModel to use the right location for ExtruderManager 
Contributes to CURA-342
 2016-07-04 13:03:10 +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
a882c43b2c Move MachineManager to cura/Settings and rename it to MachineManager 
Contributes to CURA-342
 2016-07-04 12:08:08 +02:00
Arjen Hiemstra
0e28b331fb Move Cura setting related classes to cura/Settings 
Contributes to CURA-342
 2016-07-04 12:07: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
Arjen Hiemstra
df3275a10a Update Machine and Profile pages with the changes made to ManagementPage 
Since all the individual properties are removed and we now just need to
handle the buttons ourself.

Contributes to CURA-342
 2016-07-04 11:43:27 +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
fieldOfView
0c23c26ac9 Code style 
CURA-1676
 2016-07-03 16:01:57 +02:00
Aldo Hoeben
cfad7996f2 Merge pull request #841 from Ultimaker/thopiekar-print-via-usb 
USBPrinting: Let's "Print via USB"
 2016-07-03 15:55:53 +02:00
Aldo Hoeben
41e30f4424 Merge pull request #844 from thopiekar/master-CURA-1676 
[CURA-1676] SplashScreen: Using system-default fontfamily
 2016-07-03 15:55:24 +02:00
Thomas Karl Pietrowski
cd14a15040 Using the correct placeholder 
Thanks to Ruben!
 2016-07-03 15:17:40 +02:00
Thomas Karl Pietrowski
a38606da4a SplashScreen: Using system-default fontfamily 
Contributes to CURA-1676
 2016-07-03 15:00:26 +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
Ghostkeeper
afe0104dc7 Merge pull request #838 from thopiekar/master-bq-hephestos2-preheat-workaround 
BQ Hephestos2 - Preheating temperature fix
 2016-07-03 12:41:17 +02:00
Thomas Karl Pietrowski
19a718205d 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.
 2016-07-01 21:27:36 +02:00
fieldOfView
b7906c9ce7 Fix warning about missing color in theme 
CURA-1036
 2016-07-01 15:26:24 +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
fieldOfView
c9b2a1d938 Properly prevent warning when no printer is connected. 
CURA-1036
 2016-07-01 11:51:46 +02:00
Jaime van Kessel
b06e61727c ZOffset decorator is now correctly copied 
CURA-1504
 2016-07-01 11:39:47 +02:00
Jaime van Kessel
095dbaaa8d Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 11:04:54 +02:00
Jaime van Kessel
91bfd2de27 Force focus instead of requesting it. 
Fixes CURA-1778
 2016-07-01 11:04:23 +02:00
fieldOfView
1466cb961d Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-01 10:12:30 +02:00
fieldOfView
fea534509e Fix two "critical errors" on startup 
CuraMachineManager.isGlobalStackValid would return None on startup, which qml does not like.

CURA-1585
 2016-07-01 10:12:11 +02:00
Jaime van Kessel
8b46dd197f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-01 09:52:52 +02:00
Jaime van Kessel
aaae2aa3d5 Minor check machine action GUI improvements 
CURA-1385
 2016-07-01 09:51:54 +02:00
fieldOfView
58ae1e923c Prevent warning when no printer is connected. 
CURA-1036
 2016-06-30 19:13:46 +02:00
fieldOfView
a7939c6f3d Fix empty material/quality profiles when switching variants 
CURA-1278
 2016-06-30 18:53:50 +02:00
Arjen Hiemstra
eb48a4e768 Set the new metadata when editing a material 
Contributes to CURA-342
 2016-06-30 17:32:43 +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