fix some bug

.gitignore

@@ -27,3 +27,4 @@ SVG
 **/process_full/
 **/machine_full/
 **/filament_full/
+.idea/

BuildLinux.sh

@@ -1,11 +1,8 @@
 #!/bin/bash
-set -e # exit on first error
 
-export ROOT=`pwd`
-export NCORES=`nproc --all`
-export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES}
-FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
-FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
+export ROOT=$(dirname $(readlink -f ${0}))
+
+set -e # exit on first error
 
 function check_available_memory_and_disk() {
     FREE_MEM_GB=$(free -g -t | grep 'Mem' | rev | cut -d" " -f1 | rev)
@@ -27,243 +24,185 @@ function check_available_memory_and_disk() {
     fi
 }
 
+function usage() {
+    echo "Usage: ./BuildLinux.sh [-1][-b][-c][-d][-i][-r][-s][-u]"
+    echo "   -1: limit builds to 1 core (where possible)"
+    echo "   -f: disable safe parallel number limit(By default, the maximum number of parallels is set to free memory/2.5)"
+    echo "   -b: build in debug mode"
+    echo "   -c: force a clean build"
+    echo "   -d: build deps (optional)"
+    echo "   -h: this help output"
+    echo "   -i: Generate appimage (optional)"
+    echo "   -r: skip ram and disk checks (low ram compiling)"
+    echo "   -s: build qidi-studio (optional)"
+    echo "   -u: update and build dependencies (optional and need sudo)"
+    echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
+    echo "   and then './BuildLinux.sh -dsi'"
+}
+
 unset name
-while getopts ":dsiuhgbr" opt; do
+while getopts ":1fbcdghirsu" opt; do
   case ${opt} in
-    u )
-        UPDATE_LIB="1"
+    1 )
+        export CMAKE_BUILD_PARALLEL_LEVEL=1
         ;;
-    i )
-        BUILD_IMAGE="1"
-        ;;
-    d )
-        BUILD_DEPS="1"
-        ;;
-    s )
-        BUILD_QIDI_STUDIO="1"
+    f )
+        DISABLE_PARALLEL_LIMIT=1
         ;;
     b )
         BUILD_DEBUG="1"
         ;;
-    g )
-        FOUND_GTK3=""
+    c )
+        CLEAN_BUILD=1
+        ;;
+    d )
+        BUILD_DEPS="1"
+        ;;
+    h ) usage
+        exit 0
+        ;;
+    i )
+        BUILD_IMAGE="1"
         ;;
     r )
-	SKIP_RAM_CHECK="1"
+	    SKIP_RAM_CHECK="1"
 	;;
-    h ) echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
-        echo "   -i: Generate appimage (optional)"
-        echo "   -g: force gtk2 build"
-        echo "   -b: build in debug mode"
-        echo "   -d: build deps (optional)"
-        echo "   -s: build qidi-studio (optional)"
-        echo "   -u: only update clock & dependency packets (optional and need sudo)"
-	echo "   -r: skip free ram check (low ram compiling)"
-        echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
-        echo "   and then './BuildLinux.sh -dsi'"
-        exit 0
+    s )
+        BUILD_QIDI_STUDIO="1"
+        ;;
+    u )
+        UPDATE_LIB="1"
         ;;
   esac
 done
 
-if [ $OPTIND -eq 1 ]
+if [ ${OPTIND} -eq 1 ]
 then
-    echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
-    echo "   -i: Generate appimage (optional)"
-    echo "   -g: force gtk2 build"
-    echo "   -b: build in debug mode"
-    echo "   -d: build deps (optional)"
-    echo "   -s: build qidi-studio (optional)"
-    echo "   -u: only update clock & dependency packets (optional and need sudo)"
-    echo "   -r: skip free ram check (low ram compiling)"
-    echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
-    echo "   and then './BuildLinux.sh -dsi'"
+    usage
     exit 0
 fi
 
-# mkdir build
-if [ ! -d "build" ]
+DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release)
+VERSION=$(awk -F= '/^VERSION_ID=/ {print $2}' /etc/os-release)
+# OSLIKE is a space-delineated list of similar distributions
+OSLIKE=$(awk -F= '/^ID_LIKE=/ {print $2}' /etc/os-release | tr -d '"')
+
+# Iterate over a list of candidate distribution targets, first match is used
+for CANDIDATE in ${DISTRIBUTION} ${OSLIKE}; do
+    if [ -f ./linux.d/${CANDIDATE} ]
+    then 
+        TARGET_DISTRO="${CANDIDATE}"
+        break
+    fi
+done
+
+if [ -z ${TARGET_DISTRO} ]
 then
-    mkdir build
+    echo "Your distribution does not appear to be currently supported by these build scripts"
+    exit 1
 fi
 
-#FIXME: require root for -u option
-if [[ -n "$UPDATE_LIB" ]]
-then
-    echo -n -e "Updating linux ...\n"
-    # hwclock -s # DeftDawg: Why does SuperSlicer want to do this?
-    apt update
-    if [[ -z "$FOUND_GTK3" ]]
-    then
-        echo -e "\nInstalling: libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
-        apt install -y libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git
-    else
-        echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
-        apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git
-    fi
-    # for ubuntu 22.04:
-    ubu_version="$(cat /etc/issue)" 
-    if [[ $ubu_version == "Ubuntu 22.04"* ]]
-    then
-        apt install -y curl libssl-dev libcurl4-openssl-dev m4
-    elif [[ $ubu_version == "Ubuntu 24.04"* ]]
-    then
-        NEW_SOURCE="deb http://gb.archive.ubuntu.com/ubuntu jammy main"
-        if grep -qF -- "$NEW_SOURCE" /etc/apt/sources.list; then
-            echo "source exist: $NEW_SOURCE"
-        else
-            echo "$NEW_SOURCE" | sudo tee -a /etc/apt/sources.list > /dev/null
-        fi
-        apt update
-    fi
-    if [[ -n "$BUILD_DEBUG" ]]
-    then
-        echo -e "\nInstalling: libssl-dev libcurl4-openssl-dev\n"
-        apt install -y libssl-dev libcurl4-openssl-dev
-    fi
+echo "OS distribution is '${DISTRIBUTION}'.  Using package dependencies for '${TARGET_DISTRO}'."
+source ./linux.d/${TARGET_DISTRO}
 
-    # Addtional Dev packages for QIDI Studio
-    export REQUIRED_DEV_PACKAGES="libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
-    # libwebkit2gtk-4.1-dev ??
-    export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
-    if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then
-        sudo apt install -y ${REQUIRED_DEV_PACKAGES} git cmake wget file
-    fi
-    echo -e "done\n"
-    exit 0
-fi
-
-FOUND_GTK2_DEV=$(dpkg -l libgtk* | grep gtk2.0-dev || echo '')
-FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')
-echo "FOUND_GTK2=$FOUND_GTK2)"
-if [[ -z "$FOUND_GTK2_DEV" ]]
-then
-if [[ -z "$FOUND_GTK3_DEV" ]]
+echo "FOUND_GTK3=${FOUND_GTK3}"
+if [[ -z "${FOUND_GTK3_DEV}" ]]
 then
     echo "Error, you must install the dependencies before."
     echo "Use option -u with sudo"
-    exit 0
-fi
+    exit 1
 fi
 
-echo "[1/9] Updating submodules..."
-{
-    # update submodule profiles
-    pushd resources/profiles
-    git submodule update --init
-    popd
-}
-
-echo "[2/9] Changing date in version..."
+echo "Changing date in version..."
 {
     # change date in version
     sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
 }
 echo "done"
 
-# mkdir in deps
-if [ ! -d "deps/build" ]
+if ! [[ -n "${SKIP_RAM_CHECK}" ]]
 then
-    mkdir deps/build
+    check_available_memory_and_disk
 fi
 
-if ! [[ -n "$SKIP_RAM_CHECK" ]]
+if ! [[ -n "${DISABLE_PARALLEL_LIMIT}" ]]
 then
-check_available_memory_and_disk
-fi
-
-if [[ -n "$BUILD_DEPS" ]]
-then
-    echo "[3/9] Configuring dependencies..."
-    BUILD_ARGS=""
-    if [[ -n "$FOUND_GTK3_DEV" ]]
-    then
-        BUILD_ARGS="-DDEP_WX_GTK3=ON"
+    FREE_MEM_GB=$(free -g -t | grep 'Mem' | rev | cut -d" " -f1 | rev)
+    MAX_THREADS=$((FREE_MEM_GB * 10 / 25))
+    if [ "$MAX_THREADS" -lt 1 ]; then
+        export CMAKE_BUILD_PARALLEL_LEVEL=1
+    else
+        export CMAKE_BUILD_PARALLEL_LEVEL=${MAX_THREADS}
     fi
-    if [[ -n "$BUILD_DEBUG" ]]
+    echo "System free memory: ${FREE_MEM_GB} GB"
+    echo "Setting CMAKE_BUILD_PARALLEL_LEVEL: ${CMAKE_BUILD_PARALLEL_LEVEL}"
+fi
+
+if [[ -n "${BUILD_DEPS}" ]]
+then
+    echo "Configuring dependencies..."
+    BUILD_ARGS="-DDEP_WX_GTK3=ON"
+    if [[ -n "${CLEAN_BUILD}" ]]
     then
-        # have to build deps with debug & release or the cmake won't find evrything it needs
+        rm -fr deps/build
+    fi
+    if [ ! -d "deps/build" ]
+    then
+        mkdir deps/build
+    fi
+    if [[ -n "${BUILD_DEBUG}" ]]
+    then
+        # have to build deps with debug & release or the cmake won't find everything it needs
         mkdir deps/build/release
-        pushd deps/build/release
-            cmake ../.. -DDESTDIR="../destdir" $BUILD_ARGS
-            make -j$NCORES
-        popd
+        cmake -S deps -B deps/build/release -G Ninja -DDESTDIR="../destdir" ${BUILD_ARGS}
+        cmake --build deps/build/release
         BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
     fi
-    
-    # cmake deps
-    pushd deps/build
-        cmake .. $BUILD_ARGS
-        echo "done"
-        
-        # make deps
-        echo "[4/9] Building dependencies..."
-        make -j$NCORES
-        echo "done"
 
-        # rename wxscintilla # TODO: DeftDawg: Does QIDIStudio need this?
-        # echo "[5/9] Renaming wxscintilla library..."
-        # pushd destdir/usr/local/lib
-        #     if [[ -z "$FOUND_GTK3_DEV" ]]
-        #     then
-        #         cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a
-        #     else
-        #         cp libwxscintilla-3.1.a libwx_gtk3u_scintilla-3.1.a
-        #     fi
-        # popd
-        # echo "done"
-
-        # FIXME: only clean deps if compiling succeeds; otherwise reruns waste tonnes of time!
-        # clean deps
-        # echo "[6/9] Cleaning dependencies..."
-        # rm -rf dep_*
-    popd
-    echo "done"
+    echo "cmake -S deps -B deps/build -G Ninja ${BUILD_ARGS}"
+    cmake -S deps -B deps/build -G Ninja ${BUILD_ARGS}
+    cmake --build deps/build
 fi
 
-if [[ -n "$BUILD_QIDI_STUDIO" ]]
+if [[ -n "${BUILD_QIDI_STUDIO}" ]]
 then
-    echo "[7/9] Configuring Slic3r..."
+    echo "Configuring QIDIStudio..."
+    if [[ -n "${CLEAN_BUILD}" ]]
+    then
+        rm -fr build
+    fi
     BUILD_ARGS=""
-    if [[ -n "$FOUND_GTK3_DEV" ]]
+    if [[ -n "${FOUND_GTK3_DEV}" ]]
     then
         BUILD_ARGS="-DSLIC3R_GTK=3"
     fi
-    if [[ -n "$BUILD_DEBUG" ]]
+    if [[ -n "${BUILD_DEBUG}" ]]
     then
         BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug -DQDT_INTERNAL_TESTING=1"
     else
         BUILD_ARGS="${BUILD_ARGS} -DQDT_RELEASE_TO_PUBLIC=1 -DQDT_INTERNAL_TESTING=0"
     fi
-    
-    # cmake
-    pushd build
-        cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}
-        echo "done"
-        
-        # make Slic3r
-        echo "[8/9] Building Slic3r..."
-        make -j$NCORES QIDIStudio # Slic3r
-
-        # make .mo
-        # make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?
-    
-    popd
+    echo -e "cmake -S . -B build -G Ninja -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}"
+    cmake -S . -B build -G Ninja \
+        -DCMAKE_PREFIX_PATH="${PWD}/deps/build/destdir/usr/local" \
+        -DSLIC3R_STATIC=1 \
+        ${BUILD_ARGS}
+    echo "done"
+    echo "Building QIDIStudio ..."
+    cmake --build build --target QIDIStudio
     echo "done"
 fi
 
-if [[ -e $ROOT/build/src/BuildLinuxImage.sh ]]; then
+if [[ -e ${ROOT}/build/src/BuildLinuxImage.sh ]]; then
 # Give proper permissions to script
-chmod 755 $ROOT/build/src/BuildLinuxImage.sh
+chmod 755 ${ROOT}/build/src/BuildLinuxImage.sh
 
 echo "[9/9] Generating Linux app..."
     pushd build
-        if [[ -n "$BUILD_IMAGE" ]]
+        if [[ -n "${BUILD_IMAGE}" ]]
         then
-            $ROOT/build/src/BuildLinuxImage.sh -i
-        else
-            $ROOT/build/src/BuildLinuxImage.sh
+            ${ROOT}/build/src/BuildLinuxImage.sh -i
         fi
     popd
 echo "done"
-fi
+fi

CMakeLists.txt

