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

425 Commits

Author SHA1 Message Date
Jaime van Kessel
0c09df71d9 wizard now sets Target temperature 
CURA-1339
 2016-04-14 11:09:30 +02:00
Jaime van Kessel
58b216828a Added handling for when connection was never correctly added to list 
CURA-1339
 2016-04-14 11:06:11 +02:00
Jaime van Kessel
4f3489233c Added home head & bed implementations 
CURA-1339
 2016-04-14 11:02:43 +02:00
Jaime van Kessel
5f2e0ceec8 Fixes so the QML displays right temperatures again 
CURA-1339
 2016-04-14 11:02:16 +02:00
Jaime van Kessel
0a46567c17 USB printing now uses printeroutputdevice for temperatures 
CURA-1339
 2016-04-13 16:57:08 +02:00
Jaime van Kessel
0cd1031ec7 Changed USB printing to reflect changes in output device API 
CURA-1339
 2016-04-13 15:15:37 +02:00
Jaime van Kessel
63eb1793ad Renaming USBPrinterConnection 
CURA-1339
 2016-04-12 15:15:02 +02:00
ckielstra
4c233e75f4 Spelling 2016-04-08 11:06:24 +02:00
fieldOfView
27e3f8b33f Fix color of some texts on Linux with dark theme 
Use Label{} instead of Text{}

CURA-1143
 2016-04-07 18:57:11 +02:00
fieldOfView
6017d9176d Remove exception logging in USBPrinterManager because it caused an error every 5 seconds. 
CURA-1198
 2016-03-17 16:59:41 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
2df91d8e0b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 14:44:37 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling 
CURA-1102
 2016-03-17 14:44:09 +01:00
Ghostkeeper
4507560e30
Codestyle: Whitespace around operators 
A space on both sides around binary operators. A space after the comma.

Contributes to issue CURA-1102.
 2016-03-17 11:53:11 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling 
CURA-1102
 2016-03-16 15:18:11 +01:00
Thomas-Karl Pietrowski
6a4e2019dc Removing unused imports 2016-03-15 12:57:03 +01:00
Thomas-Karl Pietrowski
148c13ac31 Removing unused imports, fixing a indent and adding more logging 
* Added the logging here, because it was called "except Exception as e:", so "e" seems to be something relevant.
 2016-03-15 12:55:08 +01:00
Ghostkeeper
e4effc1236 Merge pull request #665 from thopiekar/master-code-fixes 
Fixing small issues in the code
 2016-03-15 10:57:50 +01:00
Thomas-Karl Pietrowski
af280b782e Rename name to printer_name 
"name" is a built-in function
 2016-03-14 15:39:01 +01:00
Thomas-Karl Pietrowski
3b58d1e2a5 Removing unused import of "os" 2016-03-14 15:38:05 +01:00
Thomas-Karl Pietrowski
bad862e72f USBPrinting: Adding lost check for "machine_heated_bed" 2016-03-14 15:09:10 +01:00
Thomas-Karl Pietrowski
b0e4f095a6 Merge branch 'master-usb-printing' of https://github.com/thopiekar/Cura into master-usb-printing 2016-03-14 14:49:25 +01:00
Thomas-Karl Pietrowski
e7bd07740e USBPrinting: Reordering and rethinking machine detection 
* Moved all machines again to a basic dictionary
** The idea is to collect all machines at one place, which are unmodified. In case there is a printer, which is modified, it goes to a seperate dictionary.
* The if-clauses now respect this idea (hopefully)
 2016-03-14 14:43:14 +01:00
Thomas Karl Pietrowski
6775d337f5 USBPrinting: Complete the note with a link to the hex files 2016-03-14 14:23:26 +01:00
Thomas-Karl Pietrowski
9f251a43e2 Merge branch 'master-usb-printing' of https://github.com/thopiekar/Cura into master-usb-printing 2016-03-14 14:16:35 +01:00
Thomas-Karl Pietrowski
4d0a2094a1 USBPrinting: Reordering printers in dictionaries 2016-03-14 14:13:26 +01:00
Thomas-Karl Pietrowski
b3f721cfa0 USBPrinting: Using the correct dictionary 
(Dirty coding does not make any sense..)
 2016-03-14 14:02:56 +01:00
Thomas Karl Pietrowski
8422356dc9 USBPrinting: Correcting typo 2016-03-14 13:57:27 +01:00
Thomas Karl Pietrowski
eed5f88b13 USBPrinting: Adding a short instruction 
Just added a short instruction where to find the id of the machine, just to make it easier for the vendor to fill in the correct values.
 2016-03-14 13:56:27 +01:00
