115 Commits

Author SHA1 Message Date
Ian Paschal
d14f4ac678 CURA-5280 Preserve manually entered project name
Manual override of job name should also set the base name so that when the printer prefix is updated, it the prefix can be added to the manually added name, not the old base name.

This was a bit tricky because if you enter a job name, is that the job name or the base name? My answer is that it's both, and if you update your printer for the job, it will append a new prefix.

If this is not the desired behavior, and in fact once a custom name is set nothing can change it, then line 78 should be removed.
2018-05-23 16:28:35 +02:00
Jack Ha
ed1ba41aa6 Undo setting wrong name in PrintInformation. CURA-5323 2018-05-15 11:42:17 +02:00
alekseisasin
d433c54a0a If the file type is not registered still show it's name in project field CURA-5323 2018-05-14 17:42:54 +02:00
Aleksei S
9779c41071 Use MimeTypeDatabase to find loaded file extension and set proper project name
CURA-5323
2018-05-08 10:47:59 +02:00
Aleksei S
dfd9283ed5 Project name after importing
CURA-5323
2018-05-04 10:29:09 +02:00
Aleksei S
defb22dc07 Keep 'dot' in file name for type *.gcode.gz
CURA-5323
2018-05-03 18:11:45 +02:00
Aleksei S
b1c9b04a7a Fix: filenames cut by first dot, remove only file extension because file might have dot in name
CURA-5323
2018-05-02 17:17:45 +02:00
Diego Prado Gesto
626c424a02 CURA-5246 Just update the job name when it must be updated. 2018-04-20 15:00:40 +02:00
Lipu Fei
f24e1da934 Always update job name for gcode files
CURA-5246
2018-04-19 09:17:22 +02:00
Lipu Fei
83c728c89e Update job name when pre-sliced flag changes
CURA-5246
2018-04-18 10:24:58 +02:00
Lipu Fei
f97e615634 Fix file name update
CURA-5122
2018-03-20 11:30:06 +01:00
Lipu Fei
6199e8e15a Fix merge conflicts with master 2018-03-05 13:27:00 +01:00
Ghostkeeper
32fedf9559
Obtain filament diameter from stack for length calculation
Otherwise we get it from the global stack which is always 2.85mm.

Fixes #3284.
2018-03-05 13:02:11 +01:00
Lipu Fei
f7377e6321 Fix extruder_stacks.items() 2018-03-02 16:20:03 +01:00
Lipu Fei
a6f22fd9cc Remove unnecessary comments 2018-03-02 16:10:59 +01:00
Lipu Fei
2135e30aad Simplify for loop in _calculateInformation() 2018-03-02 16:10:06 +01:00
Lipu Fei
d9d2cc9069 Remove unused code in PrintInformation 2018-02-26 19:37:29 +01:00
Jack Ha
2df9802ba5 CURA-4606 CURA-5010 fix print information crashing on printer switch 2018-02-26 09:57:16 +01:00
Lipu Fei
32e1015f25 WIP: Cleanup PrintInformation 2018-02-22 16:07:56 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Diego Prado Gesto
a4df9b6cc6 CURA-4891 Add a '+' that I removed by accident 2018-02-14 15:02:53 +01:00
Diego Prado Gesto
605c63514d CURA-4891 Remove print out for debugging 2018-02-14 14:51:32 +01:00
Diego Prado Gesto
a4455bbbe5 CURA-4891 Use the printer definition name instead of the ID to generate
the abbreviated name.
- Also revert some previous changes to keep the same behavior as before.
2018-02-14 13:47:30 +01:00
Ian Paschal
2964bedc28 CURA-4891
Scan for 'ultimaker' in the name. If found, add 'UM' to abbreviation, and scan again for a number after 'ultimaker' (e.g. 'ultimaker3'). If found, add the number as well. If 'ultimaker' is not found, take either the first 4 letters of the name or first letter.
2018-02-12 14:58:55 +01:00
Jaime van Kessel
2dee2ce5d9 Fixed issue where optimized layer data could be empty 2018-02-05 13:16:39 +01:00
Lipu Fei
a3ed385259 Use global_stack.definition.getId() to determine machine type
CURA-4891
2018-02-02 14:47:14 +01:00
Ian Paschal
a786987d8d Fix for CURA-4891
Use `active_machine_id` (such as "Ultimaker 3") instead of `global_stack_name` (such as "My Custom Printer Name")
2018-02-02 14:02:06 +01:00
ChrisTerBeke
6c9d7b5a2e Fixes for resetting print time information when removing all or last model, reduce signals being used for print time resetting - CURA-4852 2018-01-23 09:49:26 +01:00
Ghostkeeper
f948203a63
Fix crash when clearing build plate
We shouldn't delete the singleton PrintInformation object. We should rather just zero out the print information. And instead of doing that explicitly in deleteAll, listen to scene changes from PrintInformation in order to keep the logic related to the print information contained within its class.