@@ -42,6 +42,7 @@ set(SLIC3R_GTK "2" CACHE STRING "GTK version to use with wxWidgets on Linux")
 
 set(IS_CROSS_COMPILE FALSE)
 
+set(FLATPAK FALSE CACHE BOOL "Not copy FFMPEG file")
 
 if (APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)
@@ -54,6 +55,8 @@ if (APPLE)
         set(CMAKE_INSTALL_RPATH @executable_path/../Frameworks)
     endif()
     set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(CMAKE_INSTALL_RPATH "$ORIGIN")
 endif ()
 
 # Proposal for C++ unit tests and sandboxes
@@ -167,6 +170,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 # WIN10SDK_PATH is used to point CMake to the WIN10 SDK installation directory.
 # We pick it from environment if it is not defined in another way
 if(WIN32)
+    find_package(PkgConfig REQUIRED)
     if(NOT DEFINED WIN10SDK_PATH)
         if(DEFINED ENV{WIN10SDK_PATH})
                 set(WIN10SDK_PATH "$ENV{WIN10SDK_PATH}")
@@ -500,7 +504,7 @@ find_package(cereal REQUIRED)
 set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/i18n")
 set(QDT_L18N_DIR "${CMAKE_CURRENT_SOURCE_DIR}/qdt/i18n")
 add_custom_target(gettext_make_pot
-    COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
+    COMMAND xgettext --keyword=L --no-wrap --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
         -f "${QDT_L18N_DIR}/list.txt"
         -o "${QDT_L18N_DIR}/QIDIStudio.pot"
 	COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${QDT_L18N_DIR}	
@@ -517,7 +521,7 @@ foreach(po_file ${QDT_L10N_PO_FILES})
     SET(po_new_file "${po_dir}/QIDIStudio_.po")
     add_custom_command(
         TARGET gettext_merge_po_with_pot PRE_BUILD
-        COMMAND msgmerge -N -o ${po_file} ${po_file} "${QDT_L18N_DIR}/QIDIStudio.pot"
+        COMMAND msgmerge --no-wrap -N -o ${po_file} ${po_file} "${QDT_L18N_DIR}/QIDIStudio.pot"
         DEPENDS ${po_file}
     )
 endforeach()
@@ -619,6 +623,10 @@ function(qidistudio_copy_dlls target config postfix output_dlls)
             ${CMAKE_PREFIX_PATH}/bin/occt/TKXDESTEP.dll
             ${CMAKE_PREFIX_PATH}/bin/occt/TKXSBase.dll
             ${CMAKE_PREFIX_PATH}/bin/freetype.dll
+            ${CMAKE_PREFIX_PATH}/bin/avcodec-61.dll
+            ${CMAKE_PREFIX_PATH}/bin/swresample-5.dll
+            ${CMAKE_PREFIX_PATH}/bin/swscale-8.dll
+            ${CMAKE_PREFIX_PATH}/bin/avutil-59.dll
          DESTINATION ${_out_dir})
 
     set(${output_dlls}
@@ -654,11 +662,50 @@ function(qidistudio_copy_dlls target config postfix output_dlls)
         ${_out_dir}/TKXSBase.dll
 
         ${_out_dir}/freetype.dll
+        ${_out_dir}/avcodec-61.dll
+        ${_out_dir}/swresample-5.dll
+        ${_out_dir}/swscale-8.dll
+        ${_out_dir}/avutil-59.dll
         PARENT_SCOPE
     )
     
 endfunction()
 
+function(qidistudio_copy_sos target config postfix output_sos)
+
+    set(_out_dir "${CMAKE_CURRENT_BINARY_DIR}")
+    message ("set out_dir to CMAKE_CURRENT_BINARY_DIR: ${_out_dir}")
+
+    file(COPY ${CMAKE_PREFIX_PATH}/lib/libavcodec.so
+            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61
+            ${CMAKE_PREFIX_PATH}/lib/libavcodec.so.61.3.100
+            ${CMAKE_PREFIX_PATH}/lib/libavutil.so
+            ${CMAKE_PREFIX_PATH}/lib/libavutil.so.59
+            ${CMAKE_PREFIX_PATH}/lib/libavutil.so.59.8.100
+            ${CMAKE_PREFIX_PATH}/lib/libswscale.so
+            ${CMAKE_PREFIX_PATH}/lib/libswscale.so.8
+            ${CMAKE_PREFIX_PATH}/lib/libswscale.so.8.1.100
+            ${CMAKE_PREFIX_PATH}/lib/libswresample.so
+            ${CMAKE_PREFIX_PATH}/lib/libswresample.so.5
+            ${CMAKE_PREFIX_PATH}/lib/libswresample.so.5.1.100
+         DESTINATION ${_out_dir})
+
+    set(${output_dlls}
+        ${_out_dir}/libavcodec.so
+        ${_out_dir}/libavcodec.so.61
+        ${_out_dir}/libavcodec.so.61.3.100
+        ${_out_dir}/libavutil.so
+        ${_out_dir}/libavutil.so.59
+        ${_out_dir}/libavutil.so.59.8.100
+        ${_out_dir}/libswscale.so
+        ${_out_dir}/libswscale.so.8
+        ${_out_dir}/libswscale.so.8.1.100
+        ${_out_dir}/libswresample.so
+        ${_out_dir}/libswresample.so.5
+        ${_out_dir}/libswresample.so.5.1.100
+        PARENT_SCOPE
+    )
+endfunction()
 
 # libslic3r, QIDIStudio GUI and the QIDIStudio executable.
 add_subdirectory(src)
