diff --git a/resources/profiles/Template.json b/resources/profiles_template/Template.json similarity index 100% rename from resources/profiles/Template.json rename to resources/profiles_template/Template.json diff --git a/resources/profiles/Template/filament/filament_abs_template.json b/resources/profiles_template/Template/filament/filament_abs_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_abs_template.json rename to resources/profiles_template/Template/filament/filament_abs_template.json diff --git a/resources/profiles/Template/filament/filament_asa_template.json b/resources/profiles_template/Template/filament/filament_asa_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_asa_template.json rename to resources/profiles_template/Template/filament/filament_asa_template.json diff --git a/resources/profiles/Template/filament/filament_hips_template.json b/resources/profiles_template/Template/filament/filament_hips_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_hips_template.json rename to resources/profiles_template/Template/filament/filament_hips_template.json diff --git a/resources/profiles/Template/filament/filament_pa_template.json b/resources/profiles_template/Template/filament/filament_pa_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_pa_template.json rename to resources/profiles_template/Template/filament/filament_pa_template.json diff --git a/resources/profiles/Template/filament/filament_pc_template.json b/resources/profiles_template/Template/filament/filament_pc_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_pc_template.json rename to resources/profiles_template/Template/filament/filament_pc_template.json diff --git a/resources/profiles/Template/filament/filament_pet_template.json b/resources/profiles_template/Template/filament/filament_pet_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_pet_template.json rename to resources/profiles_template/Template/filament/filament_pet_template.json diff --git a/resources/profiles/Template/filament/filament_pla_template.json b/resources/profiles_template/Template/filament/filament_pla_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_pla_template.json rename to resources/profiles_template/Template/filament/filament_pla_template.json diff --git a/resources/profiles/Template/filament/filament_ppa_template.json b/resources/profiles_template/Template/filament/filament_ppa_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_ppa_template.json rename to resources/profiles_template/Template/filament/filament_ppa_template.json diff --git a/resources/profiles/Template/filament/filament_pps_template.json b/resources/profiles_template/Template/filament/filament_pps_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_pps_template.json rename to resources/profiles_template/Template/filament/filament_pps_template.json diff --git a/resources/profiles/Template/filament/filament_pva_template.json b/resources/profiles_template/Template/filament/filament_pva_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_pva_template.json rename to resources/profiles_template/Template/filament/filament_pva_template.json diff --git a/resources/profiles/Template/filament/filament_tpu_template.json b/resources/profiles_template/Template/filament/filament_tpu_template.json similarity index 100% rename from resources/profiles/Template/filament/filament_tpu_template.json rename to resources/profiles_template/Template/filament/filament_tpu_template.json diff --git a/resources/profiles/Template/process/process_0.2_nozzle_template.json b/resources/profiles_template/Template/process/process_0.2_nozzle_template.json similarity index 100% rename from resources/profiles/Template/process/process_0.2_nozzle_template.json rename to resources/profiles_template/Template/process/process_0.2_nozzle_template.json diff --git a/resources/profiles/Template/process/process_0.4_nozzle_template.json b/resources/profiles_template/Template/process/process_0.4_nozzle_template.json similarity index 100% rename from resources/profiles/Template/process/process_0.4_nozzle_template.json rename to resources/profiles_template/Template/process/process_0.4_nozzle_template.json diff --git a/resources/profiles/Template/process/process_0.6_nozzle_template.json b/resources/profiles_template/Template/process/process_0.6_nozzle_template.json similarity index 100% rename from resources/profiles/Template/process/process_0.6_nozzle_template.json rename to resources/profiles_template/Template/process/process_0.6_nozzle_template.json diff --git a/resources/profiles/Template/process/process_0.8_nozzle_template.json b/resources/profiles_template/Template/process/process_0.8_nozzle_template.json similarity index 100% rename from resources/profiles/Template/process/process_0.8_nozzle_template.json rename to resources/profiles_template/Template/process/process_0.8_nozzle_template.json diff --git a/src/libslic3r/Preset.hpp b/src/libslic3r/Preset.hpp index 0a979f59b..40ee34b2c 100644 --- a/src/libslic3r/Preset.hpp +++ b/src/libslic3r/Preset.hpp @@ -21,6 +21,7 @@ #define PRESET_SLA_PRINT_NAME "sla_print" #define PRESET_SLA_MATERIALS_NAME "sla_materials" #define PRESET_PROFILES_DIR "profiles" +#define PRESET_PROFILES_TEMOLATE_DIR "profiles_template" #define PRESET_TEMPLATE_DIR "Template" //BBS: iot preset type strings diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index b6f5e3587..7dad8dac8 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -1634,8 +1634,8 @@ bool CreatePrinterPresetDialog::load_system_and_user_presets_with_curr_model(Pre } else { selected_vendor_id = PRESET_TEMPLATE_DIR; preset_path.clear(); - if (boost::filesystem::exists(boost::filesystem::path(Slic3r::resources_dir()) / PRESET_PROFILES_DIR / selected_vendor_id)) { - preset_path = (boost::filesystem::path(Slic3r::resources_dir()) / PRESET_PROFILES_DIR).string(); + if (boost::filesystem::exists(boost::filesystem::path(Slic3r::resources_dir()) / PRESET_PROFILES_TEMOLATE_DIR / selected_vendor_id)) { + preset_path = (boost::filesystem::path(Slic3r::resources_dir()) / PRESET_PROFILES_TEMOLATE_DIR).string(); } if (preset_path.empty()) { BOOST_LOG_TRIVIAL(info) << "Preset path is not find";