Contributes to issue CURA-4810.
2018-01-16 13:44:49 +01:00
Jack Ha
6262003069 CURA-4525 reset the print information for build plates that are marked for slicing 2018-01-10 16:01:26 +01:00
Jack Ha
312bd137c2 Fix merge error, a variable got renamed. CURA-4525 2017-12-21 11:03:32 +01:00
Jack Ha
5152b2ae65 Solved merge conflicts. CURA-4525 2017-12-21 10:52:51 +01:00
Ghostkeeper
d5b3f18da8
Split all non-word characters for making abbreviations
So now cases like CR-10 are more appropriately split into ['CR', '10'].

Fixes #2910.
2017-12-18 11:01:15 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server
Contributes to issue CURA-4243.
2017-11-29 13:06:08 +01:00
Lipu Fei
a7a3ba9500 Always update the job name when a project file is loaded
CURA-4553
2017-11-22 13:10:09 +01:00
Lipu Fei
f8fe6cd455 Treat project files the same way as model files for job name
CURA-4553
2017-11-22 10:17:53 +01:00
Lipu Fei
8782e2e529 Rename parameters
CURA-4581
2017-11-21 15:12:56 +01:00
Lipu Fei
f18cb951fc Use workspaceLoaded signal instead of projectFileLoaded
CURA-4581
2017-11-21 13:49:25 +01:00
jack
f197508694 Merge pull request #2814 from Ultimaker/feature_maximum_resolution
Maximum mesh resolution
2017-11-20 18:09:11 +01:00
Aleksei S
10b5a19043 Fix merge conflict 2017-11-20 17:56:54 +01:00
Aleksei S
f484467f86 Clean project name in PrintInformation after removing the last model
CURA-4581
2017-11-17 18:11:22 +01:00
Jack Ha
864f417723 CURA-4525 Fix load and save projects. Not storing build plates or object names yet. 2017-11-15 16:03:32 +01:00
Jack Ha
be6561b575 CURA-4525 fixed material info per build plate, bugfix arrange on load 2017-11-15 10:28:34 +01:00
Jack Ha
4a893c048e CURA-4525 made PrintInformation multi buildplate-aware 2017-11-14 16:35:37 +01:00
Diego Prado Gesto
d503283089 CURA-4509 Minor fix that avoids crashes when there is no specified
material (such as in UM2)
2017-11-02 09:51:57 +01:00
fieldOfView
2d109090bc Show material name instead of extruder number 2017-10-30 12:40:41 +01:00
Lipu Fei
701e9a91c2 Allow using longer accent for machines in job names 2017-10-26 11:13:30 +02:00
Ghostkeeper
6c4c7fff4d
Use findContainersMetadata whenever possible
This ensures that we only load those containers that we actually need the data of.

Contributes to issue CURA-4243.
2017-10-20 15:09:45 +02:00
Lipu Fei
052ea7d90a Force use and update the job name with the loaded project file
CURA-4348

- If no project is loaded beforehand and then a model file is loaded,
  the job name should be determined with the current machine name and
  the first loaded model name.
- If a project is loaded, the job name should be the same as the project
  name, and it should not change until another project is loaded.
2017-10-12 07:59:43 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00