Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_splitted_vbuffer

resources/profiles/Creality.idx

@@ -1,3 +1,5 @@
+min_slic3r_version = 2.3.0-rc2
+0.0.12 Added Ender-3V2 and filament profiles.
 min_slic3r_version = 2.3.0-beta2
 0.0.11 Updated machine limits for Ender 5 and Ender 5 Plus.
 0.0.10 Parameter consistency improvements. Enabled conservative elephant foot compensation.

resources/profiles/Creality.ini

@@ -5,7 +5,7 @@
 name = Creality
 # Configuration version of this file. Config file will only be installed, if the config_version differs.
 # This means, the server may force the PrusaSlicer configuration to be downgraded.
-config_version = 0.0.11
+config_version = 0.0.12
 # Where to get the updates from?
 config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/Creality/
 # changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1%
@@ -23,6 +23,15 @@ bed_model = ender3_bed.stl
 bed_texture = ender3.svg
 default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
 
+[printer_model:ENDER3V2]
+name = Creality Ender-3V2
+variants = 0.4
+technology = FFF
+family = ENDER
+bed_model = ender3_bed.stl
+bed_texture = ender3.svg
+default_materials = Creality PLA @CREALITY; Generic PLA @CREALITY; Generic PETG @CREALITY; Generic ABS @CREALITY; Prusament PLA @CREALITY; Prusament PETG @CREALITY
+
 [printer_model:ENDER3BLTOUCH]
 name = Creality Ender-3 BLTouch
 variants = 0.4
@@ -576,6 +585,26 @@ filament_cost = 19.50
 filament_density = 1.24
 filament_colour = #FFE200
 
+[filament:Das Filament PLA @CREALITY]
+inherits = *PLA*
+filament_vendor = Das Filament
+temperature = 215
+bed_temperature = 50
+first_layer_temperature = 215
+first_layer_bed_temperature = 50
+filament_cost = 20.56
+filament_density = 1.24
+
+[filament:Das Filament PETG @CREALITY]
+inherits = *PET*
+filament_vendor = Das Filament
+temperature = 240
+bed_temperature = 70
+first_layer_temperature = 240
+first_layer_bed_temperature = 70
+filament_cost = 27.44
+filament_density = 1.29
+
 # Common printer preset
 [printer:*common*]
 printer_technology = FFF
@@ -669,6 +698,12 @@ retract_before_wipe = 70%
 start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG28 ; home all\nG1 Z2 F240\nG1 X2 Y10 F3000\nG1 Z0.28 F240\nG92 E0\nG1 Y190 E15 F1500 ; intro line\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E15 F1200 ; intro line\nG92 E0
 end_gcode = {if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F600{endif} ; Move print head up\nG1 X5 Y170 F{travel_speed*60} ; present print\n{if max_layer_z < max_print_height-10}G1 Z{z_offset+min(max_layer_z+70, max_print_height-10)} F600{endif} ; Move print head further up\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors
 
+[printer:Creality Ender-3V2]
+inherits = Creality Ender-3
+printer_model = ENDER3V2
+printer_variant = 0.4
+bed_shape = 0x0,220x0,220x220,0x220
+
 [printer:*fastabl*]
 start_gcode = G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set extruder temp for auto bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG29 ; auto bed levelling\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[first_layer_temperature] ; set extruder temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 Z0.28 F240\nG92 E0\nG1 Y190 E15 F1500 ; intro line\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E15 F1200 ; intro line\nG92 E0
 

resources/profiles/PrusaResearch.idx

@@ -1,4 +1,5 @@
 min_slic3r_version = 2.3.0-rc1
+1.2.2 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. 
 1.2.1 Updated FW version for MK2.5 family printers.
 1.2.0 Added full_fan_speed_layer value for PETG. Increased support interface spacing for 0.6mm nozzle profiles. Updated firmware version.
 min_slic3r_version = 2.3.0-beta2
@@ -9,6 +10,7 @@ min_slic3r_version = 2.3.0-alpha4
 1.2.0-alpha1 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles.
 1.2.0-alpha0 Added filament spool weights
 min_slic3r_version = 2.2.0-alpha3
+1.1.12 Added Prusament PVB filament profile. Added 0.8mm nozzle profiles. 
 1.1.11 Renamed MK3S and MINI printer profiles. Updated end g-code (MINI). Added new SLA materials and filament profiles.
 1.1.10 Updated firmware version.
 1.1.9 Updated K values in filament profiles (linear advance). Added new filament profiles and SLA materials.

src/libslic3r/GCodeSender.cpp

@@ -134,7 +134,7 @@ GCodeSender::set_baud_rate(unsigned int baud_rate)
         speed_t newSpeed = baud_rate;
         ioctl(handle, IOSSIOSPEED, &newSpeed);
         ::tcsetattr(handle, TCSANOW, &ios);
-#elif __linux
+#elif __linux__
         termios2 ios;
         if (ioctl(handle, TCGETS2, &ios))
             printf("Error in TCGETS2: %s\n", strerror(errno));

src/libslic3r/PrintObject.cpp

@@ -2004,10 +2004,9 @@ end:
 	                layer->make_slices();
 	            }
 	        });
