Minor fixes to paths

Molodos · Oct 26, 2023 · c356e6d · c356e6d
1 parent f85b00b
commit c356e6d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,6 @@
 [3.4.1]
 - Fixes to keep the plugin from throwing errors if no printer exists
+- Minor other fixes
 
 [3.4.0]
 - Added option for line width

diff --git a/tools/settings.py b/tools/settings.py
@@ -128,7 +128,7 @@ class SettingsManager:
 
     SETTINGS_KEY: str = "elegoo_neptune_thumbnails"
     STATISTICS_ID_KEY: str = "general/statistics_id"
-    PLUGIN_JSON_PATH: str = path.join(path.dirname(path.realpath(__file__)), "..", "plugin.json")
+    PLUGIN_JSON_PATH: str = path.abspath(path.join(path.dirname(path.realpath(__file__)), "..", "plugin.json"))
 
     _settings: Optional[Settings] = None
 

diff --git a/tools/thumbnail_generator.py b/tools/thumbnail_generator.py
@@ -49,11 +49,14 @@ class ThumbnailGenerator:
         "bg_thumbnail": QColor(48, 57, 79),
         "own_gray": QColor(200, 200, 200)
     }
-    BACKGROUND_OLD_PATH: str = path.join(path.dirname(path.realpath(__file__)), "..", "img", "bg_old.png")
-    BACKGROUND_NEW_PATH: str = path.join(path.dirname(path.realpath(__file__)), "..", "img", "bg_new.png")
-    FOREGROUND_IMAGE_PATH: str = path.join(path.dirname(path.realpath(__file__)), "..", "img", "benchy.png")
-    NO_FOREGROUND_IMAGE_PATH: str = path.join(path.dirname(path.realpath(__file__)), "..", "img", "cross.png")
-    THUMBNAIL_PREVIEW_PATH: str = path.join(path.dirname(path.realpath(__file__)), "..", "img", "thumbnail_preview.png")
+    BACKGROUND_OLD_PATH: str = path.abspath(path.join(path.dirname(path.realpath(__file__)), "..", "img", "bg_old.png"))
+    BACKGROUND_NEW_PATH: str = path.abspath(path.join(path.dirname(path.realpath(__file__)), "..", "img", "bg_new.png"))
+    FOREGROUND_IMAGE_PATH: str = path.abspath(
+        path.join(path.dirname(path.realpath(__file__)), "..", "img", "benchy.png"))
+    NO_FOREGROUND_IMAGE_PATH: str = path.abspath(
+        path.join(path.dirname(path.realpath(__file__)), "..", "img", "cross.png"))
+    THUMBNAIL_PREVIEW_PATH: str = path.abspath(
+        path.join(path.dirname(path.realpath(__file__)), "..", "img", "thumbnail_preview.png"))
     CURRENCY_PREFERENCE: str = "cura/currency"
 
     @classmethod
@@ -240,11 +243,11 @@ def _parse_thumbnail_new(cls, img: QImage, width: int, height: int, img_type: st
         """
         img_type = f";{img_type}:"
         if Platform.isOSX():
-            p_dll = CDLL(path.join(path.dirname(__file__), "..", "libs", "libColPic.dylib"))
+            p_dll = CDLL(path.abspath(path.join(path.dirname(__file__), "..", "libs", "libColPic.dylib")))
         elif Platform.isLinux():
-            p_dll = CDLL(path.join(path.dirname(__file__), "..", "libs", "libColPic.so"))
+            p_dll = CDLL(path.abspath(path.join(path.dirname(__file__), "..", "libs", "libColPic.so")))
         else:
-            p_dll = CDLL(path.join(path.dirname(__file__), "..", "libs", "ColPic_X64.dll"))
+            p_dll = CDLL(path.abspath(path.join(path.dirname(__file__), "..", "libs", "ColPic_X64.dll")))
 
         result = ""
         b_image = img.scaled(width, height, Qt.AspectRatioMode.KeepAspectRatio)