Fix small area infill flow compensation (graph version) causing some lines to not extrude (#4374)

.clang-format

@@ -4,17 +4,17 @@
 Language:        Cpp
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: true
-AlignConsecutiveDeclarations: true
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: DontAlign
-AlignOperands:   true
+AlignOperands:   false
 AlignTrailingComments: true
 AllowAllParametersOfDeclarationOnNextLine: true
 AllowShortBlocksOnASingleLine: true
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: true
+AllowShortLoopsOnASingleLine: false
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
@@ -25,7 +25,7 @@ BraceWrapping:
   AfterClass:      true
   AfterControlStatement: false
   AfterEnum:       false
-  AfterFunction:   true
+  AfterFunction:   false
   AfterNamespace:  false
   AfterObjCDeclaration: false
   AfterStruct:     true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -12,8 +12,11 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
 
+**Describe how it would work**
+Be as descriptive as your skill level allows you.
+
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context, pictures or paint drawing about the feature request here.

.github/workflows/ccpp_mac.yml

@@ -11,12 +11,23 @@ on:
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v3
+    - name: check autoconf version
+      run: autoconf --version
+    - name: update automake for mpfr
+      run: |
+        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        tar -xzf automake-1.16.5.tar.gz
+        cd automake-*
+        ./configure
+        make
+        sudo make install
+        automake --version
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -i
+      run: ./BuildMacOS.sh -dsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_mac_arm.yml

@@ -15,8 +15,21 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+    - name: install autoconf
+      run: brew install autoconf
+    - name: check autoconf version
+      run: autoconf --version
+    - name: update automake for mpfr
+      run: |
+        curl -O -L http://ftpmirror.gnu.org/automake/automake-1.16.5.tar.gz
+        tar -xzf automake-1.16.5.tar.gz
+        cd automake-*
+        ./configure
+        make
+        sudo make install
+        automake --version
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -ia
+      run: ./BuildMacOS.sh -adsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_mac_arm_debug.yml

@@ -15,7 +15,7 @@ jobs:
       with:
         ref: 'debug_macos'
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -bia
+      run: ./BuildMacOS.sh -badsi
     - name: ls build
       working-directory: ./build
       run: ls

.github/workflows/ccpp_mac_arm_rc.yml

@@ -15,7 +15,7 @@ jobs:
       with:
         ref: 'rc'
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -ia
+      run: ./BuildMacOS.sh -adsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_mac_debug.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v2
       with:
         ref: 'debug_macos'
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -bi
+      run: ./BuildMacOS.sh -bdsi
     - name: tar the pack
       working-directory: ./build
       run: ls

.github/workflows/ccpp_mac_rc.yml

@@ -8,14 +8,14 @@ on:
 jobs:
   build:
 
-    runs-on: macos-11
+    runs-on: macos-12
 
     steps:
     - uses: actions/checkout@v2
       with:
         ref: 'rc'
     - name: build deps & slicer
-      run: ./BuildMacOS.sh -i
+      run: ./BuildMacOS.sh -dsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_ubuntu.yml

@@ -30,14 +30,8 @@ jobs:
       run: sudo apt update
     - name: install gtk2 glew
       run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev gettext
-    - name: build deps & slicer
-      run: ./BuildLinux.sh -dgs
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - name: build tar & appimage
-      working-directory: ./build
-      run: src/BuildLinuxImage.sh -i
+    - name: build deps & slicer, tar & appimage
+      run: ./BuildLinux.sh -dgsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_ubuntu_debug.yml

@@ -18,9 +18,6 @@ jobs:
       uses: jwlawson/[email protected]
       with:
         cmake-version: '3.16.x'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
     - name: update clock
@@ -29,14 +26,8 @@ jobs:
       run: sudo apt update
     - name: install gtk2 glew
       run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev libssl-dev libcurl4-openssl-dev gettext
-    - name: build deps & slicer
-      run: ./BuildLinux.sh -bdgs
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - name: build tar & appimage
-      working-directory: ./build
-      run: src/BuildLinuxImage.sh -i
+    - name: build deps & slicer, tar & appimage
+      run: ./BuildLinux.sh -bdgsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_ubuntu_gtk3.yml

@@ -19,9 +19,6 @@ jobs:
       uses: jwlawson/[email protected]
       with:
         cmake-version: '3.16.x'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
     - name: update clock
@@ -30,14 +27,8 @@ jobs:
       run: sudo apt update
     - name: install gtk3 glew
       run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext
-    - name: build deps & slicer
-      run: ./BuildLinux.sh -ds
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - name: build tar & appimage
-      working-directory: ./build
-      run: src/BuildLinuxImage.sh -i
+    - name: build deps & slicer, tar & appimage
+      run: ./BuildLinux.sh -dsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_ubuntu_gtk3_debug.yml

@@ -18,9 +18,6 @@ jobs:
       uses: jwlawson/[email protected]
       with:
         cmake-version: '3.16.x'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
     - name: update clock
@@ -29,14 +26,8 @@ jobs:
       run: sudo apt update
     - name: install gtk3 glew
       run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev libssl-dev libcurl4-openssl-dev gettext
-    - name: build deps & slicer
-      run: ./BuildLinux.sh -bds
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - name: build tar & appimage
-      working-directory: ./build
-      run: src/BuildLinuxImage.sh -i
+    - name: build deps & slicer, tar & appimage
+      run: ./BuildLinux.sh -bdsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_ubuntu_gtk3_rc.yml

@@ -20,9 +20,6 @@ jobs:
       uses: jwlawson/[email protected]
       with:
         cmake-version: '3.16.x'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
     - name: update clock
@@ -31,14 +28,8 @@ jobs:
       run: sudo apt update
     - name: install gtk3 glew
       run: sudo apt install libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev gettext
-    - name: build deps & slicer
-      run: ./BuildLinux.sh -ds
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - name: build tar & appimage
-      working-directory: ./build
-      run: src/BuildLinuxImage.sh -i
+    - name: build deps & slicer, tar & appimage
+      run: ./BuildLinux.sh -dsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_ubuntu_rc.yml

@@ -18,9 +18,6 @@ jobs:
       uses: jwlawson/[email protected]
       with:
         cmake-version: '3.16.x'
-    - name: update submodule profiles
-      working-directory: ./resources/profiles
-      run: git submodule update --init
     - name: change date in version
       run: sed -i "s/+UNKNOWN//" version.inc
     - name: update clock
@@ -29,14 +26,8 @@ jobs:
       run: sudo apt update
     - name: install gtk2 glew
       run: sudo apt install libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev gettext
-    - name: build deps & slicer
-      run: ./BuildLinux.sh -dgs
-    - name: make .pot
-      working-directory: ./build
-      run: make gettext_make_pot
-    - name: build tar & appimage
-      working-directory: ./build
-      run: src/BuildLinuxImage.sh -i
+    - name: build deps & slicer, tar & appimage
+      run: ./BuildLinux.sh -dgsi
     - name: Upload artifact
       uses: actions/[email protected]
       with:

.github/workflows/ccpp_win.yml

@@ -25,7 +25,7 @@ jobs:
     - name: copy deps
       working-directory: ./deps/destdir
       shell: powershell
-      run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_25/deps_win.zip", "deps_win.zip")'
+      run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_27/deps_win.zip", "deps_win.zip")'
     - name: unzip deps
       working-directory: ./deps/destdir
       shell: cmd

.github/workflows/ccpp_win_debug.yml

@@ -20,7 +20,7 @@ jobs:
     - name: copy deps
       working-directory: ./deps/destdir
       shell: powershell
-      run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_25/deps_win.zip", "deps_win.zip")'
+      run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_27/deps_win.zip", "deps_win.zip")'
     - name: unzip deps
       working-directory: ./deps/destdir
       shell: cmd

.github/workflows/ccpp_win_rc.yml

@@ -23,7 +23,7 @@ jobs:
     - name: copy deps
       working-directory: ./deps/destdir
       shell: powershell
-      run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_25/deps_win.zip", "deps_win.zip")'
+      run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/supermerill/SuperSlicer_deps/releases/download/deps_27/deps_win.zip", "deps_win.zip")'
     - name: unzip deps
       working-directory: ./deps/destdir
       shell: cmd

.gitignore

@@ -12,11 +12,13 @@ xs/MANIFEST.bak
 xs/assertlib*
 .init_bundle.ini
 .vs/*
-local-lib
 /src/TAGS
 /.vscode/
 build*
+build-linux/*
 deps/build*
-deps/deps-*
+deps/build-linux/*
 **/.DS_Store
-
+**/.idea/
+.pkg_cache
+CMakeUserPresets.json

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "src/ArcWelderLib"]
-	path = src/ArcWelderLib
-	url = https://github.com/FormerLurker/ArcWelderLib.git
 [submodule "resources/profiles"]
 	path = resources/profiles
 	url = https://github.com/slic3r/slic3r-profiles.git