-	    if (elephant_foot_compensation_scaled > 0.f) {
+	    if (elephant_foot_compensation_scaled > 0.f && ! m_layers.empty()) {
 	    	// The Elephant foot has been compensated, therefore the 1st layer's lslices are shrank with the Elephant foot compensation value.
 	    	// Store the uncompensated value there.
-	    	assert(! m_layers.empty());
 	    	assert(m_layers.front()->id() == 0);
 			m_layers.front()->lslices = std::move(lslices_1st_layer);
 		}

src/libslic3r/utils.cpp

@@ -39,9 +39,9 @@
 
 #include <tbb/task_scheduler_init.h>
 
-#if defined(__linux) || defined(__GNUC__ )
+#if defined(__linux__) || defined(__GNUC__ )
 #include <strings.h>
-#endif /* __linux */
+#endif /* __linux__ */
 
 #ifdef _MSC_VER 
     #define strcasecmp _stricmp

src/slic3r/CMakeLists.txt

@@ -257,10 +257,10 @@ if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
 endif ()
 
 # We need to implement some hacks for wxWidgets and touch the underlying GTK
-# layer and sub-libraries. This forces us to use the include locations of these
-# libraries. No need to link to them, wxWidgets does that already.
-# See PresetComboBox.cpp for the includes and subsequent workarounds.
+# layer and sub-libraries. This forces us to use the include locations and
+# link these libraries.
 if (UNIX AND NOT APPLE)
     find_package(GTK${SLIC3R_GTK} REQUIRED)
     target_include_directories(libslic3r_gui PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS})
+    target_link_libraries(libslic3r_gui ${GTK${SLIC3R_GTK}_LIBRARIES})
 endif ()

src/slic3r/GUI/3DScene.hpp

@@ -611,7 +611,7 @@ struct _3DScene
     static void point3_to_verts(const Vec3crd& point, double width, double height, GLVolume& volume);
 };
 
-static constexpr float BedEpsilon = float(EPSILON);
+static constexpr float BedEpsilon = 3.f * float(EPSILON);
 
 }
 

src/slic3r/GUI/GUI_Preview.cpp

@@ -373,7 +373,7 @@ void Preview::reload_print(bool keep_volumes)
         m_volumes_cleanup_required = !keep_volumes;
         return;
     }
