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

453 Commits

Author SHA1 Message Date
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
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
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
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
Arjen Hiemstra
66a9c63048 Add not using numpy.insert explanation to ProcessSlicedObjectJob 
Contributes to CURA-708
 2016-03-03 11:52:56 +01:00
Jaime van Kessel
ef206f5ab7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-03 11:36:54 +01:00
Jaime van Kessel
c4c5ba6c22 Top layers are now correctly updated when object is selected 
CURA-992
 2016-03-03 11:36:28 +01:00
Ghostkeeper
f6fc5fea06 Fix slicing not interrupting first layer processing job 
The layer processing job that was triggered by switching to layer view was not stored in the field. The field is where the start of slicing looks for jobs to abort.

Contributes to issue CURA-864.
 2016-03-03 11:31:59 +01:00
fieldOfView
5cb1e9e2a6 Tweak layer slider appearance 2016-03-03 09:00:52 +01:00
fieldOfView
90fda4cb3d Remove defaults section from current settings before adding it to a gcode file. 
Contributes to CURA-936
 2016-03-02 21:18:16 +01:00
Ghostkeeper
7a913bf99a Fix comment 
It had some variable name pasted into it by accident.

Contributes to issue CURA-936.
 2016-03-02 17:31:58 +01:00
Jaime van Kessel
9c5e169f2b Loaded profiles are now marked as dirty so they are saved correctly 
CURA-936
 2016-03-01 16:24:43 +01:00
Jaime van Kessel
e90fd95495 Profile importing now checks if it's the right file type 
Contributes to CURA-936
 2016-03-01 15:16:50 +01:00
Jaime van Kessel
41d00af345 Moved timer back again, as arjen fixed the real issue 2016-03-01 10:57:29 +01:00
fieldOfView
51ad894711 Properly disable Per Object Settings toolbutton on first start 
On an empty profile, the cura/active_mode preference is not set so the code disabling the button was not called.

Fixes CURA-901
 2016-03-01 10:34:00 +01:00
Jaime van Kessel
7985a961c4 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-01 09:31:05 +01:00
Jaime van Kessel
fa59416dc4 Added warning to logging if no one at a time print is possible 
CURA-972
 2016-03-01 09:30:33 +01:00
Arjen Hiemstra
3afd3f2209 Use the right style for the layer view slider and add a busy indicator to the current layer field 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
110c3fa754 Do not react to all Scene changes in LayerView but just childrenChanged 
When the layer data is updated, a new node is attached to the scene
root. We can thus watch for only children changes since everything else
can be ignored.

Contributes to CURA-938
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
f2d98cfba3 Do not show a message when processing top layers but rather leave it up to QML 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
c684e96ef1 Expose the new busy property to QML 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Arjen Hiemstra
e0afc1535a Add a busy property to LayerView that indicates whether we are currently building top layers 
Contributes to CURA-957
 2016-03-01 02:11:46 +01:00
Jaime van Kessel
67d10ef0a2 UpdateTopLayer timer is now only triggered when max layers changes 
CURA-969
 2016-02-29 15:51:40 +01:00
Jaime van Kessel
00dcf339c8 Visibility of processing message is now correct when switching between views. 
CURA-971
 2016-02-29 15:11:13 +01:00
Jaime van Kessel
636d6af2de Removed reference to removed profile selection 2016-02-29 14:18:00 +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