GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,904 Commits 292 Branches 265 Tags
Commit Graph

64 Commits

Author SHA1 Message Date
Jaime van Kessel
d83241f13a Add missing typing to number of decorators 2018-09-27 14:29:09 +02:00
Jaime van Kessel
a8fc6aabcc Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks 2018-09-07 16:27:56 +02:00
Lipu Fei
bd47dfef75 Revert "Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2"" 
This reverts commit 89ed2bcff80a7a414f77c455baa0023c631eae7c.
 2018-08-13 11:23:10 +02:00
Ian Paschal
89ed2bcff8 Revert "Merge pull request #4203 from Ultimaker/CURA-5538-fix-one-at-a-time-order-2" 
This reverts commit 82e1a7c5fc43a12d1498779d392286c6e49ee4ea, reversing
changes made to 1915659393b72f7e4d4dbd9b73e92b8a665efcdc.
 2018-08-10 11:45:25 +02:00
Lipu Fei
95481b8560 Fix print order for one-at-a-time mode 2018-08-06 17:23:01 +02:00
Diego Prado Gesto
f1b0c6238f CURA-5330 Add return type to some constructors 2018-06-13 11:01:30 +02:00
Diego Prado Gesto
7f34d7615e CURA-5330 Add typing to CuraSceneNode 2018-06-08 16:56:52 +02:00
Diego Prado Gesto
e5e96bc600 Merge branch 'master' into mypy_fixes 
Contributes to CURA-5330
 2018-06-08 15:29:22 +02:00
Ghostkeeper
258a90d850
Fix parameter 
Oops again. I should not do this when I have 30 seconds left on the clock.

Contributes to issue CURA-5330.
 2018-06-04 13:00:57 +02:00
Ghostkeeper
360d4f14e4
Fix broken import 
Oops.

Contributes to issue CURA-5330.
 2018-06-04 12:59:44 +02:00
Ghostkeeper
68ddf443a1
Use explicit key-word arguments instead of kwargs 
Makes it easier to use, and better self-documenting.

Contributes to issue CURA-5330.
 2018-06-04 12:58:56 +02:00
Ghostkeeper
8ba592b593
Fix circular import with CuraApplication again 
Contributes to issue CURA-5330.
 2018-06-04 09:48:50 +02:00
Ghostkeeper
aff341eac9
Add casts for result of deepcopy 
Because deepcopy should return the same object as what is provided as input.

Contributes to issue CURA-5330.
 2018-06-04 09:48:30 +02:00
Ghostkeeper
9fb4511f52
Add function typing 
This causes MyPy to discover errors in this file.

Contributes to issue CURA-5330.
 2018-06-04 09:43:13 +02:00
Lipu Fei
051dd7a6e9 WIP: Make application initialization and start up more clear 
- Create SingleInstance class to handling single instance stuff.
 - Instead of calling getInstance() everywhere, initialize each object
   explicitly in order when application starts and getInstance()s do not
   create instances any more and they merely return the created
   instances.
 - Only set initial values in construtor functions __init__(). Move the
   initialization of context-aware (i.e. things that depend on other
   things) to separate functions.
 - Split application creation and initialziation into several steps and
   them should be called explicitly in the correct order.
 2018-05-04 09:57:02 +02:00
fieldOfView
523e6a59e3 Exclude non-printing-meshes from bounding box of parents 
Non-printing-meshes inside a group should not affect push apart or drop to build plate
 2018-04-09 11:29:49 +02:00
Ian Paschal
19792fc1a6
Merge pull request #3524 from fieldOfView/fix_support_eraser_grouping 
Fix support eraser grouping
 2018-03-20 09:48:10 +01:00
