GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-18 03:16:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,027 Commits 290 Branches 260 Tags
Commit Graph

2027 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas-Karl Pietrowski
9fc573a7f9 Merge remote-tracking branch 'upstream/master' into master-code-fixes 2016-03-15 12:20:15 +01:00
Thomas-Karl Pietrowski
eee1be94ab Removing unused imports and rename built-in varibales/functions into save one 
* The new names for the variables might be misleading...
 2016-03-15 12:18:44 +01:00
Thomas-Karl Pietrowski
5ae63f2de1 Removing unused imports 2016-03-15 12:17:59 +01:00
Thomas-Karl Pietrowski
95d9700c0e Removing unused import and marking other as (probably) used imports 2016-03-15 12:16:14 +01:00
Thomas-Karl Pietrowski
7be6340dd5 Cleanups in cura/CuraApplication.py 
* Removed unused imports
* Replaced i with _ in for-loop (removes message about unused variable)
* As we have "Exception as e" use e in debug message
 2016-03-15 12:14:18 +01:00
Thomas-Karl Pietrowski
bbf931450a Marking another unused variable 2016-03-15 12:09:49 +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
Tim Kuipers
1608f06c6c Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-15 10:00:50 +01:00
Tim Kuipers
69997587e9 JSON: introduced Outer Wall Inset (CURA-1098) 2016-03-15 10:00:41 +01:00
fieldOfView
9c2f9e3aac Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-14 17:42:57 +01:00
fieldOfView
4e803a0815 Fix errors starting Cura with no machine selected 
Contributes to CURA-855
 2016-03-14 17:42:29 +01:00
Thomas-Karl Pietrowski
115d5dceae Removing more unneeded imports 2016-03-14 17:26:21 +01:00
Thomas-Karl Pietrowski
7bc99c8c19 Removing unneeded imports and marking unused variable 
Not sure whether there is a WIP on the unused variable
 2016-03-14 17:18:45 +01:00
Thomas-Karl Pietrowski
6993e9e695 Renaming locals to copied_locals 
"locals" is something that comes with Python. Better renaming it.
 2016-03-14 17:16:23 +01:00
Thomas-Karl Pietrowski
429e54bc8a Removing unused import 2016-03-14 17:15:57 +01:00
Thomas-Karl Pietrowski
5a5664e164 RemovableDriveOutputDevice: Use device.getId() 
Should fix unmounting on OSX. Found this solution in Linux*.py.

Untested and fingers crossed...
 2016-03-14 17:07:02 +01:00
Thomas-Karl Pietrowski
3b8000035d Remove unneeded imports 2016-03-14 17:06:44 +01:00
Thomas-Karl Pietrowski
19ccfdfbd7 RemovableDriveOutputDevice: Same for OSX 
See 0b0bc8080591a5cce098e9d47ff12224c924347d
 2016-03-14 17:04:51 +01:00
Thomas-Karl Pietrowski
0b0bc80805 RemovableDriveOutputDevice: Making output of uname command useful 2016-03-14 17:03:08 +01:00
Thomas-Karl Pietrowski
9ccd903fc9 Fixing typo 2016-03-14 16:57:58 +01:00
Thomas-Karl Pietrowski
60d1f34b17 Removing unused import 2016-03-14 16:57:21 +01:00
Thomas-Karl Pietrowski
48d06fea50 Fixing typo 2016-03-14 16:50:28 +01:00
Thomas-Karl Pietrowski
2e8d653fa5 webbrowser is not used here anymore 2016-03-14 16:38:21 +01:00
Thomas-Karl Pietrowski
ca65547f05 Remove unused imports 2016-03-14 16:06:10 +01:00
fieldOfView
eb8a1bea8d Add styling for disabled controls 
Contributes to CURA-573
 2016-03-14 15:58:25 +01:00
Thomas-Karl Pietrowski
f2da1db984 We only use os.path here 2016-03-14 15:50:59 +01:00
Thomas-Karl Pietrowski
3893cd06bd platform gets imported twice 2016-03-14 15:49:47 +01:00
Thomas-Karl Pietrowski
2a104bc6da Remove unused imports and replace object with entry 
"object" is also a built-in function of python
 2016-03-14 15:47:17 +01:00
Thomas-Karl Pietrowski
cbc7f0c1de Remove unneeded line 
This variable gets redefined later...
 2016-03-14 15:45:02 +01:00
Thomas-Karl Pietrowski
27da5c56c0 Marking unused variable 2016-03-14 15:43:57 +01:00
Ghostkeeper
16f059d31c Merge pull request #664 from thopiekar/master-usb-printing 
USBPrinting: Cleanups to USBPrinterManager
 2016-03-14 15:39:04 +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
a00f0ece18 Adding #@UnusedImport to ignore this import 2016-03-14 15:34:42 +01:00
Thomas-Karl Pietrowski
27423205b0 Rename type into hook_type 
"type" itself if a built-in function. Using this name could be unsave.
 2016-03-14 15:32:51 +01:00
Thomas-Karl Pietrowski
6adfbf4b90 Removing import of "os" 
"os" is only needed for Windows as far as I can see it. However, it gets reimported for Windows, as you can see in line 22.
 2016-03-14 15:30:15 +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
Tim Kuipers
d668438d1f JSON: merge fix: support_minimal-diameter was double.. 2016-03-14 13:57:13 +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