QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-01-30 23:48:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix some bug

Browse Source
This commit is contained in:
QIDI TECH
2025-03-24 10:01:22 +08:00
parent 6f9a6b8462
commit 73f7cad391
4 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
resources/profiles/QIDITechnology.ini
View File

@@ -878,7 +878,7 @@ enable_volume_fan = 0
extrusion_multiplier = 0.95 extrusion_multiplier = 0.95
filament_colour = #282828 filament_colour = #282828
filament_density = 1.15 filament_density = 1.15
filament_max_volumetric_speed = 17 filament_max_volumetric_speed = 12
filament_type = ABS-GF filament_type = ABS-GF
first_layer_bed_temperature = 100 first_layer_bed_temperature = 100
first_layer_temperature = 270 first_layer_temperature = 270
@@ -888,7 +888,7 @@ overhang_fan_speed_0 = 100
overhang_fan_speed_1 = 100 overhang_fan_speed_1 = 100
slowdown_below_layer_time = 5 slowdown_below_layer_time = 5
temperature = 270 temperature = 270
chamber_temperature = 55 chamber_temperature = 0
# QIDI filament preset # QIDI filament preset
[filament:*QIDI ASA*] [filament:*QIDI ASA*]
@@ -928,7 +928,7 @@ extrusion_multiplier = 0.7
fan_below_layer_time = 40 fan_below_layer_time = 40
filament_colour = #DCDCDC filament_colour = #DCDCDC
filament_density = 1.03 filament_density = 1.03
filament_max_volumetric_speed = 16 filament_max_volumetric_speed = 12
filament_retract_before_travel = 0 filament_retract_before_travel = 0
filament_retract_layer_change = 0 filament_retract_layer_change = 0
filament_retract_length = 0.01 filament_retract_length = 0.01
@@ -958,7 +958,7 @@ extrusion_multiplier = 0.96
fan_below_layer_time = 10 fan_below_layer_time = 10
filament_colour = #696969 filament_colour = #696969
filament_density = 1.09 filament_density = 1.09
filament_max_volumetric_speed = 10 filament_max_volumetric_speed = 8
filament_type = PA12-CF filament_type = PA12-CF
first_layer_bed_temperature = 80 first_layer_bed_temperature = 80
first_layer_temperature = 290 first_layer_temperature = 290
@@ -982,7 +982,7 @@ extrusion_multiplier = 0.96
fan_below_layer_time = 10 fan_below_layer_time = 10
filament_colour = #4F4F4F filament_colour = #4F4F4F
filament_density = 1.20 filament_density = 1.20
filament_max_volumetric_speed = 14 filament_max_volumetric_speed = 8
filament_type = PAHT-CF filament_type = PAHT-CF
first_layer_bed_temperature = 80 first_layer_bed_temperature = 80
first_layer_temperature = 310 first_layer_temperature = 310
@@ -1002,7 +1002,7 @@ extrusion_multiplier = 0.96
fan_below_layer_time = 10 fan_below_layer_time = 10
filament_colour = #4F4F4F filament_colour = #4F4F4F
filament_density = 1.27 filament_density = 1.27
filament_max_volumetric_speed = 14 filament_max_volumetric_speed = 10
filament_type = PAHT-GF filament_type = PAHT-GF
first_layer_bed_temperature = 80 first_layer_bed_temperature = 80
first_layer_temperature = 310 first_layer_temperature = 310
@@ -1049,7 +1049,7 @@ extrusion_multiplier = 1
fan_below_layer_time = 10 fan_below_layer_time = 10
filament_colour = #323232 filament_colour = #323232
filament_density = 1.30 filament_density = 1.30
filament_max_volumetric_speed = 12 filament_max_volumetric_speed = 8
filament_type = PET-CF filament_type = PET-CF
first_layer_bed_temperature = 80 first_layer_bed_temperature = 80
first_layer_temperature = 320 first_layer_temperature = 320
@@ -1095,7 +1095,7 @@ extrusion_multiplier = 0.97
fan_below_layer_time = 10 fan_below_layer_time = 10
filament_colour = #323232 filament_colour = #323232
filament_density = 1.38 filament_density = 1.38
filament_max_volumetric_speed = 12 filament_max_volumetric_speed = 10
filament_type = PET-GF filament_type = PET-GF
first_layer_bed_temperature = 80 first_layer_bed_temperature = 80
first_layer_temperature = 310 first_layer_temperature = 310
@@ -1697,10 +1697,10 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI ABS-GF @X-Plus 4 0.4 nozzle] [filament:QIDI ABS-GF @X-Plus 4 0.4 nozzle]
inherits = *QIDI ABS-GF* inherits = *QIDI ABS-GF*
advance_pressure = 0.03 advance_pressure = 0.03
chamber_minimal_temperature = 55 chamber_minimal_temperature = 0
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 12
first_layer_temperature = 260 first_layer_temperature = 260
temperature = 260 temperature = 270
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
[filament:QIDI ASA @X-Plus 4 0.4 nozzle] [filament:QIDI ASA @X-Plus 4 0.4 nozzle]
@@ -1719,7 +1719,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PA12-CF @X-Plus 4 0.4 nozzle] [filament:QIDI PA12-CF @X-Plus 4 0.4 nozzle]
inherits = *QIDI PA12-CF* inherits = *QIDI PA12-CF*
advance_pressure = 0.035 advance_pressure = 0.035
filament_max_volumetric_speed = 13 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
@@ -1747,7 +1747,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PET-CF @X-Plus 4 0.4 nozzle] [filament:QIDI PET-CF @X-Plus 4 0.4 nozzle]
inherits = *QIDI PET-CF* inherits = *QIDI PET-CF*
advance_pressure = 0.032 advance_pressure = 0.032
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
@@ -1761,7 +1761,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PET-GF @X-Plus 4 0.4 nozzle] [filament:QIDI PET-GF @X-Plus 4 0.4 nozzle]
inherits = *QIDI PET-GF* inherits = *QIDI PET-GF*
advance_pressure = 0.022 advance_pressure = 0.022
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 10
first_layer_temperature = 310 first_layer_temperature = 310
temperature = 310 temperature = 310
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.4
@@ -1977,10 +1977,10 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI ABS-GF @X-Plus 4 0.6 nozzle] [filament:QIDI ABS-GF @X-Plus 4 0.6 nozzle]
inherits = *QIDI ABS-GF* inherits = *QIDI ABS-GF*
chamber_minimal_temperature = 55 chamber_minimal_temperature = 0
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 12
first_layer_temperature = 260 first_layer_temperature = 260
temperature = 260 temperature = 270
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
[filament:QIDI ASA @X-Plus 4 0.6 nozzle] [filament:QIDI ASA @X-Plus 4 0.6 nozzle]
@@ -1994,7 +1994,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PA12-CF @X-Plus 4 0.6 nozzle] [filament:QIDI PA12-CF @X-Plus 4 0.6 nozzle]
inherits = *QIDI PA12-CF* inherits = *QIDI PA12-CF*
advance_pressure = 0.035 advance_pressure = 0.035
filament_max_volumetric_speed = 13 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
@@ -2022,7 +2022,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PET-CF @X-Plus 4 0.6 nozzle] [filament:QIDI PET-CF @X-Plus 4 0.6 nozzle]
inherits = *QIDI PET-CF* inherits = *QIDI PET-CF*
advance_pressure = 0.025 advance_pressure = 0.025
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
@@ -2035,7 +2035,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PET-GF @X-Plus 4 0.6 nozzle] [filament:QIDI PET-GF @X-Plus 4 0.6 nozzle]
inherits = *QIDI PET-GF* inherits = *QIDI PET-GF*
advance_pressure = 0.014 advance_pressure = 0.014
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 10
first_layer_temperature = 310 first_layer_temperature = 310
temperature = 310 temperature = 310
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.6
@@ -2253,10 +2253,10 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI ABS-GF @X-Plus 4 0.8 nozzle] [filament:QIDI ABS-GF @X-Plus 4 0.8 nozzle]
inherits = *QIDI ABS-GF* inherits = *QIDI ABS-GF*
chamber_minimal_temperature = 55 chamber_minimal_temperature = 0
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 12
first_layer_temperature = 260 first_layer_temperature = 260
temperature = 260 temperature = 270
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
[filament:QIDI ASA @X-Plus 4 0.8 nozzle] [filament:QIDI ASA @X-Plus 4 0.8 nozzle]
@@ -2271,7 +2271,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PA12-CF @X-Plus 4 0.8 nozzle] [filament:QIDI PA12-CF @X-Plus 4 0.8 nozzle]
inherits = *QIDI PA12-CF* inherits = *QIDI PA12-CF*
advance_pressure = 0.035 advance_pressure = 0.035
filament_max_volumetric_speed = 13 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
@@ -2299,7 +2299,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PET-CF @X-Plus 4 0.8 nozzle] [filament:QIDI PET-CF @X-Plus 4 0.8 nozzle]
inherits = *QIDI PET-CF* inherits = *QIDI PET-CF*
advance_pressure = 0.025 advance_pressure = 0.025
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
@@ -2312,7 +2312,7 @@ compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]
[filament:QIDI PET-GF @X-Plus 4 0.8 nozzle] [filament:QIDI PET-GF @X-Plus 4 0.8 nozzle]
inherits = *QIDI PET-GF* inherits = *QIDI PET-GF*
advance_pressure = 0.01 advance_pressure = 0.01
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 10
first_layer_temperature = 310 first_layer_temperature = 310
temperature = 310 temperature = 310
compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="X-Plus 4" and nozzle_diameter[0]==0.8
@@ -2690,10 +2690,10 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI ABS-GF @Q1 Pro 0.4 nozzle] [filament:QIDI ABS-GF @Q1 Pro 0.4 nozzle]
inherits = *QIDI ABS-GF* inherits = *QIDI ABS-GF*
advance_pressure = 0.035 advance_pressure = 0.035
chamber_minimal_temperature = 55 chamber_minimal_temperature = 0
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 12
first_layer_temperature = 260 first_layer_temperature = 260
temperature = 260 temperature = 270
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
[filament:QIDI ASA @Q1 Pro 0.4 nozzle] [filament:QIDI ASA @Q1 Pro 0.4 nozzle]
@@ -2712,7 +2712,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PA12-CF @Q1 Pro 0.4 nozzle] [filament:QIDI PA12-CF @Q1 Pro 0.4 nozzle]
inherits = *QIDI PA12-CF* inherits = *QIDI PA12-CF*
advance_pressure = 0.035 advance_pressure = 0.035
filament_max_volumetric_speed = 13 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
@@ -2740,7 +2740,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PET-CF @Q1 Pro 0.4 nozzle] [filament:QIDI PET-CF @Q1 Pro 0.4 nozzle]
inherits = *QIDI PET-CF* inherits = *QIDI PET-CF*
advance_pressure = 0.032 advance_pressure = 0.032
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
@@ -2754,7 +2754,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PET-GF @Q1 Pro 0.4 nozzle] [filament:QIDI PET-GF @Q1 Pro 0.4 nozzle]
inherits = *QIDI PET-GF* inherits = *QIDI PET-GF*
advance_pressure = 0.028 advance_pressure = 0.028
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 10
first_layer_temperature = 310 first_layer_temperature = 310
temperature = 310 temperature = 310
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.4
@@ -2966,10 +2966,10 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI ABS-GF @Q1 Pro 0.6 nozzle] [filament:QIDI ABS-GF @Q1 Pro 0.6 nozzle]
inherits = *QIDI ABS-GF* inherits = *QIDI ABS-GF*
chamber_minimal_temperature = 55 chamber_minimal_temperature = 0
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 12
first_layer_temperature = 260 first_layer_temperature = 260
temperature = 260 temperature = 270
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
[filament:QIDI ASA @Q1 Pro 0.6 nozzle] [filament:QIDI ASA @Q1 Pro 0.6 nozzle]
@@ -2983,7 +2983,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PA12-CF @Q1 Pro 0.6 nozzle] [filament:QIDI PA12-CF @Q1 Pro 0.6 nozzle]
inherits = *QIDI PA12-CF* inherits = *QIDI PA12-CF*
advance_pressure = 0.035 advance_pressure = 0.035
filament_max_volumetric_speed = 13 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
@@ -3011,7 +3011,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PET-CF @Q1 Pro 0.6 nozzle] [filament:QIDI PET-CF @Q1 Pro 0.6 nozzle]
inherits = *QIDI PET-CF* inherits = *QIDI PET-CF*
advance_pressure = 0.025 advance_pressure = 0.025
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
@@ -3025,7 +3025,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PET-GF @Q1 Pro 0.6 nozzle] [filament:QIDI PET-GF @Q1 Pro 0.6 nozzle]
inherits = *QIDI PET-GF* inherits = *QIDI PET-GF*
advance_pressure = 0.015 advance_pressure = 0.015
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 10
first_layer_temperature = 310 first_layer_temperature = 310
temperature = 310 temperature = 310
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.6
@@ -3240,10 +3240,10 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI ABS-GF @Q1 Pro 0.8 nozzle] [filament:QIDI ABS-GF @Q1 Pro 0.8 nozzle]
inherits = *QIDI ABS-GF* inherits = *QIDI ABS-GF*
chamber_minimal_temperature = 55 chamber_minimal_temperature = 0
filament_max_volumetric_speed = 22 filament_max_volumetric_speed = 12
first_layer_temperature = 260 first_layer_temperature = 260
temperature = 260 temperature = 270
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8
[filament:QIDI ASA @Q1 Pro 0.8 nozzle] [filament:QIDI ASA @Q1 Pro 0.8 nozzle]
@@ -3258,7 +3258,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PA12-CF @Q1 Pro 0.8 nozzle] [filament:QIDI PA12-CF @Q1 Pro 0.8 nozzle]
inherits = *QIDI PA12-CF* inherits = *QIDI PA12-CF*
advance_pressure = 0.035 advance_pressure = 0.035
filament_max_volumetric_speed = 13 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8
@@ -3286,7 +3286,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PET-CF @Q1 Pro 0.8 nozzle] [filament:QIDI PET-CF @Q1 Pro 0.8 nozzle]
inherits = *QIDI PET-CF* inherits = *QIDI PET-CF*
advance_pressure = 0.025 advance_pressure = 0.025
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 8
first_layer_temperature = 280 first_layer_temperature = 280
temperature = 280 temperature = 280
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8
@@ -3300,7 +3300,7 @@ compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==
[filament:QIDI PET-GF @Q1 Pro 0.8 nozzle] [filament:QIDI PET-GF @Q1 Pro 0.8 nozzle]
inherits = *QIDI PET-GF* inherits = *QIDI PET-GF*
advance_pressure = 0.01 advance_pressure = 0.01
filament_max_volumetric_speed = 15 filament_max_volumetric_speed = 10
first_layer_temperature = 310 first_layer_temperature = 310
temperature = 310 temperature = 310
compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8 compatible_printers_condition = printer_model=="Q1 Pro" and nozzle_diameter[0]==0.8