fieldOfView
d123efd3eb Fix loading parented objects from 3mf files 2018-03-19 18:25:40 +01:00
Jack Ha
bd775cf32e CURA-4400 fix support_extruder_nr values in overhang angle and SliceInfo 2018-03-19 10:56:40 +01:00
Jack Ha
e3dd7a449d CURA-5090 speedups by using qtimers on updating mostly visual elements 2018-03-14 16:09:59 +01:00
Jack Ha
16cebe35ef CURA-4400 added docs to new functions 2018-03-07 16:41:03 +01:00
Jack Ha
7fd0a9b98b CURA-4400 fixed multiply 2018-03-05 17:01:53 +01:00
Jack Ha
bad637eb14 CURA-4400 fixed merge conflicts 2018-03-05 16:47:40 +01:00
Lipu Fei
c0604e5c75 Move MultiBuildPlateModel into Models folder 2018-03-01 15:25:11 +01:00
Jack Ha
657a52a5e7 CURA-4400 add checking for enabled extruder in setting _outside_buildarea, cleaned up a bit and factored some functions out BuildVolume 2018-03-01 11:54:31 +01:00
Jack Ha
11bad271d3 CURA-4400 set extruder numbers of settings to an enabled extruder; added SettingOverrideDecorator by default in CuraSceneNode 2018-02-28 15:56:45 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Jaime van Kessel
516d7015e4 Fixed some issues caused by the multi buildplate system 2018-02-05 11:37:36 +01:00
Jack Ha
7856d61b5a CURA-4425 scale image to full size; still has a bug that it is shifted vertically; still need to clean code 2018-02-01 17:31:43 +01:00
Diego Prado Gesto
2770ff5848 CURA-4425 Remove debug printout 2018-02-01 15:45:17 +01:00
Diego Prado Gesto
056ae4fe68 CURA-4425 Small refactor to avoid using repeated code 2018-02-01 15:22:45 +01:00
Jack Ha
c42f186812 CURA-4425 first thumbnail in UFP file; updated CuraSceneModel and PreviewPass 2018-01-31 17:08:32 +01:00
Jack Ha
b0d0b75662 Merge branch '3.2' 2018-01-23 14:25:11 +01:00
Lipu Fei
f45de9654b Revert "Remove unused import" 
This reverts commit cf556ccf8ff7116af0014ffc91c019b26cf4f364.
 2018-01-23 12:39:07 +01:00
Ghostkeeper
f5e40c2281
Merge branch '3.2' 
Contributes to issue CURA-4797.
 2018-01-23 11:27:17 +01:00
Ghostkeeper
cf556ccf8f
Remove unused import 
Contributes to issue CURA-4797.
 2018-01-23 11:22:24 +01:00
ChrisTerBeke
4d0eaf6093 Merge branch 'feature_headless_docker' of https://github.com/Ultimaker/Cura into feature_headless_docker 2018-01-17 17:01:58 +01:00
Jack Ha
8a53549bce CURA-4033 split update bounds for a single node in buildvolume and also call it from readMeshFinished 2018-01-17 17:01:03 +01:00
ChrisTerBeke
02b681a8f2 Fixes for slicing 2018-01-16 15:10:16 +01:00
ChrisTerBeke
d19b2fb8d9 Fix merge conflicts with master 2018-01-16 09:11:30 +01:00
Jack Ha
c5c357d126 Fixed merge conflicts of cherry picking dimensions fix 2018-01-15 09:48:17 +01:00
ChrisTerBeke
bd1bf2caaf Add use_gui flag in application, don't use theme functions when not using gui 2018-01-12 17:38:47 +01:00
Lipu Fei
b54b075cc9 Use isinstance() instead or issubclass() 
CURA-4525
 2018-01-12 16:42:34 +01:00
Jack Ha
87105e6d06 CURA-4525 fix printing dimensions 2018-01-11 14:30:59 +01:00
Jack Ha
584f477b54 CURA-4525 fix deleting last item 2018-01-08 14:28:09 +01:00
Jack Ha
164e5fdc8e CURA-4525 change active build plate if that build plate does not exist anymore; disable context menu items for build plates when no selection 2018-01-08 13:55:42 +01:00
Jack Ha
e638c21acb CURA-4525 fix selected object will select correct build plate (not only visualization) 2018-01-08 11:30:57 +01:00
Ghostkeeper
502332ee3e
Revert "Account for getConvexHullTransformedVertices returning None" 
This reverts commit 564a97d5a80545f5eebdc63de7c48a1a435ad2ea.
 2018-01-05 09:17:02 +01:00
Ghostkeeper
63f7902fca
Revert "Simplify code flow a bit" 
This reverts commit 2c45efb70de003b431707aadfc2a3cb37e4dc39c.
 2018-01-05 09:16:03 +01:00
Ghostkeeper
2c45efb70d
Simplify code flow a bit 
Use if branches for the unhappy flow, so that it's clear that this behaves as an early-out. This also prevents the need for declaring variables out of scope, which is not an issue with Python anyway.
 2018-01-04 17:23:43 +01:00