Thomas-Karl Pietrowski
a1e673dc64 USBPrinting: Correcting indents 2016-03-14 13:34:49 +01:00
Thomas-Karl Pietrowski
a2915ddc80 USBPrinting: Correcting machine_with_heated_bed dictionary again (oops) 2016-03-14 10:16:53 +01:00
Thomas-Karl Pietrowski
d968d3e2b2 USBPrinting: Correcting machine_with_heated_bed dictionary 2016-03-14 10:14:12 +01:00
Thomas-Karl Pietrowski
29ea25d0b3 USBPrinting: Huge clean up in _getDefaultFirmwareName 
* Moving TODO on top of if clauses
* Moving all machine types and hex-file names into dictionaries
* Adding error messages for unknown printers
 2016-03-14 10:04:30 +01:00
Thomas-Karl Pietrowski
97a7cee3e2 USBPrinting: Using platform.system() for platform check 
As platform is already imported here, usig platform for the check is much easier.
 2016-03-14 09:42:57 +01:00
Thomas-Karl Pietrowski
8bbbb480a4 USBPrinting: Moving baudrate and correcting indent 
Moves the baudrate into the if clause, which looks at least for me better and just found a wrong indent
 2016-03-14 09:38:55 +01:00
Ghostkeeper
3690eafb72 Add filter_by_machine parameter to USBPrinting 
This was an oversight. When the filter_by_machine feature was added, we didn't think of the USB printing output device. The feature has no meaning here, since USB printing only supports g-code. Just ignore it.
 2016-03-10 10:46:54 +01:00
Jaime van Kessel
339ee12f90 Not being able to find firmware no longer blocks GUI 
Cura-440
 2016-02-29 13:57:40 +01:00
Ghostkeeper
b9bc14ea09 Make progress bar determinate when at 100% 
This gives the user a better indication that the firmware update is done. The progress bar is still sorta disfunctional, but hey even disabled people are people.

Contributes to issue CURA-440.
 2016-02-23 17:27:17 +01:00
Ghostkeeper
abed3d8c7d Make firmware update loading bar indeterminate 
There is no real progress to report, so it's actually indeterminate.

Contributes to issue CURA-440.
 2016-02-23 17:27:17 +01:00
Ghostkeeper
c41b9fb09a UMO firmware update to detect heated bed 
It detects it by virtue of whether the user indicated that the printer has a heated bed during the add printer wizard.

Contributes to issue CURA-440.
 2016-02-23 17:27:17 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Ghostkeeper
9379b0a97b Update translation from machine name to hex file 
There was an incongruence in the translation from the machine name to hex file. Sometimes the machine name was wrong. Sometimes the hex file was wrong.

Contributes to issue CURA-440.
 2016-02-12 17:09:42 +01:00
Tamara Hogenhout
c48051e39d marked the string as translatable 
Contributes to #CURA-526
 2016-01-18 12:19:59 +01:00
Arjen Hiemstra
949fd199a8 Fix the last code style issue 2015-11-30 11:56:08 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Arjen Hiemstra
751f58fb02 Merge branch '15.10' 
* 15.10: (39 commits)
  Remove unused import in StartSliceJob
  conforming to code style
  fix typo's..
  Adjust initial view to be slightly from the side
  uses a different method to check whether a machine name excists
  Sets the languageComboBox to the default language
  Remove per-group settings for now
  Make sure to send all settings when an object overrides the profile
  Properly emit writeStarted in RemovableDriveOutputDevice
  Add xy_offset setting to list of settings that trigger a disallowed area update
  Properly trigger a reslice when the active instance is changed
  Wizardpages without hack
  Only hides the window when there are no more pages
  Only add layer data node after all processing
  Also account for "xy_offset" setting for the disallowed areas
  JSON: workaround for stutter in spiralize vase: set travel speed to printing speed
  Adds a color for the error-messages
  Shows an error message when a user tries to add a printer with a name that already excists.
  JSON: support bottom stair step height defaults changed so that the bottom distance to the model isn't violated too much
  Try to use Protobuf CPP implementation if it is available
  ...
 2015-11-13 11:31:29 +01:00
Arjen Hiemstra
a1087150ef Properly clean up printer connections that are no longer available. 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
67e00221eb Display a message that there are no connected printers when trying to update firmware 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
37c977cea6 Properly end firmware update procedure and catch errors during firmware update 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
9626a604c2 Do not inherit BaseException, but use Exception 
As indicated by Python docs, custom exceptions should use Exception as
base.

Contributes to CURA-274
 2015-10-30 13:46:58 +01:00