13
src/slic3r/GUI/MainFrame.cpp
View File

@@ -280,10 +280,6 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
//y22 //y22
Bind(wxEVT_ICONIZE, [this](wxIconizeEvent& event) { Bind(wxEVT_ICONIZE, [this](wxIconizeEvent& event) {
if (event.IsIconized()) { if (event.IsIconized()) {
if (m_printer_view->GetHasLoadUrl()) {
printer_view_ip = m_printer_view->GetWebIp();
printer_view_url = m_printer_view->GetWeburl();
}
wxString url; wxString url;
if (m_printer_view->GetNetMode()) { if (m_printer_view->GetNetMode()) {
url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir())); url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir()));
@@ -775,13 +771,8 @@ void MainFrame::init_tabpanel()
//y17 //y17
else else
select_tab(size_t(0)); // select Plater select_tab(size_t(0)); // select Plater
//y22 //y22 y24
if (current_selected_tab != 4) { if (current_selected_tab != 4) {
if (m_printer_view->GetHasLoadUrl()) {
printer_view_ip = m_printer_view->GetWebIp();
printer_view_url = m_printer_view->GetWeburl();
is_net_url = m_printer_view->IsNetUrl();
}
wxString url; wxString url;
if (m_printer_view->GetNetMode()) { if (m_printer_view->GetNetMode()) {
url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir())); url = wxString::Format("file://%s/web/qidi/link_missing_connection.html", from_u8(resources_dir()));
@@ -793,6 +784,7 @@ void MainFrame::init_tabpanel()
} }
else { else {
if (!printer_view_ip.empty()) { if (!printer_view_ip.empty()) {
if(!printer_view_ip.empty()){
if (is_net_url) if (is_net_url)
m_printer_view->load_net_url(printer_view_url, printer_view_ip); m_printer_view->load_net_url(printer_view_url, printer_view_ip);
else else
@@ -800,6 +792,7 @@ void MainFrame::init_tabpanel()
} }
m_printer_view->Layout(); m_printer_view->Layout();
} }
}
}); });

