142 Commits

Author SHA1 Message Date
remi durand
532ecec73a fix un-localizable strings (step 2) 2021-06-18 01:22:19 +02:00
remi durand
8cf482d0f7 fix assert in wizard filament
supermerill/SuperSlicer#1292
2021-06-11 20:35:00 +02:00
supermerill
1749bf0952 wizard fix for spacing 2021-06-03 20:58:57 +02:00
remi durand
11677bef6d allow no prusa profiles 2021-05-20 11:30:59 +02:00
supermerill
8504793a7e fix more app name errors
- icons
 - gcodeviewer name&key now include the slic3r name
 - instance check now depends on hte slic3r name, and not always prusaslicer
 - possible fix for 3Dmouse on macos
 - error text
 - CWS now output the slicer name & version separately and the slicer config in the slicer.ini field
 - re-add some of the 'about' credentials from slic3r (icon, manual)
2021-04-27 04:51:39 +02:00
remi durand
7e1a009bd8 fix merge 2021-04-04 14:42:49 +02:00
remi durand
93e5584ede Get most of software names, id, description from the define. 2021-04-04 03:47:19 +02:00
remi durand
ca3d8239c4 Merge remote-tracking branch 'remotes/prusa/master' 2021-01-09 17:11:12 +01:00
Lukas Matena
b0115dca60 Fixed encoding issue in ConfigWizard on Windows (#5422) 2020-12-18 15:35:30 +01:00
YuSanka
19b7827511 Fix of #5103 and #4861 - ConfigWizard layout issues 2020-12-16 23:44:40 -08:00
Vojtech Bubnik
8f04d0e0e2 Reverted escaping of ampersand where the escaping was not needed
/ lead to errors.
2020-12-16 11:46:27 +01:00
supermerill
2b339763b0 Merge remote-tracking branch 'remotes/prusa/master' 2020-12-07 20:29:11 +01:00
Vojtech Bubnik
f904752ba7 Fix of install wizard: Escape ampersands in printer models. 2020-12-05 09:55:09 +01:00
Vojtech Bubnik
e42e25c933 1) Storing the physical_printer_settings_id into the 3MF, AMF, GCode.
2) Activating the physical_printer_settings_id when loading from 3MF, AMF, GCode.
   The physical printer is only activated if it references the printer_settings_id
   loaded from the same file.
3) When loading the presets from 3MF, AMF, GCode, the "external" profiles
   are no more created for profiles which differ from the local profiles
   the loaded profiles reference. Instead, the referenced profile is activated
   and modified with the loaded preset. If the referenced profile does not
   exist, but the profile refers to a system profile with the "inherits"
   fileds, the system profile is loaded and modified instead.
   This works for all profiles with the exception of multi-extruder
   printer with multiple filament profiles modified. In that case
   the first modified filament profile will be loaded as modified,
   while the other modified profiles will be loaded as "external".