-#endif /* __linux __ */
+#endif /* __linux__ */
     if (
 #ifdef __linux__
         m_volumes_cleanup_required || 

src/slic3r/GUI/InstanceCheck.cpp

@@ -252,14 +252,31 @@ namespace instance_check_internal
 
 bool instance_check(int argc, char** argv, bool app_config_single_instance)
 {
-#ifndef _WIN32
-	boost::system::error_code ec;
-#endif
-	std::size_t hashed_path = 
+	std::size_t hashed_path;
 #ifdef _WIN32
-		std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
+	hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
 #else
-		std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0]), ec).string());
+	boost::system::error_code ec;
+#ifdef __linux__
+	// If executed by an AppImage, start the AppImage, not the main process.
+	// see https://docs.appimage.org/packaging-guide/environment-variables.html#id2
+	const char *appimage_env = std::getenv("APPIMAGE");
+	bool appimage_env_valid = false;
+	if (appimage_env) {
+		try {
+			auto appimage_path = boost::filesystem::canonical(boost::filesystem::path(appimage_env));
+			if (boost::filesystem::exists(appimage_path)) {
+				hashed_path = std::hash<std::string>{}(appimage_path.string());
+				appimage_env_valid = true;
+			}
+		} catch (std::exception &) {			
+		}
+		if (! appimage_env_valid)
+			BOOST_LOG_TRIVIAL(error) << "APPIMAGE environment variable was set, but it does not point to a valid file: " << appimage_env;
+	}
+	if (! appimage_env_valid)
+#endif // __linux__
+		hashed_path = std::hash<std::string>{}(boost::filesystem::canonical(boost::filesystem::system_complete(argv[0]), ec).string());
 	if (ec.value() > 0) { // canonical was not able to find the executable (can happen with appimage on some systems. Does it fail on Fuse file systems?)
 		ec.clear();
 		// Compose path with boost canonical of folder and filename
@@ -269,7 +286,7 @@ bool instance_check(int argc, char** argv, bool app_config_single_instance)
 			hashed_path = std::hash<std::string>{}(boost::filesystem::system_complete(argv[0]).string());
 		}
 	}
-#endif // win32
+#endif // _WIN32
 
 	std::string lock_name 	= std::to_string(hashed_path);
 	GUI::wxGetApp().set_instance_hash(hashed_path);

src/slic3r/GUI/Tab.cpp

@@ -309,6 +309,13 @@ void Tab::create_preset_tab()
     // This helps to process all the cursor key events on Windows in the tree control,
     // so that the cursor jumps to the last item.
     m_treectrl->Bind(wxEVT_TREE_SEL_CHANGED, [this](wxTreeEvent&) {
+#ifdef __linux__
+        // Events queue is opposite On Linux. wxEVT_SET_FOCUS invokes after wxEVT_TREE_SEL_CHANGED,
+        // and a result wxEVT_KILL_FOCUS doesn't invoke for the TextCtrls.
+        // see https://github.com/prusa3d/PrusaSlicer/issues/5720
+        // So, call SetFocus explicitly for this control before changing of the selection
+        m_treectrl->SetFocus();
+#endif
             if (!m_disable_tree_sel_changed_event && !m_pages.empty()) {
                 if (m_page_switch_running)
                     m_page_switch_planned = true;

src/slic3r/Utils/Process.cpp

@@ -93,7 +93,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
 	{
 		std::vector<const char*> args;
 		args.reserve(3);
-#ifdef __linux
+#ifdef __linux__
 		static const char* gcodeviewer_param = "--gcodeviewer";
 		{
 			// If executed by an AppImage, start the AppImage, not the main process.
@@ -105,7 +105,7 @@ static void start_new_slicer_or_gcodeviewer(const NewSlicerInstanceType instance
 					args.emplace_back(gcodeviewer_param);
 			}
 		}
-#endif // __linux
+#endif // __linux__
 		std::string my_path;
 		if (args.empty()) {
 			// Binary path was not set to the AppImage in the Linux specific block above, call the application directly.

src/slic3r/Utils/Serial.cpp

@@ -313,7 +313,7 @@ void Serial::set_baud_rate(unsigned baud_rate)
 		speed_t newSpeed = baud_rate;
 		handle_errno(::ioctl(handle, IOSSIOSPEED, &newSpeed));
 		handle_errno(::tcsetattr(handle, TCSANOW, &ios));
-#elif __linux
+#elif __linux__
 
 		/* The following definitions are kindly borrowed from:
 			/usr/include/asm-generic/termbits.h

version.inc

@@ -3,7 +3,7 @@
 
 set(SLIC3R_APP_NAME "PrusaSlicer")
 set(SLIC3R_APP_KEY "PrusaSlicer")
-set(SLIC3R_VERSION "2.3.0-rc2")
+set(SLIC3R_VERSION "2.3.0")
 set(SLIC3R_BUILD_ID "PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN")
 set(SLIC3R_RC_VERSION "2,3,0,0")
 set(SLIC3R_RC_VERSION_DOTS "2.3.0.0")