@@ -714,4 +761,18 @@ else ()
     install(DIRECTORY "${SLIC3R_RESOURCES_DIR}/" DESTINATION "${CMAKE_INSTALL_PREFIX}/resources")
 endif ()
 
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT FLATPAK)
+    set(LIBRARY_FILES
+    ${LIBDIR_BIN}/libavcodec.so.61
+    ${LIBDIR_BIN}/libavcodec.so.61.3.100
+    ${LIBDIR_BIN}/libavutil.so.59
+    ${LIBDIR_BIN}/libavutil.so.59.8.100
+    ${LIBDIR_BIN}/libswresample.so.5
+    ${LIBDIR_BIN}/libswresample.so.5.1.100
+    ${LIBDIR_BIN}/libswscale.so.8
+    ${LIBDIR_BIN}/libswscale.so.8.1.100
+    )
+    install(FILES ${LIBRARY_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+endif ()
+
 configure_file(${LIBDIR}/platform/unix/fhs.hpp.in ${LIBDIR_BIN}/platform/unix/fhs.hpp)

DockerBuild.sh

@@ -9,7 +9,7 @@ set -x
 # the simplicity of a single Docker image and a one-time compilation
 # seems better.
 docker build -t qidistudio \
-  --build-arg USER=$USER \
+  --build-arg USER=${USER:-root} \
   --build-arg UID=$(id -u) \
   --build-arg GID=$(id -g) \
   $PROJECT_ROOT

DockerEntrypoint.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+# Entrypoint script to create an out-of-the-box experience for QIDIStudio.
+# Perform some initial setup if none was done previously.
+# It is not necessary if you know what you are doing. Feel free to go
+# to the Dockerfile and switch the entrypoint to the QIDIStudio binary.
+
+# Check if the current effective user is root
+
+if [ "$EUID" -eq 0 ]; then
+    echo "No User specified at build time."
+    if [ -z "$RUN_USER" ] || [ -z "$RUN_UID" ] || [ -z "$RUN_GID" ] || [ "$RUN_UID" -eq 0 ]; then
+        echo "At least one of RUN_USER, RUN_UID, or RUN_GID is unset. Or 'root' was requested."
+        echo "Running as root"
+        
+        if [ "$HOME" != "/root" ]; then
+            if [ ! -d "/root" ]; then
+                mkdir /root
+                chown root:root /root
+                chmod 700 /root
+            fi
+        fi
+
+        export HOME="/root"
+        EXEC_USER="root"
+    else
+        echo "Setting up a new user"
+
+        # Check if there is a already a valid user entry for the passed UID, if not create one
+        if [ -z "$(getent passwd "$RUN_UID" | cut -d: -f1)" ]; then
+            #GID=$(id -g)
+            echo "User specified at runtime. Performing setup."
+            groupadd -g "$RUN_GID" "$RUN_USER"
+            useradd -u "$RUN_UID" -g "$RUN_GID" -d "/home/$RUN_USER" "$RUN_USER"
+            usermod -aG sudo "$RUN_USER"
+            passwd -d "$RUN_USER"
+
+            #This will take forever to run, so we will just chown the build folder which contains the binaries
+            #chown -R "$RUN_UID":"$RUN_GID" /QIDIStudio
+            chown "$RUN_UID":"$RUN_GID" /QIDIStudio
+            chown -R "$RUN_UID":"$RUN_GID" /QIDIStudio/build
+
+
+            export HOME="/home/$RUN_USER"
+            EXEC_USER="$RUN_USER"
+        fi
+    fi
+else
+    echo "User specified at build time."
+    CURRENT_USER=$(id -un)
+    if [ -n "$RUN_USER" ] && [ -n "$RUN_UID" ] && [ -n "$RUN_GID" ] && [ "$RUN_UID" -ne "$EUID" ]; then
+        echo "New User config passed at Runtime. Setting up."
+        if [ -z "$(getent passwd "$RUN_UID" | cut -d: -f1)" ]; then
+            sudo groupadd -g "$RUN_UID" "$RUN_USER"
+            sudo useradd -u "$RUN_UID" -g "$RUN_GID" -d "/home/$RUN_USER" "$RUN_USER"
+            sudo usermod -aG sudo "$RUN_USER"
+            passwd -d "$RUN_USER"
+
+            #sudo chown -R "$RUN_UID":"$RUN_GID" /QIDIStudio
+            chown "$RUN_UID":"$RUN_GID" /QIDIStudio
+            chown -R "$RUN_UID":"$RUN_GID" /QIDIStudio/build
+
+            export HOME="/home/$RUN_USER"
+            EXEC_USER="$RUN_USER"
+        fi
+    else
+        echo "Using Build time user."
+        EXEC_USER="$CURRENT_USER"
+        #It should've been set in Dockerfile, but just in case, uncomment this it there is problem
+        #export HOME="/home/$USER"
+    fi
+fi
+
+# make sure ~/.config folder exists so QIDI Studio will start
+if [ ! -d "$HOME/.config" ]; then
+    mkdir -p "$HOME/.config"
+fi
+
+# Using su $USER -c will retain all the important ENV args when qidi Studio starts in a different shell
+# Continue with QIDI Studio using correct user, passing all arguments
+exec su "$EXEC_USER" -c "/QIDIStudio/build/package/bin/qidi-studio $*"

DockerRun.sh

@@ -5,21 +5,31 @@ set -x
 #  -h $HOSTNAME \
 #  If there's problems with the X display, try this
 #  -v /tmp/.X11-unix:/tmp/.X11-unix \
+#  or 
+#  -v $HOME/.Xauthority:/root/.Xauthority \
+#  You also need to run "xhost +" on your host system
+# QIDI Studio also require the parent directory for the configuration directory to be present to start
+#  to prevent your local machines's QIDI studio config passed to docker container when you map your home directory, add:
+# -v :SHOME/.config/QIDIStudio
+set -x
 docker run \
   `# Use the hosts networking.  Printer wifi and also dbus communication` \
   --net=host \
   `# Some X installs will not have permissions to talk to sockets for shared memory` \
   --ipc host \
-  `# Run as your workstations username to keep permissions the same` \
-  -u $USER \
   `# Bind mount your home directory into the container for loading/saving files` \
-  -v $HOME:/home/$USER \
+  -v $HOME:$HOME \
+  `# Pass some X Auth file to allow x11 to connect to your host x instance` \
+  -v $HOME/.Xauthority:/tmp/.Xauthority \
+  -v /tmp/.X11-unix:/tmp/.X11-unix \
+  -e XAUTHORITY=/tmp/.Xauthority \
   `# Pass the X display number to the container` \
   -e DISPLAY=$DISPLAY \
   `# It seems that libGL and dbus things need privileged mode` \
   --privileged=true \
   `# Attach tty for running qidi with command line things` \
   -ti \
+  `# Remove container when it is finished` \
+  --rm \
   `# Pass all parameters from this script to the qidi ENTRYPOINT binary` \
   qidistudio $* 
-  

Dockerfile

@@ -1,5 +1,4 @@
-FROM docker.io/ubuntu:22.04
-LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
+FROM docker.io/ubuntu:24.10
 
 # Disable interactive package configuration
 RUN apt-get update && \
@@ -14,6 +13,7 @@ RUN apt-get update && apt-get install  -y \
     build-essential \
     cmake \
     curl \
+    xvfb \
     eglexternalplatform-dev \
     extra-cmake-modules \
     file \
@@ -39,7 +39,6 @@ RUN apt-get update && apt-get install  -y \
     libssl-dev \
     libudev-dev \
     libwayland-dev \
-    libwebkit2gtk-4.0-dev \
     libxkbcommon-dev \
     locales \
     locales-all \
@@ -47,6 +46,7 @@ RUN apt-get update && apt-get install  -y \
     pkgconf \
     sudo \
     wayland-protocols \
+    libwebkit2gtk-4.1-dev \
     wget 
 
 # Change your locale here if you want.  See the output
@@ -58,14 +58,52 @@ RUN locale-gen $LC_ALL
 # the CA cert path on every startup
 ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
 
-COPY ./ QIDIStudio
+COPY ./ /QIDIStudio
 
-WORKDIR QIDIStudio
+RUN chmod +x /QIDIStudio/DockerEntrypoint.sh
 
-# These can run together, but we run them seperate for podman caching
-# Update System dependencies
+WORKDIR /QIDIStudio
+
+# Ubuntu 24 Docker Image now come with default standard user "ubuntu"
+# It might conflict with your mapped user, remove if user ubuntu exist
+RUN if id "ubuntu" >/dev/null 2>&1; then userdel -r ubuntu; fi
+
+
+# Use bash as the shell
+
+# Set ARG values
+# If user was passed from build it will create a user same
+# as your workstation. Else it will use /root
+
+# Setting ARG at build time is convienient for testing purposes
+# otherwise the same commands will be executed at runtime
+
+ARG USER=root
+ARG UID=0
+ARG GID=0
+RUN if [ "$UID" != "0" ]; then \
+      groupadd -g $GID $USER && \
+      useradd -u $UID -g $GID -m -d /home/$USER $USER && \
+      mkdir -p /home/$USER && \
+      chown -R $UID:$GID /QIDIStudio && \
+      usermod -aG sudo $USER && \
+      passwd -d "$USER"; \
+    else \
+      mkdir -p /root/.config; \
+    fi
+
+# Allow password-less sudo for ALL users
+RUN echo "ALL ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/999-passwordless
+RUN chmod 440 /etc/sudoers.d/999-passwordless
+
+# Update System dependencies(Run before user switch)
 RUN ./BuildLinux.sh -u
 
+# Run as the mapped user (or root by default)
+USER $USER
+
+
+# These can run together, but we run them seperate for podman caching
 # Build dependencies in ./deps
 RUN ./BuildLinux.sh -d
 
@@ -73,7 +111,7 @@ RUN ./BuildLinux.sh -d
 RUN ./BuildLinux.sh -s
 
 # Build AppImage
-ENV container podman
+ENV container=podman
 RUN ./BuildLinux.sh -i
 
 # It's easier to run QIDI Studio as the same username,
@@ -82,13 +120,14 @@ RUN ./BuildLinux.sh -i
 # to keep permissions the same.  Just in case, defaults
 # are root.
 SHELL ["/bin/bash", "-l", "-c"]
-ARG USER=root
-ARG UID=0
-ARG GID=0
-RUN [[ "$UID" != "0" ]] \
-  && groupadd -f -g $GID $USER \
-  && useradd -u $UID -g $GID $USER
+
+# Point FFMPEG Library search to the binary built upon QIDIStudio build time
+ENV LD_LIBRARY_PATH=/QIDIStudio/build/package/bin
 
 # Using an entrypoint instead of CMD because the binary
 # accepts several command line arguments.
-ENTRYPOINT ["/QIDIStudio/build/package/bin/qidi-studio"]
+# entrypoint script will pass all arguments to QIDI-studio
+# after the script finishes
+
+#ENTRYPOINT ["/QIDIStudio/build/package/bin/QIDI-studio"]
+ENTRYPOINT ["/QIDIStudio/DockerEntrypoint.sh"]

README.md

@@ -4,20 +4,116 @@
 # QIDIStudio
 QIDIStudio is a professional 3D printer slicing software，which is perfectly compatible with all printers and 3D printing filaments of QIDI Technology. Multi-platform support, simple inerface, easy to use, complate functions, easy to learn 3D printing.
 
-**Notice:QIDIStudio as a new software dedicated to QIDI's new high speed printers.**
-
 QIDIStudio is based on [BambuStudio](https://github.com/bambulab/BambuStudio) by Bambu Lab, Bambu Studio is based on [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) by Prusa Research, which is from [Slic3r](https://github.com/Slic3r/Slic3r) by Alessandro Ranellucci and the RepRap community.
 Thanks to Bambulab, PrusaSlicer and OrcaSlicer for their contributions to the 3D printing community.
 
 See the [QIDI's homepage](https://qidi3d.com) for more information.
 
-### Report Issues and Make Suggestions
+<details open>
+  <summary>Content Navigation</summary>
+  <ol>
+    <li>
+      <a href="#function-introduction">Function Introduction</a>
+    </li>
+    <li>
+      <a href="#wiki">Wiki</a>
+    </li>
+    <li>
+      <a href="#Supporting-QIDI-Link-App">Supporting QIDI Link App</a>
+    </li>
+    <li>
+      <a href="#report-issues-and-make-suggestions">Report Issues and Make Suggestions</a>
+      <ul>
+        <li><a href="#some-formatting-requirements">Some Formatting Requirements</a></li>
+      </ul>
+    </li>
+    <li>
+      <a href="#license">License</a>
+    </li>
+  </ol>
+</details>
+
+----
+## Function Introduction
+
+<p align="center">
+  <img src="/readmeRes/UI.png" alt="UI">
+</p>
+
+### Key features are:
+
+* **Slicer:** Fast and stable 3D model slicer
+* **Printer:** Perfect compatibility with all high-speed 3D printers of QIDI TECH
+* **Filament:** Perfect compatibility with all filaments of QIDI TECH and some general filaments
+* **LAN:** The printer can be directly connected through IP, convenient, safe and stable
+* **Internet:** Remote connection, start printing anytime, anywhere
+
+### Other major features are:
+
+* **Model:** A variety of model operations, move, scale, rotate, crop, color, repair, combine, split, and more
+* **Parameter:** Rich parameter Settings, fine adjustment for a variety of complex models and application scenarios
+* **Calibration:** Multiple calibration functions to adjust the best parameters according to the actual situation
+
+----
+
+## wiki
+The wiki below aims to provide a detailed explanation of the QIDIStudio settings, how to get the most out of them as well as how to calibrate and setup your printer.
+
+The wiki is work in progress so bear with us while we get it up and running!
+
+**[Access the wiki here](https://wiki.qidi3d.com/en/software/qidi-studio)**
+
+----
+
+## Supporting QIDI Link App
+
+**[Access QIDI Link App Guide Here](https://wiki.qidi3d.com/en/app)**
+
+The supporting QIDI Link App supports IOS and Android platforms. In the app, you can scan the code to connect to the printer, remotely monitor the printer's printing progress, control the printer's printing parameters, and perform operations such as feeding and returning materials.
+<p align="center">
+  <img  src="/readmeRes/qidilink.png" alt="Add filament option ——Seal">
+</p>
+
+----
+
+## Report Issues and Make Suggestions
 
 Please send your question in the form of video or pictures to us through the [After-Sales Service](https://qidi3d.com/pages/warranty-policy-after-sales-support), we will reply to your information within 12 hours.
 
 Please try to contact us through [After-Sales Service](https://qidi3d.com/pages/warranty-policy-after-sales-support) and report problems or suggestions. On github, we cannot obtain your order information, operation records and other private intelligence, nor can we generate after-sales orders, send repair files, etc. Thank you for your understanding and cooperation.
 
-### License
+### Some formatting requirements
+
+#### Issue Title:
+
+Briefly describe the issue (e.g., `could not open file`)
+
+#### Description:
+
+Provide a detailed description of the issue.This will help our engineers quickly locate the problem and assist you in
+resolving it
+
+- **Issue Description**:
+  - A clear explanation of the problem.
+  - Compare the expected behavior with the actual behavior.
+
+- **Steps to Reproduce**:
+  1. Step one
+  2. Step two
+  3. Step three
+
+  - Specific steps to reproduce the issue. Include a precise sequence of actions if possible.
+
+- **Additional Information**:
+  - **Screenshots/Images**: Attach relevant screenshots or images that help in understanding the issue. Please add or
+    link to images here.
+  - **Environment Information**:
+    - Operating System Version
+    - Browser/Application Version
+    - Other relevant environment details
+
+----
+## License
 
 QIDIStudio is licensed under the _GNU Affero General Public License, version 3_. QIDIStudio is based on BambuStudio by Bambu Lab.
 

cmake/modules/MacOSXBundleInfo.plist.in

@@ -2,30 +2,35 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
-	<key>CFBundleGetInfoString</key>
-	<string>${MACOSX_BUNDLE_INFO_STRING}</string>
-	<key>CFBundleIconFile</key>
-	<string>${MACOSX_BUNDLE_ICON_FILE}</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.qidilab.qidi-studio</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleLongVersionString</key>
-	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
-	<key>CFBundleName</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>English</string>
+  <key>CFBundleExecutable</key>
+  <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+  <key>CFBundleGetInfoString</key>
+  <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+  <key>CFBundleIconFile</key>
+  <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+  <key>CFBundleIdentifier</key>
+  <string>com.qiditech.qidi-studio</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleLongVersionString</key>
+  <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+  <key>CFBundleName</key>
+  <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+  <key>CFBundlePackageType</key>
+  <string>APPL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+  <key>NSAppTransportSecurity</key>
+  <dict>
+    <key>NSAllowsArbitraryLoads</key>
+    <true/>
+  </dict>
   <key>CFBundleURLTypes</key>
   <array>
     <dict>
@@ -129,5 +134,10 @@
 	<true/>
 	<key>NSHumanReadableCopyright</key>
 	<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>

deps/Boost/0001-Boost-fix.patch

@@ -1,5 +1,5 @@
 From 1d6cd7c2f8640db3cda194c1b9b82f1e4b321395 Mon Sep 17 00:00:00 2001
-From: "chunmao.guo" <chunmao.guo@qidilab.com>
+From: "chunmao.guo" <chunmao.guo@qiditech.com>
 Date: Thu, 5 Jan 2023 15:55:57 +0800
 Subject: [PATCH] FIX: limit_handles
 

deps/Boost/Boost.cmake

@@ -129,7 +129,7 @@ list(APPEND _patch_command COMMAND git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST
 ExternalProject_Add(
     dep_Boost
     #URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip"
-    URL "https://github.com/qidilab/boost/releases/download/1.78.0/boost_1_78_0.zip"
+    URL "https://github.com/bambulab/boost/releases/download/1.78.0/boost_1_78_0.zip"
     URL_HASH SHA256=f22143b5528e081123c3c5ed437e92f648fe69748e95fa6e2bd41484e2986cc3
     DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
     CONFIGURE_COMMAND "${_bootstrap_cmd}"

deps/CMakeLists.txt

@@ -39,6 +39,7 @@ option(DEP_BUILD_OPENSSL "Compile openssl" ON)
 option(DEP_BUILD_GLFW "Compile GLFW" ON)
 option(DEP_BUILD_FREETYPE "Compile freetype" ON)
 option(DEP_BUILD_WXWIDGETS "Compile wxWidgets" ON)
+option(DEP_BUILD_FFMPEG "Compile ffmpeg" ON)
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
 set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path for downloaded source packages.")
@@ -229,6 +230,11 @@ if (DEP_BUILD_FREETYPE)
 endif ()
 include(OCCT/OCCT.cmake)
 include(OpenCV/OpenCV.cmake)
+set(FFMPEG_PKG "")
+if (DEP_BUILD_FFMPEG)
+    include(FFMPEG/FFMPEG.cmake)
+    set(FFMPEG_PKG dep_FFMPEG)
+endif ()
 
 set(_dep_list
     ${BOOST_PKG}
@@ -247,6 +253,7 @@ set(_dep_list
     ${ZLIB_PKG}
     ${EXPAT_PKG}
     ${FREETYPE_PKG}
+    ${FFMPEG_PKG}
     )
 
 if (MSVC)

deps/FFMPEG/FFMPEG.cmake

@@ -0,0 +1,60 @@
+set(_conf_cmd ./configure)
+
+if (MSVC)
+    set(_dstdir ${DESTDIR}/usr/local)
+    set(_source_dir "${CMAKE_BINARY_DIR}/dep_FFMPEG-prefix/src/dep_FFMPEG")
+    ExternalProject_Add(dep_FFMPEG
+        URL https://github.com/bambulab/ffmpeg_prebuilts/releases/download/7.0.2/7.0.2_msvc.zip
+        URL_HASH SHA256=DF44AE6B97CE84C720695AE7F151B4A9654915D1841C68F10D62A1189E0E7181
+        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFMPEG
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND
+            # COMMAND ${CMAKE_COMMAND} -E make_directory "${_dstdir}/bin"
+            # COMMAND ${CMAKE_COMMAND} -E make_directory "${_dstdir}/lib"
+            # COMMAND ${CMAKE_COMMAND} -E make_directory "${_dstdir}/include"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory  "${_source_dir}/bin" "${_dstdir}/bin"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory  "${_source_dir}/lib" "${_dstdir}/lib"
+            COMMAND ${CMAKE_COMMAND} -E copy_directory  "${_source_dir}/include" "${_dstdir}/include"
+    )
+
+else ()
+    set(_extra_cmd "--pkg-config-flags=\"--static\"")
+    string(APPEND _extra_cmd "--extra-cflags=\"-I ${DESTDIR}/usr/local/include\"")
+    string(APPEND _extra_cmd "--extra-ldflags=\"-I ${DESTDIR}/usr/local/lib\"")
+    string(APPEND _extra_cmd "--extra-libs=\"-lpthread -lm\"")
+    string(APPEND _extra_cmd "--ld=\"g++\"")
+    string(APPEND _extra_cmd "--bindir=\"${DESTDIR}/usr/local/bin\"")
+    string(APPEND _extra_cmd "--enable-gpl")
+    string(APPEND _extra_cmd "--enable-nonfree")
+
+
+    ExternalProject_Add(dep_FFMPEG
+        URL https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n7.0.2.tar.gz
+        URL_HASH SHA256=5EB46D18D664A0CCADF7B0ADEE03BD3B7FA72893D667F36C69E202A807E6D533
+        DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/FFMPEG
+        CONFIGURE_COMMAND ${_conf_cmd}
+            "--prefix=${DESTDIR}/usr/local"
+            "--enable-shared"
+            "--disable-doc"
+            "--enable-small"
+            "--disable-outdevs"
+            "--disable-filters"
+            "--enable-filter=*null*,afade,*fifo,*format,*resample,aeval,allrgb,allyuv,atempo,pan,*bars,color,*key,crop,draw*,eq*,framerate,*_qsv,*_vaapi,*v4l2*,hw*,scale,volume,test*"
+            "--disable-protocols"
+            "--enable-protocol=file,fd,pipe,rtp,udp"
+            "--disable-muxers"
+            "--enable-muxer=rtp"
+            "--disable-encoders"
+            "--disable-decoders"
+            "--enable-decoder=*aac*,h264*,mp3*,mjpeg,rv*"
+            "--disable-demuxers"
+            "--enable-demuxer=h264,mp3,mov"
+            "--disable-zlib"
+            "--disable-avdevice"
+        BUILD_IN_SOURCE ON
+        BUILD_COMMAND make -j
+        INSTALL_COMMAND make install
+    )
+
+endif()

deps/GMP/GMP.cmake

@@ -43,7 +43,7 @@ else ()
     endif ()
 
     ExternalProject_Add(dep_GMP
-        URL https://github.com/qidilab/gmp/archive/refs/tags/6.2.1.tar.gz
+        URL https://github.com/bambulab/gmp/archive/refs/tags/6.2.1.tar.gz
         URL_HASH SHA256=705ae57ee2014b2c6fc0f572c85ee43276b99b6b256ee16c1a9d3a8c4e3609d5
         DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/GMP
         BUILD_IN_SOURCE ON 

deps/OCCT/0001-OCCT-fix.patch

@@ -195,3 +195,27 @@ index 5ae9899f..0a17372b 100644
  
    if (!myFTLib->IsValid())
    {
+From 7236e83dcc1e7284e66dc61e612154617ef715d6 Mon Sep 17 00:00:00 2001
+From: dpasukhi <dpasukhi@opencascade.com>
+Date: Tue, 27 Aug 2024 11:33:29 +0100
+Subject: [PATCH] 0033808: Coding - FreeType Use unsigned point and contour
+ indexing in `FT_Outline`
+
+Changes to auto instead of specific type
+---
+ src/StdPrs/StdPrs_BRepFont.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/StdPrs/StdPrs_BRepFont.cxx b/src/StdPrs/StdPrs_BRepFont.cxx
+index ab2d9b3c9f..cd701879b1 100644
+--- a/src/StdPrs/StdPrs_BRepFont.cxx
++++ b/src/StdPrs/StdPrs_BRepFont.cxx
+@@ -457,7 +457,7 @@ Standard_Boolean StdPrs_BRepFont::renderGlyph (const Standard_Utf32Char theChar,
+   for (short aContour = 0, aStartIndex = 0; aContour < anOutline->n_contours; ++aContour)
+   {
+     const FT_Vector* aPntList = &anOutline->points[aStartIndex];
+-    const char* aTags      = &anOutline->tags[aStartIndex];
++    const auto* aTags      = &anOutline->tags[aStartIndex];
+     const short anEndIndex = anOutline->contours[aContour];
+     const short aPntsNb    = (anEndIndex - aStartIndex) + 1;
+     aStartIndex = anEndIndex + 1;

deps/OCCT/OCCT.cmake

@@ -8,7 +8,7 @@ qidistudio_add_cmake_project(OCCT
     URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_0.zip
     URL_HASH SHA256=28334f0e98f1b1629799783e9b4d21e05349d89e695809d7e6dfa45ea43e1dbc
     #PATCH_COMMAND ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
-    PATCH_COMMAND git apply --directory deps/build/dep_OCCT-prefix/src/dep_OCCT --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
+    PATCH_COMMAND ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OCCT-fix.patch
     #DEPENDS dep_Boost
     #DEPENDS dep_FREETYPE
     CMAKE_ARGS

deps/OpenCV/OpenCV.cmake

@@ -7,7 +7,7 @@ endif ()
 qidistudio_add_cmake_project(OpenCV
     URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz
     URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277
-    PATCH_COMMAND git apply --directory deps/build/dep_OpenCV-prefix/src/dep_OpenCV --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OpenCV-fix.patch
+    PATCH_COMMAND ${GIT_EXECUTABLE} apply --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-OpenCV-fix.patch
     CMAKE_ARGS
     -DBUILD_SHARED_LIBS=0
        -DBUILD_PERE_TESTS=OFF

doc/Localization_guide.md

@@ -13,7 +13,7 @@ Full manual for GNUgettext can be seen here: http://www.gnu.org/software/gettext
 
 ### Scenario 1. How do I add a translation or fix an existing translation
 1. Get PO-file 'QIDIStudio_xx.pot' from corresponding sub-folder here:
-https://github.com/qidilab/QIDIStudio/tree/master/qdt/i18n
+https://github.com/qiditech/QIDIStudio/tree/master/qdt/i18n
 2. Open this file in PoEdit as "Edit a translation"
 3. Apply your corrections to the translation
 4. Push changed QIDIStudio_xx.po into the original folder
@@ -21,14 +21,14 @@ https://github.com/qidilab/QIDIStudio/tree/master/qdt/i18n
 
 ### Scenario 2. How do I add a new language support
 1. Get file QIDIStudio.pot here :
-https://github.com/qidilab/QIDIStudio/tree/master/qdt/i18n
+https://github.com/qiditech/QIDIStudio/tree/master/qdt/i18n
 2. Open it in PoEdit for "Create new translation"
 3. Select Translation Language (for example French).
 4. As a result you will have fr.po - the file containing translation to French.
 Notice. When the translation is complete you need to:
     - Rename the file to QIDIStudio_fr.po
     - Click "Save file" button. QIDIStudio_fr.mo will be created immediately
-    - QIDI_Studio_fr.po needs to be copied into the sub-folder fr of https://github.com/qidilab/QIDIStudio/tree/master/qdt/i18n, and be pushed
+    - QIDI_Studio_fr.po needs to be copied into the sub-folder fr of https://github.com/qiditech/QIDIStudio/tree/master/qdt/i18n, and be pushed
 	- copy QIDIStudio_xx.mo into resources/i18n/xx and rename it to QIDIStudio.mo, then push the changed file.
 ( name of folder "fr" means "French" - the translation language). 
 
@@ -43,7 +43,7 @@ If you add new file resource, add it to the list of files containing macro `L()`
 ### Scenario 4. How do I use GNUgettext to localize my own application taking QIDI Studio as an example
 
 1.  For convenience create a list of files with this macro `L(s)`. We have 
-https://github.com/qidilab/QIDIStudio/blob/master/qdt/i18n/list.txt.
+https://github.com/qiditech/QIDIStudio/blob/master/qdt/i18n/list.txt.
 
 2.  Create template file(*.POT) with GNUgettext command:
     ```

doc/release_notes_cn.md

@@ -15,4 +15,4 @@
 7. 支持匈牙利语
 8. 一些关键问题修复
 
-详细信息请查看：https://github.com/qidilab/QIDIStudio/releases
+详细信息请查看：https://github.com/qiditech/QIDIStudio/releases

doc/release_notes_en.md

@@ -15,4 +15,4 @@
 7. Added Magyar translations
 8. Fixed some known bugs
 
-For details, please check https://github.com/qidilab/QIDIStudio/releases
+For details, please check https://github.com/qiditech/QIDIStudio/releases

linux.d/debian

@@ -0,0 +1,62 @@
+FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
+
+REQUIRED_DEV_PACKAGES=(
+    autoconf
+    build-essential
+    ninja-build
+    cmake
+    extra-cmake-modules
+    file
+    gettext
+    git
+    wget
+    libgstreamerd-3-dev
+    libsecret-1-dev
+    libosmesa6-dev
+    libssl-dev
+    eglexternalplatform-dev
+    libcurl4-openssl-dev
+    libdbus-1-dev
+    libglew-dev
+    libudev-dev
+    libmspack-dev
+    libgl1-mesa-dev
+    libgtk-3-dev
+    libxkbcommon-dev
+    libtool
+    libunwind-dev
+    libfuse2
+    texinfo
+    nasm
+    yasm
+    libx264-dev
+)
+
+if [[ -n "$UPDATE_LIB" ]]
+then
+    # for ubuntu 22+ and 23+:
+    ubu_major_version="$(grep VERSION_ID /etc/os-release | cut -d "=" -f 2 | cut -d "." -f 1 | tr -d /\"/)"
+    if [ $ubu_major_version = "22" ] || [ $ubu_major_version = "23" ]
+    then
+        REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.0-dev curl libfuse-dev libssl-dev libcurl4-openssl-dev m4)
+    elif [ $ubu_major_version = "24" ]
+    then
+        REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.1-dev)
+    else
+        REQUIRED_DEV_PACKAGES+=(libwebkit2gtk-4.0-dev)
+    fi
+    if [[ -n "$BUILD_DEBUG" ]]
+    then
+        REQUIRED_DEV_PACKAGES+=(libssl-dev libcurl4-openssl-dev)
+    fi
+    # TODO: optimize this by checking which, if any, packages are already installed
+
+    # install them all at once
+    sudo apt update
+    sudo apt install -y ${REQUIRED_DEV_PACKAGES[@]}
+
+    echo -e "done\n"
+    exit 0
+fi
+
+FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')

linux.d/fedora

@@ -0,0 +1,66 @@
+FOUND_GTK3=$(rpm -qa | grep -P '^gtk3' || true)
+
+REQUIRED_DEV_PACKAGES=(
+    autoconf
+    automake
+    cmake
+    dbus-devel
+    eglexternalplatform-devel
+    extra-cmake-modules
+    file
+    gcc
+    gcc-c++
+    gettext
+    git
+    perl
+    gstreamer1-devel
+    gstreamer1-plugins-base-devel
+    gstreamer1-plugin-openh264
+    gstreamermm-devel
+    gtk3-devel
+    libmspack-devel
+    libsecret-devel
+    libtool
+    m4
+    mesa-libGLU-devel
+    mesa-libOSMesa-devel
+    mesa-libGL-devel
+    ninja-build
+    openssl-devel
+    perl-FindBin
+    texinfo
+    wayland-devel
+    wayland-protocols-devel
+    libxkbcommon-devel
+    wget
+    libcurl-devel
+    libquadmath-devel
+    nasm
+    yasm
+    x264-devel
+)
+
+if [[ -n "$UPDATE_LIB" ]]
+then
+    NEEDED_PKGS=""
+    fedora_version=$(awk -F= '/^VERSION_ID=/ {print $2}' /etc/os-release)
+    if [ $fedora_version == "40" ]
+    then
+        REQUIRED_DEV_PACKAGES+=(webkit2gtk4.1-devel)
+    else
+        REQUIRED_DEV_PACKAGES+=(webkit2gtk4.0-devel)
+    fi
+    for PKG in ${REQUIRED_DEV_PACKAGES[@]}; do
+        rpm -q ${PKG} > /dev/null || NEEDED_PKGS+=" ${PKG}"
+    done
+
+    if [ -n "${NEEDED_PKGS}" ]; then
+        sudo dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
+        sudo dnf -y update
+        sudo dnf install -y ${NEEDED_PKGS}
+    fi
+    echo -e "done\n"
+    exit 0
+fi
+
+FOUND_GTK3_DEV=$(rpm -qa | grep -P '^gtk3-devel' || true)

qds_test_tools/qds_gcode_checker/GCodeChecker.cpp

@@ -7,8 +7,9 @@ namespace QIDIStudio {
 
 //QDS: only check wodth when dE is longer than this value
 const double CHECK_WIDTH_E_THRESHOLD = 0.0025;
-const double WIDTH_THRESHOLD = 0.02;
+const double WIDTH_THRESHOLD = 0.05;
 const double RADIUS_THRESHOLD = 0.005;
+const double MULTI_NOZZLE_TEMP_THRESHOLD = 100;
 
 const double filament_diameter = 1.75;
 const double Pi = 3.14159265358979323846;
@@ -17,14 +18,19 @@ const std::string Extrusion_Role_Tag = " FEATURE: ";
 const std::string Width_Tag          = " LINE_WIDTH: ";
 const std::string Wipe_Start_Tag     = " WIPE_START";
 const std::string Wipe_End_Tag       = " WIPE_END";
+const std::string Wipe_Tower_Start_Tag = " WIPE_TOWER_START";
+const std::string Wipe_Tower_End_Tag = " WIPE_TOWER_END";
 const std::string Layer_Change_Tag   = " CHANGE_LAYER";
 const std::string Height_Tag         = " LAYER_HEIGHT: ";
 const std::string filament_flow_ratio_tag = " filament_flow_ratio";
+const std::string has_scarf_joint_seam_tag = " has_scarf_joint_seam";
 const std::string nozzle_temperature_Tag   = " nozzle_temperature =";
 const std::string nozzle_temperature_initial_layer_Tag  = " nozzle_temperature_initial_layer";
 const std::string Z_HEIGHT_TAG                         = " Z_HEIGHT: ";
 const std::string Initial_Layer_Ptint_Height_Tag        = " initial_layer_print_height =";
 const std::string Line_Width_Tag = " line_width =";
+const std::string Filament_Map_Tag = " filament_map =";
+const std::string Physical_Extruder_Map_Tag = " physical_extruder_map =";
 
 GCodeCheckResult GCodeChecker::parse_file(const std::string& path)
 {
@@ -35,7 +41,11 @@ GCodeCheckResult GCodeChecker::parse_file(const std::string& path)
     }
     std::string line_raw;
     std::string line;
+    int line_number = 0; 
+
+
     while (std::getline(file, line_raw)) {
+        line_number++;
         const char *c = line_raw.c_str();
         c = skip_whitespaces(c);
         if (std::toupper(*c) == 'N')
@@ -43,7 +53,8 @@ GCodeCheckResult GCodeChecker::parse_file(const std::string& path)
         c = skip_whitespaces(c);
         line = c;
         if (parse_line(line) != GCodeCheckResult::Success) {
-            std::cout << "Failed to parse line " << line_raw << std::endl;
+            std::cerr << "Failed to parse line " << line_number
+                << ": " << line_raw << std::endl;
             return GCodeCheckResult::ParseFailed;
         }
     }
@@ -112,17 +123,39 @@ GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line)
     if (starts_with(comment, Extrusion_Role_Tag)) {
         m_role = string_to_role(comment.substr(Extrusion_Role_Tag.length()));
         check_gap_infill_width = false;
-        if (m_role == erExternalPerimeter) {
-            if (z_height == initial_layer_height && nozzle_temp != nozzle_temperature_initial_layer[filament_id]) {
-                std::cout << "invalid filament nozzle initial layer temperature comment with invalid value!" << std::endl;
-                return GCodeCheckResult::ParseFailed;
-            }
 
-            if (z_height != initial_layer_height && nozzle_temp != nozzle_temperature[filament_id]) {
-                std::cout << "invalid filament nozzle temperature comment with invalid value!" << std::endl;
-                return GCodeCheckResult::ParseFailed;
+        double check_nozzle_temp = 0.0f;
+        if (is_multi_nozzle == true) {
+            check_nozzle_temp = multi_nozzle_temp[current_nozzle_id];
+        }
+        else
+        {
+            check_nozzle_temp = nozzle_temp;
+        }
+
+        if (m_role == erExternalPerimeter) {
+            if (z_height != initial_layer_height) {
+                if (is_multi_nozzle) {
+                    double expected_temp = nozzle_temperature[filament_id];
+                    if (std::abs(check_nozzle_temp - expected_temp) > MULTI_NOZZLE_TEMP_THRESHOLD) {
+                        std::cout << "Multi-nozzle: Invalid filament nozzle temperature! Expected: "
+                            << expected_temp
+                            << ", but got: " << check_nozzle_temp
+                            << " (Threshold: ±100)." << std::endl;
+                        return GCodeCheckResult::ParseFailed;
+                    }
+                }
+                else {
+                    if (check_nozzle_temp != nozzle_temperature[filament_id]) {
+                        std::cout << "Invalid filament nozzle temperature! Expected: "
+                            << nozzle_temperature[filament_id]
+                            << ", but got: " << check_nozzle_temp << "." << std::endl;
+                        return GCodeCheckResult::ParseFailed;
+                    }
+                }
             }
-        } else if (m_role == erGapFill) {
+        }
+        else if (m_role == erGapFill) {
             check_gap_infill_width = true;
         }
 
@@ -130,6 +163,12 @@ GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line)
         m_wiping = true;
     } else if (starts_with(comment, Wipe_End_Tag)) {
         m_wiping = false;
+    }
+    else if (starts_with(comment, Wipe_Tower_Start_Tag)) {
+        is_wipe_tower = true;
+    }
+    else if (starts_with(comment, Wipe_Tower_End_Tag)) {
+        is_wipe_tower = false;
     } else if (starts_with(comment, Height_Tag)) {
         std::string str = comment.substr(Height_Tag.size());
         if (!parse_double_from_str(str, m_height)) {
@@ -162,6 +201,11 @@ GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line)
             return GCodeCheckResult::ParseFailed;
         }
     }
+    else if (starts_with(comment, has_scarf_joint_seam_tag))
+    {
+        std::string str = comment.substr(has_scarf_joint_seam_tag.size() + 3);
+        has_scarf_joint_seam = (str == "1");
+    }
     else if (starts_with(comment, nozzle_temperature_Tag)) {
         std::string str = comment.substr(nozzle_temperature_Tag.size() + 1);
         if (!parse_double_from_str(str, nozzle_temperature)) {
@@ -175,7 +219,36 @@ GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line)
             std::cout << "invalid nozzle temperature initial layer comment with invalid value!" << std::endl;
             return GCodeCheckResult::ParseFailed;
         }
-    } else if (starts_with(comment, Z_HEIGHT_TAG)) {
+    }
+    else if (starts_with(comment, Filament_Map_Tag)) {
+        std::string str = comment.substr(Filament_Map_Tag.size() + 1);
+        if (!parse_double_from_str(str, filament_map)) {
+            std::cout << "invalid filament map comment with invalid value!" << std::endl;
+            return GCodeCheckResult::ParseFailed;
+        }
+        else {
+            for (size_t i = 0; i < filament_map.size(); ++i) {
+                filament_map[i] -= 1;
+            }
+            is_multi_nozzle = true;
+        }
+    }
+    else if (starts_with(comment, Physical_Extruder_Map_Tag)) {
+        std::string str = comment.substr(Physical_Extruder_Map_Tag.size() + 1);
+        std::vector<double>tmp;
+
+        if (!parse_double_from_str(str, tmp)){
+            std::cout << "invalid physical extruder map comment with invalid value!" << std::endl;
+            return GCodeCheckResult::ParseFailed;
+        }
+
+        for (size_t idx = 0; idx < tmp.size(); ++idx) {
+            physical_to_logic_extruder_map[(int)(tmp[idx])]= idx;
+            logic_to_physical_extruder_map[idx] = (int)(tmp[idx]);
+        }
+        
+    }
+    else if (starts_with(comment, Z_HEIGHT_TAG)) {
         std::string str = comment.substr(Z_HEIGHT_TAG.size());
         if (!parse_double_from_str(str, z_height)) {
             std::cout << "invalid z height comment with invalid value!" << std::endl;
@@ -232,6 +305,10 @@ GCodeCheckResult GCodeChecker::parse_command(GCodeLine& gcode_line)
                     ret = parse_M104_M109(gcode_line);
                     break;
                 } // Set to nozzle temperature
+                case 1020: {
+                    ret = parse_M1020(gcode_line);
+                    break;
+                }
                 default: { break; }
             }
             break;
@@ -239,7 +316,7 @@ GCodeCheckResult GCodeChecker::parse_command(GCodeLine& gcode_line)
         case 'T':{
 
             int pt = ::atoi(&cmd[1]);
-            if (pt == 1000 || pt == 1100 || pt == 255) {
+            if (pt == 1000 || pt == 1100 || pt == 255 || pt == 1001 || pt == 65535 || pt == 65279) {
                 break;
             }
 
@@ -249,9 +326,24 @@ GCodeCheckResult GCodeChecker::parse_command(GCodeLine& gcode_line)
                 break;
             }
             filament_id = pt;
+            
+            if (is_multi_nozzle == true) {
+                set_current_nozzle(pt);
+            }
+           
             flow_ratio = filament_flow_ratio[pt];
             break;
         }
+        case 'S': {
+            if (cmd.compare(0, 4, "SYNC") == 0) {
+                // Valid SYNC command
+            }
+            else {
+                // Invalid SYNC command
+                ret = GCodeCheckResult::ParseFailed;
+            }
+            break;
+        }
         default: {
             //QDS: other g command? impossible! must be invalid
             ret = GCodeCheckResult::ParseFailed;
@@ -407,20 +499,31 @@ GCodeCheckResult GCodeChecker::parse_G92(GCodeLine& gcode_line)
         return GCodeCheckResult::ParseFailed;
     }
 
-    if (gcode_line.has(X))
+    bool any_found = false;
+    if (gcode_line.has(X)){
         m_origin[X] = m_end_position[X] - gcode_line.get(X);
+        any_found = true;
+    }
 
-    if (gcode_line.has(Y))
+    if (gcode_line.has(Y)){
         m_origin[Y] = m_end_position[Y] - gcode_line.get(Y);
+        any_found = true;
+    }
 
-    if (gcode_line.has(Z))
+    if (gcode_line.has(Z)){
         m_origin[Z] = m_end_position[Z] - gcode_line.get(Z);
+        any_found = true;
+    }
 
-    if (gcode_line.has(E))
+    if (gcode_line.has(E)){
         m_end_position[E] = gcode_line.get(E);
+        any_found = true;
+    }
 
-    for (unsigned char a = X; a <= E; ++a) {
-        m_origin[a] = m_end_position[a];
+    if (!any_found) {
+        for (unsigned char a = X; a <= E; ++a) {
+            m_origin[a] = m_end_position[a];
+        }
     }
 
     return GCodeCheckResult::Success;
@@ -455,20 +558,83 @@ GCodeCheckResult GCodeChecker::parse_M104_M109(const GCodeLine &gcode_line)
     const char *c = gcode_line.m_raw.c_str();
     const char *rs = strchr(c,'S');
 
-    std::string str=rs;
-    str = str.substr(1);
-    for (int i = 0; i < str.size(); i++) {
-        if (str[i] == ' ')
-            str=str.substr(0,i);
+    std::string strS = rs;
+    strS = strS.substr(1);
+    for (int i = 0; i < strS.size(); i++) {
+        if (strS[i] == ' ')
+            strS = strS.substr(0,i);
     }
-    if (!parse_double_from_str(str, nozzle_temp)) {
+    double temp_nozzle_temp;
+
+    if (!parse_double_from_str(strS, temp_nozzle_temp)) {
         std::cout << "invalid nozzle temperature comment with invalid value!" << std::endl;
         return GCodeCheckResult::ParseFailed;
     }
+    if (is_multi_nozzle == true) {
+        const char* rt = strchr(c, 'T');
+        if (rt) {
+            std::string strT = rt + 1; // 跳过 'T'
+            for (size_t i = 0; i < strT.size(); i++) {
+                if (strT[i] == ' ') {
+                    strT = strT.substr(0, i);
+                    break;
+                }
+            }
+            int logic_nozzle_id = physical_to_logic_extruder_map[std::stoi(strT)];
+            multi_nozzle_temp[logic_nozzle_id] = temp_nozzle_temp;
+        }
+        else
+        {
+            multi_nozzle_temp[current_nozzle_id] = temp_nozzle_temp;
+        }
+    }
+    else {
+        nozzle_temp = temp_nozzle_temp;
+    }
 
     return GCodeCheckResult::Success;
 }
 
+GCodeCheckResult GCodeChecker::parse_M1020(const GCodeLine& gcode_line)
+{
+    const char* c = gcode_line.m_raw.c_str();
+    const char* rs = strchr(c, 'S');
+
+    if (rs != nullptr) {
+        std::string str = rs;
+        str = str.substr(1);
+        for (int i = 0; i < str.size(); i++) {
+            if (str[i] == ' ')
+                str = str.substr(0, i);
+        }
+
+        try {
+            int value = std::stoi(str);
+            if (value >= 0 && value <= filament_flow_ratio.size() - 1) {
+                filament_id = value;
+                flow_ratio = filament_flow_ratio[value];
+                return GCodeCheckResult::Success;
+            }
+            else {
+                return GCodeCheckResult::ParseFailed;
+            }
+        }
+        catch (std::invalid_argument&) {
+            std::cout << "Invalid argument: not a valid integer" << std::endl;
+            return GCodeCheckResult::ParseFailed;
+        }
+        catch (std::out_of_range&) {
+            std::cout << "Out of range: number is too large" << std::endl;
+            return GCodeCheckResult::ParseFailed;
+        }
+    }
+    else
+    {
+        std::cout << "Missing 'S' character in the G-code line!" << std::endl;
+        return GCodeCheckResult::ParseFailed;
+    }
+}
+
 double GCodeChecker::calculate_G1_width(const std::array<double, 3>& source,
                                        const std::array<double, 3>& target,
                                        double e, double height, bool is_bridge) const
@@ -593,8 +759,21 @@ GCodeCheckResult GCodeChecker::check_G0_G1_width(const GCodeLine& line)
         std::array<double, 3> target = { m_end_position[X], m_end_position[Y], m_end_position[Z] };
 
         bool is_bridge = m_role == erOverhangPerimeter || m_role == erBridgeInfill;
-        if (!is_bridge) {
-            double width_real = calculate_G1_width(source, target, delta_pos[E], m_height, is_bridge);
+        if (!is_bridge && !is_wipe_tower) {
+            double real_height = m_height;
+            if (line.has(Z) && has_scarf_joint_seam && line.get(Z) != 0)
+            {
+                if (line.get(Z) == z_height)
+                {
+                    return GCodeCheckResult::Success;
+                }
+                if (line.get(Z) && line.get(E))
+                {
+                    return GCodeCheckResult::Success;
+                }
+                real_height = line.get(Z) - (z_height - m_height);
+            }
+            double width_real = calculate_G1_width(source, target, delta_pos[E], real_height, is_bridge);
             if (fabs(width_real - m_width) > WIDTH_THRESHOLD) {
                 std::cout << "Invalid G0_G1 because has abnormal line width." << std::endl;
                 std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl;
@@ -607,6 +786,16 @@ GCodeCheckResult GCodeChecker::check_G0_G1_width(const GCodeLine& line)
     return GCodeCheckResult::Success;
 }
 
+void GCodeChecker::set_current_nozzle(int filament_id) {    
+    if (filament_id >= 0 && filament_id < static_cast<int>(filament_map.size())) {
+        current_nozzle_id = filament_map[filament_id];
+    }
+    else {
+        std::cerr << "Error: filament_id is out of range!" << std::endl;
+        current_nozzle_id = 0;
+    }
+}
+
 GCodeCheckResult GCodeChecker::check_G2_G3_width(const GCodeLine& line)
 {
     auto absolute_position = [this](Axis axis, const GCodeLine& lineG2_3) {

qds_test_tools/qds_gcode_checker/GCodeChecker.h

@@ -5,6 +5,7 @@
 #include <string>
 #include <vector>
 #include <array>
+#include <map>
 
 namespace QIDIStudio {
 
@@ -109,12 +110,14 @@ private:
     GCodeCheckResult parse_M82(const GCodeLine& gcode_line);
     GCodeCheckResult parse_M83(const GCodeLine& gcode_line);
     GCodeCheckResult parse_M104_M109(const GCodeLine &gcode_line);
+    GCodeCheckResult parse_M1020(const GCodeLine& gcode_line);
 
     GCodeCheckResult parse_comment(GCodeLine& gcode_line);
 
     GCodeCheckResult check_line_width(const GCodeLine& gcode_line);
     GCodeCheckResult check_G0_G1_width(const GCodeLine& gcode_line);
     GCodeCheckResult check_G2_G3_width(const GCodeLine& gcode_line);
+    void set_current_nozzle(int id);
 
     double calculate_G1_width(const std::array<double, 3>& source,
                              const std::array<double, 3>& target,
@@ -167,7 +170,7 @@ public:
         std::string cmd=input;
         size_t read = 0;
 
-        while (cmd.size() >= 5)
+        while (cmd.find(',') != std::string::npos)
         {
             int pt = 0;
             for (pt = 0; pt < cmd.size(); pt++) {
@@ -213,10 +216,22 @@ private:
     bool check_gap_infill_width = false;
     int                 filament_id;
     double              flow_ratio  = 0;
+
     double              nozzle_temp = 0.0f;
+    std::array<double, 2> multi_nozzle_temp = { 0.0, 0.0 };
+    int                 current_nozzle_id = 0;
+
+    std::vector<double> filament_map;
+
+    std::map<int, int>  physical_to_logic_extruder_map;
+    std::map<int, int>  logic_to_physical_extruder_map;
     std::vector<double> filament_flow_ratio;
     std::vector<double> nozzle_temperature;
     std::vector<double> nozzle_temperature_initial_layer;
+
+    bool has_scarf_joint_seam = false;
+    bool is_wipe_tower = false;
+    bool is_multi_nozzle = false;
 };
 
 }

qdt/i18n/list.txt

@@ -1,3 +1,8 @@
+src/libslic3r/PresetBundle.cpp
+src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.h
+src/slic3r/GUI/DeviceTab/uiAmsHumidityPopup.cpp
+src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.h
+src/slic3r/GUI/DeviceTab/uiDeviceUpdateVersion.cpp
 src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
 src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
 src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.cpp
@@ -16,6 +21,10 @@ src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp
 src/slic3r/GUI/Gizmos/GLGizmoSeam.hpp
 src/slic3r/GUI/Gizmos/GLGizmoText.cpp
 src/slic3r/GUI/Gizmos/GLGizmoText.hpp
+src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
+src/slic3r/GUI/Gizmos/GLGizmoBrimEars.hpp
+src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp
+src/slic3r/GUI/Gizmos/GLGizmoSVG.hpp
 src/slic3r/GUI/GUI.cpp
 src/slic3r/GUI/GUI_App.cpp
 src/slic3r/GUI/GUI_AuxiliaryList.cpp
@@ -33,10 +42,14 @@ src/slic3r/GUI/HintNotification.cpp
 src/slic3r/GUI/IMSlider.cpp
 src/slic3r/GUI/Widgets/SideTools.cpp
 src/slic3r/GUI/Widgets/AMSControl.cpp
+src/slic3r/GUI/Widgets/FanControl.cpp
+src/slic3r/GUI/Widgets/FilamentLoad.cpp
+src/slic3r/GUI/Widgets/TempInput.cpp
 src/slic3r/GUI/ImGuiWrapper.cpp
 src/slic3r/GUI/Jobs/ArrangeJob.cpp
 src/slic3r/GUI/Jobs/OrientJob.cpp
 src/slic3r/GUI/Jobs/FillBedJob.cpp
+src/slic3r/GUI/Jobs/EmbossJob.cpp
 src/slic3r/GUI/Jobs/Job.cpp
 src/slic3r/GUI/Jobs/PlaterJob.cpp
 src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
@@ -70,9 +83,13 @@ src/slic3r/GUI/MainFrame.cpp
 src/slic3r/GUI/MediaPlayCtrl.cpp
 src/slic3r/GUI/MediaFilePanel.cpp
 src/slic3r/GUI/ImageGrid.cpp
+src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
 src/slic3r/GUI/Printer/PrinterFileSystem.cpp
 src/slic3r/GUI/Mouse3DController.cpp
+src/slic3r/GUI/SelectMachinePop.cpp
 src/slic3r/GUI/StatusPanel.cpp
+src/slic3r/GUI/StepMeshDialog.cpp
+src/slic3r/GUI/StepMeshDialog.hpp
 src/slic3r/GUI/Monitor.cpp
 src/slic3r/GUI/MsgDialog.cpp
 src/slic3r/GUI/NotificationManager.hpp
@@ -106,6 +123,7 @@ src/slic3r/GUI/Auxiliary.cpp
 src/slic3r/GUI/UpdateDialogs.cpp
 src/slic3r/GUI/UnsavedChangesDialog.cpp
 src/slic3r/GUI/ObjColorDialog.cpp
+src/slic3r/GUI/SyncAmsInfoDialog.cpp
 src/slic3r/GUI/WipeTowerDialog.cpp
 src/slic3r/GUI/wxExtensions.cpp
 src/slic3r/GUI/WebUserLoginDialog.cpp
@@ -121,6 +139,7 @@ src/slic3r/Utils/Http.cpp
 src/slic3r/Utils/Process.cpp
 src/slic3r/GUI/Jobs/PrintJob.cpp
 src/libslic3r/GCode.cpp
+src/libslic3r/GCode/ToolOrdering.cpp
 src/libslic3r/ExtrusionEntity.cpp
 src/libslic3r/Flow.cpp
 src/libslic3r/Format/AMF.cpp
@@ -140,7 +159,9 @@ src/slic3r/GUI/CalibrationWizardPage.cpp
 src/slic3r/GUI/CalibrationPanel.cpp
 src/slic3r/GUI/CalibrationWizard.cpp
 src/slic3r/GUI/CalibrationWizardStartPage.cpp
+src/slic3r/GUI/CalibrationWizardSavePage.cpp
 src/slic3r/GUI/CalibrationWizardPresetPage.cpp
+src/slic3r/GUI/CalibrationWizardCaliPage.cpp
 src/slic3r/GUI/CaliHistoryDialog.cpp
 src/slic3r/GUI/calib_dlg.cpp
 src/slic3r/GUI/BonjourDialog.cpp
@@ -163,4 +184,7 @@ src/slic3r/GUI/SendMultiMachinePage.cpp
 src/slic3r/GUI/MultiMachinePage.cpp
 src/slic3r/GUI/MultiMachineManagerPage.cpp
 src/slic3r/GUI/MultiTaskManagerPage.cpp
-src/slic3r/GUI/MultiMachine.cpp
+src/slic3r/GUI/MultiMachine.cpp
+src/slic3r/GUI/FilamentMapDialog.cpp
+src/slic3r/GUI/FilamentGroupPopup.cpp
+src/slic3r/GUI/FilamentMapPanel.cpp

resources/data/hints.ini

@@ -155,7 +155,7 @@ image = images/dailytips_TypesOfSupports.png
 
 ; [hint:Printing Silk Filament]
 ; text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
-; documentation_link= https://wiki.qidilab.com/en/x1/manual/printing-with-silk-filaments
+; documentation_link= https://wiki.qiditech.com/en/x1/manual/printing-with-silk-filaments
 
 [hint:Brim for better adhesion]
 text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim? 
@@ -173,7 +173,7 @@ image = images/dailytips_StackObject.png
 
 # hint:Flush into support/objects/infill]
 # text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change? 
-# documentation_link= https://wiki.qidilab.com/en/software/qidi-studio/reduce-wasting-during-filament-change
+# documentation_link= https://wiki.qiditech.com/en/software/qidi-studio/reduce-wasting-during-filament-change
 
 [hint:Improve strength]
 text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?

resources/flush/flush_data_dual_highflow.txt

@@ -0,0 +1,94 @@
+colors
+#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0A2989 #FF6A13 #0086D6 #F7E6DE #00AE42
+src dst flush
+#000000 #FFFFFF 900
+#000000 #545454 330
+#000000 #8E9089 570
+#000000 #C12E1F 660
+#000000 #F4EE2A 900
+#000000 #0A2989 480
+#000000 #FF6A13 900
+#000000 #0086D6 630
+#000000 #F7E6DE 900
+#000000 #00AE42 660
+#FFFFFF #000000 90
+#FFFFFF #545454 120
+#FFFFFF #F4EE2A 120
+#FFFFFF #0A2989 150
+#FFFFFF #FF6A13 120
+#FFFFFF #00AE42 120
+#545454 #000000 90
+#545454 #FFFFFF 780
+#545454 #8E9089 210
+#545454 #C12E1F 270
+#545454 #F4EE2A 390
+#545454 #0A2989 120
+#545454 #FF6A13 360
+#545454 #0086D6 300
+#545454 #F7E6DE 780
+#545454 #00AE42 330
+#8E9089 #000000 210
+#8E9089 #FFFFFF 450
+#8E9089 #545454 180
+#8E9089 #F4EE2A 360
+#8E9089 #0A2989 210
+#8E9089 #FF6A13 300
+#8E9089 #F7E6DE 450
+#8E9089 #00AE42 210
+#C12E1F #000000 120
+#C12E1F #FFFFFF 720
+#C12E1F #545454 270
+#C12E1F #8E9089 480
+#C12E1F #F4EE2A 540
+#C12E1F #0A2989 300
+#C12E1F #FF6A13 330
+#C12E1F #F7E6DE 690
+#C12E1F #00AE42 600
+#F4EE2A #000000 150
+#F4EE2A #FFFFFF 870
+#F4EE2A #545454 330
+#F4EE2A #0A2989 330
+#F4EE2A #FF6A13 150
+#F4EE2A #0086D6 420
+#F4EE2A #F7E6DE 870
+#0A2989 #000000 90
+#0A2989 #FFFFFF 630
+#0A2989 #545454 150
+#0A2989 #8E9089 390
+#0A2989 #C12E1F 450
+#0A2989 #F4EE2A 510
+#0A2989 #FF6A13 480
+#0A2989 #0086D6 300
+#0A2989 #F7E6DE 630
+#0A2989 #00AE42 660
+#FF6A13 #000000 90
+#FF6A13 #FFFFFF 570
+#FF6A13 #545454 180
+#FF6A13 #F4EE2A 390
+#FF6A13 #0A2989 270
+#FF6A13 #0086D6 360
+#FF6A13 #F7E6DE 330
+#FF6A13 #00AE42 300
+#0086D6 #000000 120
+#0086D6 #FFFFFF 600
+#0086D6 #545454 150
+#0086D6 #8E9089 390
+#0086D6 #C12E1F 420
+#0086D6 #F4EE2A 480
+#0086D6 #0A2989 120
+#0086D6 #FF6A13 330
+#0086D6 #F7E6DE 450
+#0086D6 #00AE42 180
+#F7E6DE #000000 90
+#F7E6DE #545454 120
+#F7E6DE #F4EE2A 120
+#F7E6DE #0A2989 150
+#F7E6DE #FF6A13 120
+#F7E6DE #00AE42 120
+#00AE42 #000000 90
+#00AE42 #FFFFFF 630
+#00AE42 #545454 210
+#00AE42 #F4EE2A 360
+#00AE42 #0A2989 210
+#00AE42 #0086D6 360
+#00AE42 #F7E6DE 630

resources/flush/flush_data_dual_standard.txt

@@ -0,0 +1,99 @@
+colors
+#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0A2989 #FF6A13 #0086D6 #F7E6DE #00AE42
+src dst flush
+#000000 #FFFFFF 900
+#000000 #545454 270
+#000000 #8E9089 510
+#000000 #C12E1F 900
+#000000 #F4EE2A 900
+#000000 #0A2989 360
+#000000 #FF6A13 900
+#000000 #0086D6 630
+#000000 #F7E6DE 900
+#000000 #00AE42 780
+#FFFFFF #000000 90
+#FFFFFF #545454 90
+#FFFFFF #8E9089 180
+#FFFFFF #F4EE2A 150
+#FFFFFF #0A2989 60
+#FFFFFF #FF6A13 150
+#FFFFFF #00AE42 150
+#545454 #000000 90
+#545454 #8E9089 240
+#545454 #C12E1F 360
+#545454 #F4EE2A 390
+#545454 #0A2989 180
+#545454 #FF6A13 300
+#545454 #0086D6 270
+#545454 #F7E6DE 330
+#545454 #00AE42 390
+#8E9089 #000000 210
+#8E9089 #FFFFFF 390
+#8E9089 #545454 150
+#8E9089 #F4EE2A 330
+#8E9089 #0A2989 330
+#8E9089 #F7E6DE 390
+#8E9089 #00AE42 240
+#C12E1F #000000 90
+#C12E1F #FFFFFF 780
+#C12E1F #545454 360
+#C12E1F #8E9089 510
+#C12E1F #F4EE2A 600
+#C12E1F #0A2989 420
+#C12E1F #FF6A13 390
+#C12E1F #0086D6 450
+#C12E1F #F7E6DE 600
+#C12E1F #00AE42 510
+#F4EE2A #000000 90
+#F4EE2A #FFFFFF 690
+#F4EE2A #545454 390
+#F4EE2A #8E9089 480
+#F4EE2A #0A2989 390
+#F4EE2A #FF6A13 180
+#F4EE2A #0086D6 450
+#F4EE2A #F7E6DE 690
+#0A2989 #000000 90
+#0A2989 #FFFFFF 630
+#0A2989 #545454 300
+#0A2989 #8E9089 450
+#0A2989 #C12E1F 450
+#0A2989 #F4EE2A 510
+#0A2989 #FF6A13 420
+#0A2989 #0086D6 330
+#0A2989 #F7E6DE 630
+#0A2989 #00AE42 390
+#FF6A13 #000000 90
+#FF6A13 #FFFFFF 420
+#FF6A13 #545454 90
+#FF6A13 #8E9089 360
+#FF6A13 #C12E1F 180
+#FF6A13 #F4EE2A 180
+#FF6A13 #0A2989 210
+#FF6A13 #0086D6 360
+#FF6A13 #F7E6DE 420
+#FF6A13 #00AE42 240
+#0086D6 #000000 90
+#0086D6 #FFFFFF 510
+#0086D6 #545454 150
+#0086D6 #8E9089 420
+#0086D6 #C12E1F 420
+#0086D6 #F4EE2A 420
+#0086D6 #0A2989 120
+#0086D6 #FF6A13 390
+#0086D6 #F7E6DE 510
+#0086D6 #00AE42 300
+#F7E6DE #000000 90
+#F7E6DE #545454 90
+#F7E6DE #8E9089 180
+#F7E6DE #F4EE2A 150
+#F7E6DE #0A2989 60
+#F7E6DE #FF6A13 150
+#F7E6DE #00AE42 150
+#00AE42 #FFFFFF 570
+#00AE42 #545454 270
+#00AE42 #8E9089 480
+#00AE42 #F4EE2A 450
+#00AE42 #0A2989 270
+#00AE42 #FF6A13 300
+#00AE42 #0086D6 390
+#00AE42 #F7E6DE 570

resources/flush/flush_data_standard.txt

@@ -0,0 +1,61 @@
+colors
+#000000 #C12E1F #00AE42 #545454 #D1D3D5 #5B6579 #F4EE2A #9D432C #5E43B7 #0A2989 #FF6A13 #8E9089
+src dst flush
+#000000 #F4EE2A 450
+#000000 #5E43B7 330
+#C12E1F #F4EE2A 420
+#C12E1F #FF6A13 210
+#00AE42 #D1D3D5 330
+#00AE42 #F4EE2A 240
+#00AE42 #FF6A13 270
+#545454 #00AE42 180
+#545454 #D1D3D5 240
+#545454 #F4EE2A 270
+#545454 #5E43B7 120
+#545454 #FF6A13 300
+#545454 #8E9089 120
+#D1D3D5 #F4EE2A 120
+#D1D3D5 #FF6A13 150
+#5B6579 #C12E1F 120
+#5B6579 #00AE42 90
+#5B6579 #D1D3D5 120
+#5B6579 #F4EE2A 180
+#5B6579 #9D432C 120
+#5B6579 #0A2989 90
+#5B6579 #FF6A13 180
+#5B6579 #8E9089 90
+#F4EE2A #000000 120
+#F4EE2A #C12E1F 90
+#F4EE2A #00AE42 150
+#F4EE2A #9D432C 150
+#F4EE2A #FF6A13 90
+#9D432C #00AE42 240
+#9D432C #D1D3D5 300
+#9D432C #F4EE2A 270
+#9D432C #FF6A13 180
+#9D432C #8E9089 210
+#5E43B7 #00AE42 180
+#5E43B7 #D1D3D5 270
+#5E43B7 #F4EE2A 270
+#5E43B7 #9D432C 150
+#5E43B7 #FF6A13 270
+#5E43B7 #8E9089 210
+#0A2989 #C12E1F 330
+#0A2989 #00AE42 210
+#0A2989 #545454 150
+#0A2989 #D1D3D5 450
+#0A2989 #5B6579 240
+#0A2989 #9D432C 270
+#0A2989 #5E43B7 180
+#0A2989 #FF6A13 390
+#0A2989 #8E9089 270
+#FF6A13 #C12E1F 90
+#FF6A13 #D1D3D5 210
+#FF6A13 #F4EE2A 210
+#FF6A13 #9D432C 120
+#FF6A13 #8E9089 180
+#8E9089 #C12E1F 150
+#8E9089 #00AE42 120
+#8E9089 #D1D3D5 150
+#8E9089 #F4EE2A 270
+#8E9089 #FF6A13 150

resources/images/L.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="7.77482" cy="7.85898" r="7.70859" fill="#262E30"/>
+</svg>

resources/images/QIDIStudio.svg

@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="图层_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	  viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
-<path style="fill:#FFFFFF;" d="M60,252c-30.9,0-56-25.1-56-56V60C4,29.1,29.1,4,60,4h136c30.9,0,56,25.1,56,56v136
-	c0,30.9-25.1,56-56,56H60z"/>
-<path style="fill:#4479FB;" d="M196,8c28.7,0,52,23.3,52,52v136c0,28.7-23.3,52-52,52H60c-28.7,0-52-23.3-52-52V60
-	C8,31.3,31.3,8,60,8H196 M196,0H60C26.9,0,0,26.9,0,60v136c0,33.1,26.9,60,60,60h136c33.1,0,60-26.9,60-60V60
-	C256,26.9,229.1,0,196,0L196,0z"/>
-<path style="fill:#4479FB;" d="M194.5,188.5c-7.6-3.5-15-7.5-22.2-11.8c-6.8-4.2-13.1-8.5-18.7-12.9c17.1-13.5,23.2-36.1,13.2-56.7
-	C154.1,81,120.5,67.9,91.6,78c-31.6,11-41,43-25.8,68.7c-48.2-53.1,7.3-123.8,85-99.8c26.2,8.1,48.9,25.8,60.8,50.2
-	C227.4,129.7,219.5,165.3,194.5,188.5z"/>
-<path style="fill:#4479FB;" d="M34.7,158.5c17.6,36.2,59,57.6,100.3,54.8c-16.2-6.1-32-16-45-29c-7.8-7.8-13.8-16-18.2-24.2
-	c-9.1-6.3-16.9-14.3-23-23.6C37.5,118.9,34.6,99.6,39,82C24.6,104.1,21.9,132.2,34.7,158.5L34.7,158.5z"/>
-<path style="fill:#4479FB;" d="M234.5,206.6c-28.2,6.1-68-4.1-97.8-26.7c-35.1-26.6-43.5-60.9-19.9-78.1c-8,18.8,7,47.1,40.6,71.4
-	C181.1,190.4,209.2,202,234.5,206.6z"/>
-<path style="fill:#4479FB;" d="M187.4,212.9c-29.6,5.2-68.1-7.9-94.8-34.2c-33-32.6-35.5-73.3-5.5-90.8c12-7,27.4-9.2,43.6-7.3
-	c-4.7,1.3-9.2,3.1-13.2,5.4c-30,17.5-26.8,58.9,7.2,92.4C142.6,196.1,165.4,208.1,187.4,212.9L187.4,212.9z"/>
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 256 256" enable-background="new 0 0 256 256" xml:space="preserve">
+<g>
+	<path fill="#303AB2" d="M196,256H60c-33.1,0-60-26.9-60-60V60C0,26.9,26.9,0,60,0h136c33.1,0,60,26.9,60,60v136
+		C256,229.1,229.1,256,196,256z"/>
+</g>
+<g>
+	<path fill="#FFFFFF" d="M145,177.9v-13.2v-21.3c0-2.3,1.2-4.5,3.2-5.6l28.3-16.3l13-7.5V93c0-4.6-2.5-8.9-6.5-11.2l-57.8-33.4
+		c-4-2.3-8.9-2.3-13,0L54.5,81.8c-4,2.3-6.5,6.6-6.5,11.2v66.7c0,4.6,2.5,8.9,6.5,11.2l57.8,33.4c4,2.3,8.9,2.3,13,0l19.7-11.4l0,0
+		V177.9z M125.2,115.2c-4,2.3-6.5,6.6-6.5,11.2v55.4c0,5-5.4,8.1-9.7,5.6l-44.8-25.9c-2-1.2-3.2-3.3-3.2-5.6V96.7
+		c0-2.3,1.2-4.5,3.2-5.6l51.3-29.6c2-1.2,4.5-1.2,6.5,0l38.3,22.1c4.3,2.5,4.3,8.7,0,11.2L125.2,115.2z"/>
+</g>
+<g>
+	<path fill="#FFFFFF" d="M198.3,108.9l-8.8,5.1v18.2v1.8v22.1v7.5c0,2.3-1.2,4.4-3.2,5.5l0,0l-0.7,0.4l-0.9,0.5l-8.1,4.7l-5.2,3
+		L145,192.9l0,0v6.4v3.1v0.1c0,0,0,0,0,0v0.4c0.1,4.8,5.2,7.9,9.5,5.7l0.2-0.1l5.2-3l44.9-26c2-1.2,3.2-3.3,3.2-5.6v-59.4
+		C208,109.5,202.6,106.4,198.3,108.9z"/>
+</g>
 </svg>

resources/images/QIDIStudioBlack.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="11.8100004196167" height="12" viewBox="0 0 11.8100004196167 12"><defs><clipPath id="master_svg0_2688_67072"><rect x="0" y="0" width="11.8100004196167" height="12" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_2688_67072)"><g><path d="M7.15,9.68L7.15,7.13C7.15,6.96,7.24,6.8,7.39,6.72L9.48,5.51L10.44,4.96L10.44,3.41C10.44,3.07,10.26,2.75,9.96,2.58L5.7,0.13C5.4,-0.04,5.04,-0.04,4.74,0.13L0.48,2.59C0.18,2.76,0,3.08,0,3.42L0,8.34C0,8.68,0.18,9,0.48,9.17L4.74,11.63C5.04,11.8,5.4,11.8,5.7,11.63L7.16,10.79L7.16,9.68L7.15,9.68ZM5.69,5.05C5.39,5.22,5.21,5.54,5.21,5.88L5.21,9.97C5.21,10.34,4.81,10.57,4.49,10.38L1.18,8.47C1.03,8.38,0.94,8.23,0.94,8.06L0.94,3.69C0.94,3.52,1.03,3.36,1.18,3.28L4.96,1.1C5.11,1.01,5.29,1.01,5.44,1.1L8.27,2.73C8.59,2.91,8.59,3.37,8.27,3.56L5.68,5.06L5.69,5.05Z" fill="#212322" fill-opacity="1" style="mix-blend-mode:passthrough"/></g><g><path d="M11.090000095367431,4.590000153192139L10.44000009536743,4.970000553192139L10.44000009536743,8.630001553192137C10.44000009536743,8.80000155319214,10.350000095367431,8.950001553192138,10.200000095367432,9.03000155319214L10.150000095367432,9.060001553192139L10.080000095367431,9.10000155319214L9.480000095367432,9.450001553192138L9.090000095367431,9.670001553192138L7.150000095367432,10.790001553192138L7.150000095367432,11.490001553192139L7.150000095367432,11.520001553192138C7.150000095367432,11.880001553192137,7.5300000953674315,12.10000155319214,7.850000095367432,11.94000155319214L7.870000095367431,11.94000155319214L8.250000095367431,11.71000155319214L11.560000095367432,9.790001553192138C11.71000009536743,9.700001553192138,11.800000095367432,9.55000155319214,11.800000095367432,9.380001553192137L11.800000095367432,4.999999553192139C11.800000095367432,4.630000553192139,11.400000095367432,4.400000553192139,11.080000095367431,4.590000153192139L11.090000095367431,4.590000153192139Z" fill="#212322" fill-opacity="1" style="mix-blend-mode:passthrough"/></g></g></svg>

resources/images/QIDIStudio_about.svg

@@ -1,38 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 25.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="562px" height="238px" viewBox="0 0 562 238" enable-background="new 0 0 562 238" xml:space="preserve">
-<rect x="1" y="0.5" fill="#4479FB" width="560" height="237"/>
-<path fill="#FFFFFF" d="M236.5,154.5l1.6,1.8c0.5-0.6,0.9-1.3,1.2-1.9c0.2-0.7,0.4-1.4,0.4-2.2c0-0.9-0.1-1.7-0.4-2.4
-	c-0.3-0.8-0.8-1.5-1.3-2c-0.6-0.6-1.3-1.1-2-1.4c-0.8-0.3-1.5-0.5-2.3-0.5c-0.8,0-1.6,0.2-2.4,0.5c-0.8,0.3-1.4,0.8-2,1.4
-	c-0.6,0.6-1.1,1.3-1.4,2c-0.3,0.8-0.4,1.6-0.4,2.4c0,1.8,0.6,3.3,1.8,4.5c1.2,1.2,2.7,1.8,4.5,1.8c0.5,0,0.9,0,1.4-0.2
-	c0.4-0.1,0.9-0.3,1.3-0.5l-3.1-3.3H236.5z M240,158.3l3.6,3.9h-3.3l-2.2-2.4c-0.8,0.4-1.5,0.7-2.3,0.9c-0.8,0.2-1.6,0.3-2.4,0.3
-	c-1.2,0-2.3-0.2-3.4-0.7c-1.1-0.4-2.1-1.1-2.9-1.9c-0.9-0.8-1.5-1.8-2-2.9s-0.7-2.2-0.7-3.4s0.2-2.3,0.7-3.4c0.4-1.1,1.1-2,2-2.9
-	c0.8-0.8,1.8-1.5,2.9-1.9c1.1-0.4,2.3-0.7,3.5-0.7c1.2,0,2.4,0.2,3.5,0.7c1.1,0.4,2.1,1.1,2.9,1.9c0.8,0.8,1.5,1.8,1.9,2.9
-	c0.5,1.1,0.7,2.2,0.7,3.4c0,1.2-0.2,2.3-0.7,3.3C241.4,156.5,240.8,157.5,240,158.3L240,158.3z M245.8,160.6v-17h2.8v17H245.8z
-	 M255.5,158.1h2.3c1.3,0,2.2-0.1,2.9-0.3c0.6-0.2,1.2-0.5,1.7-0.9c0.6-0.5,1.1-1.2,1.4-2c0.3-0.8,0.5-1.8,0.5-2.8s-0.2-2-0.5-2.8
-	c-0.3-0.8-0.8-1.5-1.4-2c-0.5-0.4-1.1-0.7-1.7-0.9c-0.7-0.2-1.7-0.3-3.1-0.3h-1h-1V158.1z M252.7,160.6v-17h3.7
-	c2.4,0,4.1,0.1,5.1,0.4c1,0.2,1.8,0.7,2.6,1.2c1,0.8,1.7,1.7,2.2,2.9s0.8,2.5,0.8,4s-0.2,2.8-0.8,4c-0.5,1.2-1.2,2.1-2.2,2.9
-	c-0.8,0.6-1.6,1-2.5,1.2c-0.9,0.3-2.4,0.4-4.4,0.4h-0.8H252.7z M270.4,160.6v-17h2.8v17H270.4z"/>
-<path fill="#FFFFFF" d="M282.7,160.6v-13h-3.8v-4h12.2v4h-3.8v13H282.7z M293.5,160.6v-17h10.4v3.7H298v2.9h5.6v3.6H298v2.9h5.9v3.8
-	H293.5z M319.4,144.3v5c-0.6-0.7-1.3-1.2-1.9-1.5c-0.6-0.3-1.3-0.5-2-0.5c-1.3,0-2.4,0.4-3.2,1.4c-0.8,0.9-1.2,2.1-1.2,3.5
-	c0,1.4,0.4,2.5,1.2,3.4c0.8,0.9,1.9,1.3,3.2,1.3c0.7,0,1.4-0.2,2-0.5c0.6-0.3,1.3-0.8,1.9-1.5v5.1c-0.8,0.4-1.5,0.6-2.2,0.8
-	c-0.7,0.2-1.5,0.3-2.2,0.3c-0.9,0-1.8-0.1-2.6-0.3c-0.8-0.2-1.5-0.6-2.2-1c-1.3-0.8-2.2-1.9-2.9-3.2c-0.7-1.3-1-2.7-1-4.4
-	c0-1.3,0.2-2.5,0.6-3.5c0.4-1.1,1.1-2,1.9-2.9c0.8-0.8,1.7-1.5,2.7-1.9c1-0.4,2.1-0.6,3.4-0.6c0.7,0,1.5,0.1,2.2,0.3
-	C318,143.7,318.7,143.9,319.4,144.3L319.4,144.3z M322.2,160.6v-17h4.6v6.6h6.2v-6.6h4.6v17H333v-6.9h-6.2v6.9H322.2z"/>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M247.2,112.8c6.5,13.4,21.8,21.3,37.1,20.3
-	c-6-2.3-11.8-5.9-16.6-10.7c-2.9-2.9-5.1-5.9-6.7-8.9c-3.3-2.3-6.2-5.3-8.5-8.7c-4.2-6.5-5.2-13.6-3.6-20.1
-	C243.5,92.7,242.5,103.1,247.2,112.8L247.2,112.8z M292.4,131.7c0.2-0.1,0.5-0.1,0.7-0.2l-1.8-0.3
-	C291.7,131.3,292,131.5,292.4,131.7L292.4,131.7z M300.6,128.2c1.4-0.8,2.7-1.7,3.9-2.7c-3.2-1.4-6.3-3-9.3-4.7
-	c-0.5,0.1-1.1,0.2-1.6,0.4l7.8,5.4L300.6,128.2z M306.3,123.9c7.2-6.8,10.6-16.3,8.9-26c0.8,9.6-6.1,18.1-16.7,21.8
-	C301,121.3,303.6,122.7,306.3,123.9L306.3,123.9z"/>
-<path fill="#FFFFFF" d="M306.3,123.9c-2.8-1.3-5.6-2.8-8.2-4.4c-2.5-1.5-4.8-3.1-6.9-4.8c6.3-5,8.6-13.3,4.9-21
-	c-4.7-9.6-17.1-14.5-27.8-10.8c-11.7,4.1-15.2,15.9-9.5,25.4c-17.8-19.6,2.7-45.7,31.4-36.9c9.7,3,18.1,9.5,22.5,18.5
-	C318.4,102.2,315.5,115.4,306.3,123.9z"/>
-<path fill="#FFFFFF" d="M247.2,112.8c6.5,13.4,21.8,21.3,37,20.3c-6-2.3-11.8-5.9-16.6-10.7c-2.9-2.9-5.1-5.9-6.7-8.9
-	c-3.3-2.3-6.3-5.3-8.5-8.7c-4.2-6.5-5.2-13.6-3.6-20.1C243.5,92.7,242.5,103.1,247.2,112.8L247.2,112.8z"/>
-<path fill="#FFFFFF" d="M321.1,130.6c-10.4,2.2-25.1-1.5-36.1-9.9c-13-9.8-16.1-22.5-7.4-28.8c-2.9,7,2.6,17.4,15,26.4
-	C301.3,124.6,311.7,128.9,321.1,130.6z"/>
-<path fill="#FFFFFF" d="M303.7,132.9c-10.9,1.9-25.2-2.9-35-12.6c-12.2-12.1-13.1-27.1-2-33.5c4.4-2.6,10.1-3.4,16.1-2.7
-	c-1.8,0.5-3.4,1.1-4.9,2c-11.1,6.5-9.9,21.8,2.6,34.1C287.1,126.7,295.5,131.2,303.7,132.9L303.7,132.9z"/>
+	 viewBox="0 0 562 238" enable-background="new 0 0 562 238" xml:space="preserve">
+<rect fill="#303AB2" width="562" height="238"/>
+<g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M335.8,111.2h-7.3c-1.1,0-2,0.9-2,2v27.7c0,1.1,0.9,2,2,2h7.3c1.1,0,2-0.9,2-2v-27.7
+				C337.8,112.1,336.9,111.2,335.8,111.2z"/>
+			<path fill="#FFFFFF" d="M333.3,104.4h-2.5c-2.4,0-4.4-2-4.4-4.4v-2.5c0-2.4,2-4.4,4.4-4.4h2.5c2.4,0,4.4,2,4.4,4.4v2.5
+				C337.8,102.4,335.8,104.4,333.3,104.4z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M419.5,111.2h-7.3c-1.1,0-2,0.9-2,2v27.7c0,1.1,0.9,2,2,2h7.3c1.1,0,2-0.9,2-2v-27.7
+				C421.5,112.1,420.6,111.2,419.5,111.2z"/>
+			<path fill="#FFFFFF" d="M417.1,104.4h-2.5c-2.4,0-4.4-2-4.4-4.4v-2.5c0-2.4,2-4.4,4.4-4.4h2.5c2.4,0,4.4,2,4.4,4.4v2.5
+				C421.5,102.4,419.5,104.4,417.1,104.4z"/>
+		</g>
+		<path fill="#FFFFFF" d="M380.2,93.1h-3h-4.6h-8.8h-4H351c-1.1,0-2,0.9-2,2v7.3c0,1.1,0.9,2,2,2h8.8v0h12.8h1.4h3.2h2.5
+			c4.4,0,7.9,3.5,7.9,7.9v5.7v0v5.7c0,4.4-3.5,7.9-7.9,7.9H374h-5.2h-0.5h-5.9c-1.1,0-2-0.9-2-2v-5.9V122v-0.5V120c0-1.1-0.9-2-2-2
+			H351c-1.1,0-2,0.9-2,2v1.5h0v19.4c0,1.1,0.9,2,2,2h0.8h8.5h6c0.5,0,0.9,0.1,1.4,0.1c0,0,0,0,0,0v0h12.5c10.3,0,18.7-8.4,18.7-18.7
+			V118v0v-6.2C398.9,101.5,390.5,93.1,380.2,93.1z"/>
+		<g>
+			<path fill="#FFFFFF" d="M296.5,93.1C296.5,93.1,296.5,93.1,296.5,93.1L296.5,93.1H284c-10.3,0-18.7,8.4-18.7,18.7v2.3v3.9v0v5.7
+				v0.5c0,10.3,8.4,18.7,18.7,18.7h4.3c1.1,0,2-0.9,2-2v-7.3c0-1.1-0.9-2-2-2h-3.7c-4.4,0-7.9-3.5-7.9-7.9V118v0v-3.9v-1.8
+				c0-4.4,3.5-7.9,7.9-7.9h11.4c4.4,0,7.9,3.5,7.9,7.9v3.7c0,1.1,0.9,2,2,2h7.3c1.1,0,2-0.9,2-2v-4.1c0,0,0-0.1,0-0.1
+				C315.1,101.4,306.8,93.1,296.5,93.1z"/>
+			<g>
+				<path fill="#FFFFFF" d="M314.6,134.4l-15.8-15.8c-0.4-0.4-0.9-0.6-1.4-0.6l-10.4,0c-1.8,0-2.6,2.1-1.4,3.4l21,21
+					c0.8,0.8,2,0.8,2.8,0l5.2-5.2C315.3,136.4,315.3,135.1,314.6,134.4z"/>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M199.7,149.5v-8.1v-13c0-1.4,0.8-2.7,2-3.4l17.3-10l7.9-4.6V97.6c0-2.8-1.5-5.4-4-6.8l-35.3-20.4
+				c-2.4-1.4-5.5-1.4-7.9,0l-35.3,20.4c-2.4,1.4-4,4-4,6.8v40.7c0,2.8,1.5,5.4,4,6.8l35.3,20.4c2.4,1.4,5.5,1.4,7.9,0l12-7l0,0
+				V149.5z M187.6,111.2c-2.4,1.4-3.9,4-3.9,6.8v33.8c0,3-3.3,4.9-5.9,3.4l-27.3-15.8c-1.2-0.7-2-2-2-3.4V99.9c0-1.4,0.8-2.7,2-3.4
+				l31.3-18.1c1.2-0.7,2.7-0.7,4,0L209,91.9c2.6,1.5,2.6,5.3,0,6.8L187.6,111.2z"/>
+		</g>
+		<path fill="#FFFFFF" d="M232.2,107.3l-5.4,3.1v11.1v1.1v13.5v4.6c0,1.4-0.8,2.7-2,3.3l0,0l-0.4,0.2l-0.6,0.3l-5,2.9l-3.2,1.8
+			l-16,9.3l0,0v3.9v1.9v0.1c0,0,0,0,0,0v0.2c0.1,2.9,3.2,4.8,5.8,3.5l0.1-0.1l3.2-1.8l27.4-15.9c1.2-0.7,2-2,2-3.4v-36.2
+			C238.1,107.7,234.8,105.8,232.2,107.3z"/>
+	</g>
+</g>
 </svg>

resources/images/R.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="7.77482" cy="8.025" r="7.70859" fill="#262E30"/>
+</svg>

resources/images/add_text_modifier.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5a1,1,0,0,1-1-1v-9h-4a1,1,0,0,1-1-1v-2a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1h-4v2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><line x1="8.5" y1="8.5" x2="14.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linejoin:round"/><line x1="14.5" y1="8.5" x2="8.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linejoin:round"/><line x1="11.5" y1="8.5" x2="11.5" y2="14.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/><line x1="14.5" y1="11.5" x2="8.5" y2="11.5" style="fill:none;stroke:#009688;stroke-linecap:square;stroke-linejoin:round"/></svg>

resources/images/add_text_negative.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5a1,1,0,0,1-1-1v-9h-4a1,1,0,0,1-1-1v-2a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1h-4v2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M15,11.5A3.5,3.5,0,1,1,11.5,8,3.5,3.5,0,0,1,15,11.5ZM14,11H9v1h5Z" style="fill:#009688"/></svg>

resources/images/add_text_part.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path d="M6.5,14.5a1,1,0,0,1-1-1v-9h-4a1,1,0,0,1-1-1v-2a1,1,0,0,1,1-1h12a1,1,0,0,1,1,1v2a1,1,0,0,1-1,1h-4v2" style="fill:none;stroke:#949494;stroke-linecap:round;stroke-linejoin:round"/><path d="M15,11.5A3.5,3.5,0,1,1,11.5,8,3.5,3.5,0,0,1,15,11.5ZM14,11H12V9H11v2H9v1h2v2h1V12h2Z" style="fill:#009688"/></svg>

resources/images/advanced_option1.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.4742 9.15669C12.7353 9.41782 12.7353 9.84008 12.4742 10.0984L7.14038 15.435C6.87924 15.6961 6.45698 15.6961 6.19863 15.435C5.94027 15.1739 5.93749 14.7516 6.19863 14.4933L11.0602 9.63173L6.19585 4.76742C5.93472 4.50628 5.93472 4.08403 6.19585 3.82567C6.45698 3.56731 6.87924 3.56454 7.1376 3.82567L12.4742 9.15669Z" fill="#262E30"/>
+</svg>

resources/images/advanced_option1_disable.svg

@@ -0,0 +1,3 @@
+<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.4742 9.15669C12.7353 9.41782 12.7353 9.84008 12.4742 10.0984L7.14038 15.435C6.87924 15.6961 6.45698 15.6961 6.19863 15.435C5.94027 15.1739 5.93749 14.7516 6.19863 14.4933L11.0602 9.63173L6.19585 4.76742C5.93472 4.50628 5.93472 4.08403 6.19585 3.82567C6.45698 3.56731 6.87924 3.56454 7.1376 3.82567L12.4742 9.15669Z" fill="#CECECE"/>
+</svg>

resources/images/advanced_option2.svg

@@ -0,0 +1,3 @@
+<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.0084 12.6962C9.74722 12.9574 9.32496 12.9574 9.0666 12.6962L3.73003 7.36244C3.4689 7.10131 3.4689 6.67905 3.73003 6.4207C3.99116 6.16234 4.41342 6.15956 4.67178 6.4207L9.53331 11.2822L14.3976 6.41792C14.6588 6.15678 15.081 6.15678 15.3394 6.41792C15.5977 6.67905 15.6005 7.10131 15.3394 7.35967L10.0084 12.6962Z" fill="#262E30"/>
+</svg>