Fix when float values are passed to progress bars (#133)

* Fix when float values could be passed to progress bars * Update the mac xcode version
blurstudio · Jul 3, 2024 · 1ef9e34 · 1ef9e34
1 parent 2f69e42
commit 1ef9e34
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -106,7 +106,7 @@ jobs:
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '13.4'
+          xcode-version: '15.4'
 
       - name: Configure CMake
         run: |
@@ -243,11 +243,11 @@ jobs:
       - name: Get Correct Python Version
         uses: actions/setup-python@v5
         with:
-          python-version: '3.7' 
+          python-version: '3.9' 
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
-          xcode-version: '13.4'
+          xcode-version: '15.4'
 
       - name: Configure CMake
         run: |

diff --git a/simplexui/commands/unsubdivide.py b/simplexui/commands/unsubdivide.py
@@ -191,6 +191,12 @@ def partitionIslands(faces, neigh, pBar=None):
     allVerts = set(chain.from_iterable(faces))
     islands = []
     count = float(len(allVerts))
+
+    if pBar is not None:
+        pBar.setValue(0)
+        pBar.setMaximum(count)
+        QApplication.processEvents()
+
     while allVerts:
         verts = set([allVerts.pop()])
         exclude = set()
@@ -200,7 +206,7 @@ def partitionIslands(faces, neigh, pBar=None):
         allVerts.difference_update(exclude)
 
         if pBar is not None:
-            pBar.setValue(100 * (count - len(allVerts)) / count)
+            pBar.setValue(count - len(allVerts))
             QApplication.processEvents()
 
     return islands
@@ -271,7 +277,7 @@ def getFaceCenterDel(faces, eNeigh, hints, pBar=None):
             vertToFaces.setdefault(f, []).append(i)
             vc.add(f)
 
-    count = float(len(vc))
+    count = len(vc)
     centers = set()
     midpoints = set()
     originals = set(hints)

diff --git a/simplexui/interface/mayaInterface.py b/simplexui/interface/mayaInterface.py
@@ -771,12 +771,13 @@ def getAllShapeVertices(self, shapes, pBar=None):
                 # find the longest name for displaying stuff
                 sns = "_" * max(list(map(len, [s.name for s in shapes])))
                 pBar.setLabelText("Getting Shape:\n{0}".format(sns))
+                pBar.setMaximum(len(shapes))
                 QApplication.processEvents()
 
             for i, shape in enumerate(shapes):
                 if pBar is not None:
                     pBar.setLabelText("Getting Shape:\n{0}".format(shape.name))
-                    pBar.setValue((100.0 * i) / len(shapes))
+                    pBar.setValue(i)
                     QApplication.processEvents()
 
                 cmds.setAttr(shape.thing, 1.0)