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

2489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tim Kuipers
6665811348 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-14 12:03:03 +01:00
Tim Kuipers
b96f3d7733 JSON: make top_bottom_thickness available after all (CURA-1099) 2016-03-14 12:02:54 +01:00
Jaime van Kessel
5c6200a046 Removed unneeded override from profile 
CURA-1122
 2016-03-14 12:00:45 +01:00
Jaime van Kessel
525d4fbcc2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-14 11:30:52 +01:00
Jaime van Kessel
7d86fbd9cc Added warning icon 
CURA-1122
 2016-03-14 11:30:33 +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
Thomas-Karl Pietrowski
7a9e19555a Merge remote-tracking branch 'upstream/master' 2016-03-14 09:33:29 +01:00
Ghostkeeper
54ceafbcd0
Handle the flux capacitive fizbit ambigruously 
Makes the unambigruous fizbit warp correctly when subjugated to the flux capacitor. The limit of the reciprocative function seems to be computed correctly now.

Contributes to no issue.
 2016-03-11 17:39:53 +01:00
daid
8980600292 CURA-1104: Fix the incorrect "failed to eject drive" message for windows. 
The C windows API call was wrong. The lpBytesReturned parameter was set to
NULL. While the docmentation at:
https://msdn.microsoft.com/en-us/library/windows/desktop/aa363406(v=vs.85).aspx
states that it CANNOT be NULL if lpOverlapped is NULL. Overlapped is for
async operations. So the easiest way to fix this is to supply a proper
pointer.

I've also removed unused includes. And supplied the DeviceIoControl with
proper ctypes calling information to prevent other python->c problems.
 2016-03-11 15:13:09 +01:00
Jaime van Kessel
3b66e887b0 Added logging 2016-03-11 14:49:21 +01:00
Jaime van Kessel
34ed642e35 Revert "Make setting category headers bold" 
This reverts commit e56347501d0a61d52bfe632fbf4453d9ab083d1c.

No attached issue; Far to late in release cycle for people to circumvent the design process.
 2016-03-11 12:01:31 +01:00
Jaime van Kessel
7dea2506b6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-11 11:55:04 +01:00
Jaime van Kessel
5fbf4f336e Removed profile settings that already were on default 2016-03-11 11:54:31 +01:00
fieldOfView
e56347501d Make setting category headers bold 
Special request from Martijn
 2016-03-10 17:13:07 +01:00
Jaime van Kessel
a3eb212d68 Platform adhesion is now handled by inherit function 
Based on suggestion by ghostkeeper CURA-1068
 2016-03-10 15:09:15 +01:00
Jaime van Kessel
9f29af82b5 Fixed issues caused by 3b6aedd58530afde89de8039d08020cc33edf1ff 2016-03-10 14:07:03 +01:00
fieldOfView
83e4385e7e Revert "Reimport default profiles from 15.04.04" because I did not oversee 
the implications at the time

This reverts commit ce562713c3bf5951e43448746819fafc2261e8c6.
 2016-03-10 13:45:00 +01:00
fieldOfView
d8b082071d Merge branch 'feature_profilesorting' 2016-03-10 13:44:38 +01:00
Tim Kuipers
3b6aedd585 JSON: disabled top_bottom_thickness, shell_thickness and remove_overlapping_wall_parts_0_enabled (CURA-1099) 2016-03-10 12:43:07 +01:00
Tim Kuipers
e872d29636 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-10 12:08:17 +01:00
Tim Kuipers
3a377a616b profiles: machine_nozzle_size ==> line_width (CURA-1097) 2016-03-10 12:08:06 +01:00