This should fix
Physical printer + 3mf file, wrong preset used to generate gcode #5178
and possibly
https://github.com/prusa3d/PrusaSlicer/issues/5272
2020-12-04 10:48:51 +01:00
supermerill
29df0d7700 #730 remove G92 from layer change 2020-11-29 16:14:34 +01:00
supermerill
8d5688a751 Merge remote-tracking branch 'remotes/prusa/master' : Opengl crash 2020-11-28 18:18:32 +01:00
enricoturri1966
e2b4de455b Customizable association of .3mf, .stl and .gcode files on Windows 2020-11-26 10:09:34 +01:00
supermerill
1a19b023f0 Merge remote-tracking branch 'remotes/prusa/master'
note: new infill connect, maybe a good idea to get the previous one in case it's better (no useless lines)
note2: fillline overextrude, tofix
2020-11-23 00:28:47 +01:00
David Kocik
5f97b2512b Merge remote-tracking branch 'aegean-odyssey/ao_profile_resources_patch' into master 2020-11-19 19:02:32 +01:00
David Kocik
0a4ce079e8 escape_ampersand function and changed order of printer names and pictures in config wizard 2020-11-11 16:08:27 +01:00
supermerill
a44039c3e5 Update to profiles
also add setting to vendors to set the col number of a line.
2020-11-10 22:54:22 +01:00
YuSanka
ed2f03ec79 Localization:
Some phrases are corrected in the code
The POT-file is updated
2020-11-05 22:17:49 +01:00
David Kocik
e9295e268a config wizard printer selection - changed vertical spacing 2020-11-05 17:43:40 +01:00
supermerill
65a40ed58f Merge remote-tracking branch 'remotes/prusa/master' into dev 2020-10-27 16:08:00 +01:00
David Kocik
068a254ef0 configuration wizard: added Checked information to sorting algortihm on filaments page. Fix of #4922 2020-10-20 10:35:48 +02:00
supermerill
3aaedd671b Merge remote-tracking branch 'remotes/prusa/master' into dev
note: layer time is not working, chronology need formatting, temperature ok.
2020-10-18 03:50:08 +02:00
supermerill
6fdd615b6e Merge remote-tracking branch 'remotes/prusa/master' into dev 2020-10-18 00:27:32 +02:00
Vojtech Bubnik
a009b24124 Updated textation of the Filament selection config wizard page. 2020-10-15 14:16:53 +02:00
David Kocik
878fac4c44 filament selection: bug fix - * sign is again visible at profiles 2020-10-05 09:48:55 +02:00
David Kocik
2b24a21098 Correct strings in configWizard 2020-10-04 21:11:56 +02:00
David Kocik
6a46708608 fix in ConfigWizard.cpp 2020-10-01 09:46:00 +02:00
David Kocik
43f122b5ee Filament selection in configuration wizard:
compatible printers in html window, bug fixes.
2020-10-01 09:28:17 +02:00
Vojtech Bubnik
067cde85f1 WIP Refactoring of exceptions:
1) All slicer's exceptions are now derived from Slic3r::Exception.
2) New exceptions are defined for slicing errors.
3) Exceptions are propagated to the Plater to show.
It remains to modify the slicing back-end to throw the new SlicingError
exceptions instead of std::runtime_error and to show the other exceptions
by a message dialog instead of a notification.
2020-09-14 18:03:22 +02:00
Lukas Matena
46eb96e84f Added two missing icons to fix build on Linux 2020-09-01 23:26:08 +02:00
David Kocik
6033e69906 filaments selecting: sorting via printer, showing printers for filament 2020-09-01 18:00:12 +02:00
YuSanka
1713142670 Imperial units selection is added to the ConfigWizard 2020-06-10 11:18:11 +02:00
supermerill
5fbc891707 Slic3r++ to SuperSlicer renamed in all files.
and going to version 51
2020-05-30 03:52:56 +02:00
Lukas Matena
48c186331a Includes cleanup:
GUI_App.hpp      (should not include) MainFrame.hpp
MainFrame.hpp    Plater.hpp
ModelArrange.hpp Model.hpp
Slicing.hpp      PrintConfig.hpp
FillBase.hpp     PrintConfig.hpp
GUI_App.hpp      PrintConfig.hpp
OptionsGroup.hpp GUI_App.hpp
2020-05-27 14:01:47 +02:00
Aegean Odyssey
e9423ab86d Also search vendor directory for printer profile resources.
Search the vendor directory using the same conventions used to search
the profiles directory when looking for thumbnails, bed_models, and
bed_textures. Allows a complete, "Config Wizard"-friendly custom vendor
profile to be placed in the (user's configuration) vendor directory.
2020-04-25 02:51:02 +00:00
YuSanka
b5fcc23460 ConfigWizard: fixed first column name on SLA Material page 2020-04-20 08:09:19 +02:00
supermerill
cc96564321 Update to wizzard: add a thumbnail parameter ; don't auto-select prusa mini if no printer installed
also some merge for creality printers, and fix some problem in it.
relax the min/max version for the profile, i don't have the resource to check & modify these for each release.
2020-03-26 15:00:02 +01:00
supermerill
f087cf1239 Merge remote-tracking branch 'remotes/prusa/master'
seems to work
need to update profiles & ui
2020-03-26 12:10:30 +01:00
Lukas Matena
97b9de47b4 Merge branch 'master' into dev 2020-03-24 21:51:05 +01:00
bubnikv
6bf56d5cb4 Updated the "Remove user profiles" message at the install wizard to
indicate that it does nothing to user profiles.
2020-03-15 12:19:56 +01:00
bubnikv
7f3ac39757 Fixed conversion of installed presets from PrusaSlicer 2.1.1 to 2.2.0 2020-03-14 20:18:31 +01:00
bubnikv
a3ded8fa95 Reworked filaments / SLA materials in installation wizard:
1) When the wizard is initialized, filament and SLA profile names
   are verified and current names of renamed profiles are resolved.
   Fixes "Add/Remove Filaments is not hiding all of the un-checked filaments #3835"
2) When adding a printer model, default materials are installed in case
   the printer model has no default material installed.
3) When leaving the Filaments or SLA materials page, and some printer models
   have no material installed, those Printer Models are listed
   in a message box and only for those printer models the default
   materials are installed.
2020-03-14 18:35:42 +01:00
bubnikv
f71d3e63f2 Changed location of vendor specific thumbnail images of printers:
These images are newly stored inside the resources/profiles/VENDOR_NAME/,
they should be named by the printer_model identifier suffixed with
"_thumbnail.png"

All the existing printer thumbnails were moved and renamed,
thumbnails for the 3rd party printers were added, marked as Beta.
2020-03-12 14:13:08 +01:00
bubnikv
cd381d6b4f More robust vendor profile parsing. 2020-03-11 18:12:16 +01:00
bubnikv
76fecc91a5 Improved error reporting and error handling when loading
vendor config bundles into installation wizard.
2020-03-07 16:31:14 +01:00
Lukas Matena
eb3b65d8af Fixing build against wxWidgets 3.0
The wxString saga continues. wxWidgets 3.0 don't have the wxString::FromUTF8(const std::string&) overload, we must use the GUI::from_u8 helper
Also wxWidgets 3.0 don't allow to disable wxString->const char* conversion, so calling show_info(wxWindow*, wxString, const char*) was ambiguous
Several includes moved around
2020-03-04 10:34:59 +01:00