26
src/slic3r/GUI/PrinterWebView.cpp
View File

@@ -473,9 +473,13 @@ void PrinterWebView::SetLoginStatus(bool status) {
std::vector<Device> devices; std::vector<Device> devices;
wxGetApp().set_devices(devices); wxGetApp().set_devices(devices);
#endif #endif
//y3 //y3 y24
if (webisNetMode == isNetWeb)
webisNetMode = isDisconnect; webisNetMode = isDisconnect;
if (wxGetApp().mainframe) {
wxGetApp().mainframe->is_net_url = false;
wxGetApp().mainframe->printer_view_ip = "";
wxGetApp().mainframe->printer_view_url = "";
}
m_user_head_name = ""; m_user_head_name = "";
SetPresetChanged(true); SetPresetChanged(true);
UpdateState(); UpdateState();
@@ -999,8 +1003,6 @@ void PrinterWebView::load_disconnect_url(wxString& url)
webisNetMode = isDisconnect; webisNetMode = isDisconnect;
m_web = url; m_web = url;
m_ip = ""; m_ip = "";
//y22
has_load_url = false;
m_browser->LoadURL(url); m_browser->LoadURL(url);
UpdateState(); UpdateState();
} }
@@ -1010,8 +1012,6 @@ void PrinterWebView::load_url(wxString &url)
if (m_browser == nullptr || m_web == url) if (m_browser == nullptr || m_web == url)
return; return;
m_web = url; m_web = url;
//y22
has_load_url = true;
m_browser->LoadURL(url); m_browser->LoadURL(url);
webisNetMode = isLocalWeb; webisNetMode = isLocalWeb;
// B55 // B55
@@ -1030,6 +1030,12 @@ void PrinterWebView::load_url(wxString &url)
else else
button->SetIsSelected(false); button->SetIsSelected(false);
} }
//y24
if (wxGetApp().mainframe) {
wxGetApp().mainframe->is_net_url = false;
wxGetApp().mainframe->printer_view_ip = m_ip;
wxGetApp().mainframe->printer_view_url = m_web;
}
UpdateState(); UpdateState();
} }
void PrinterWebView::load_net_url(wxString& url, wxString& ip) void PrinterWebView::load_net_url(wxString& url, wxString& ip)
@@ -1037,8 +1043,6 @@ void PrinterWebView::load_net_url(wxString& url, wxString& ip)
if (m_browser == nullptr || m_web == url) if (m_browser == nullptr || m_web == url)
return; return;
m_web = url; m_web = url;
//y22
has_load_url = true;
m_ip = ip; m_ip = ip;
webisNetMode = isNetWeb; webisNetMode = isNetWeb;
m_browser->LoadURL(url); m_browser->LoadURL(url);
@@ -1053,6 +1057,12 @@ void PrinterWebView::load_net_url(wxString& url, wxString& ip)
else else
button->SetIsSelected(false); button->SetIsSelected(false);
} }
//y24
if (wxGetApp().mainframe) {
wxGetApp().mainframe->is_net_url = true;
wxGetApp().mainframe->printer_view_ip = m_ip;
wxGetApp().mainframe->printer_view_url = m_web;
}
UpdateState(); UpdateState();
} }
void PrinterWebView::UpdateState() void PrinterWebView::UpdateState()

3
src/slic3r/GUI/PrinterWebView.hpp
View File

@@ -141,7 +141,6 @@ public:
//y22 //y22
wxString GetWeburl() { return m_web; }; wxString GetWeburl() { return m_web; };
wxString GetWebIp() { return m_ip; }; wxString GetWebIp() { return m_ip; };
bool GetHasLoadUrl() { return has_load_url; };
bool IsNetUrl() { return webisNetMode == isNetWeb; }; bool IsNetUrl() { return webisNetMode == isNetWeb; };
private: private:
@@ -190,8 +189,6 @@ private:
std::string m_user_head_name; std::string m_user_head_name;
bool m_isfluidd_1; bool m_isfluidd_1;
//y22
bool has_load_url;
}; };
//y3 //y3