Fix networkx detection, issue #443, and update readme to PR #442

shaise · Jan 15, 2025 · f294490 · f294490
1 parent f7d32c9
commit f294490
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -99,6 +99,8 @@ Starting from FreeCAD 0.17 it can be installed via the [Addon Manager](https://g
 * FreeCAD Forum announcement/discussion [thread](https://forum.freecadweb.org/viewtopic.php?f=3&t=60818) 
 
 #### Release notes:
+* V0.7.02 15 Jan 2025:  Fix thickness detection by [@alexneufeld][alexneufeld].  
+                      - Improve detection of missing networkx dependency
 * V0.7.01 13 Jan 2025:  New Unfolder compatibility with FC0.21 and LS3 by [@alexneufeld][alexneufeld] and [@Syres916][Syres916].  
 * V0.7.00 11 Jan 2025:  New SheetMetal Unfolder! by [@alexneufeld][alexneufeld].  
                       - Unfolder backward compatibility fixes by [@GS90][GS90].  

diff --git a/SheetMetalTools.py b/SheetMetalTools.py
@@ -26,6 +26,7 @@
 import math
 import os
 import re
+import importlib
 import FreeCAD
 import importDXF
 import importSVG
@@ -747,6 +748,9 @@ def smIsEqualAngle(ang1, ang2, p=5):
         result = True
     return result
 
+def smIsNetworkxAvailable():
+    spec = importlib.util.find_spec("networkx")
+    return spec is not None
 
 class SMLogger:
     @classmethod

diff --git a/SheetMetalUnfoldCmd.py b/SheetMetalUnfoldCmd.py
@@ -36,15 +36,16 @@
 
 translate = FreeCAD.Qt.translate
 
-try:
+if SheetMetalTools.smIsNetworkxAvailable():
     import SheetMetalNewUnfolder
     from SheetMetalNewUnfolder import BendAllowanceCalculator
     NewUnfolderAvailable = True
-except ImportError:
+else:
     NewUnfolderAvailable = False
     FreeCAD.Console.PrintWarning(
         translate( "SheetMetal", 
-            "Networkx dependency is missing or FreeCAD is too old. Reverting to old Unfolder\n"
+            "Networkx dependency is missing and required for the new Unfolder\n"
+            "Try uninstalling SheetMetal, refresh Addon Manager's cache, and reinstall\n"
         )
     )
 

diff --git a/package.xml b/package.xml
@@ -2,8 +2,8 @@
 <package format="1" xmlns="https://wiki.freecad.org/Package_Metadata">
   <name>SheetMetal Workbench</name>
   <description>A simple sheet metal tools workbench for FreeCAD.</description>
-  <version>0.7.01</version>
-  <date>2025-01-13</date>
+  <version>0.7.02</version>
+  <date>2025-01-15</date>
   <maintainer email="shaise@gmail.com">Shai Seger</maintainer>
   <license file="LICENSE">LGPL-2.1-or-later</license>
   <url type="repository" branch="master">https://github.com/shaise/FreeCAD_SheetMetal</url>