From e517253b5d76b3d4a0299c19e9187b633447f83a Mon Sep 17 00:00:00 2001
From: KubiV <kubiwan007@gmail.com>
Date: Mon, 2 Sep 2024 19:01:54 +0200
Subject: [PATCH] table contents loading fix

---
 .DS_Store                                     | Bin 10244 -> 10244 bytes
 .gitignore                                    |   0
 README.md                                     |   2 +-
 version2/.DS_Store                            | Bin 10244 -> 10244 bytes
 version2/pyinstaller/.DS_Store                | Bin 6148 -> 6148 bytes
 .../3D print Multi-color Molecules.spec       |  29 +++++++++++-------
 version2/src/Settings.json                    |   2 +-
 version2/src/main.py                          |  14 +++------
 version2/src/setup.py                         |  25 +++++++++++++++
 9 files changed, 49 insertions(+), 23 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 version2/src/setup.py

diff --git a/.DS_Store b/.DS_Store
index 4cba9eba283f8cade31cfcf1e7347be7091a7fdb..3f9b5f3bb5e06f124825d0252224748828aca57f 100644
GIT binary patch
delta 170
zcmZn(XbITxT_AQx6$1kU3xgg*IzuKyNp8N2OHxjL5>Sj|av|s8y^hBmQRP$c$`@o9
z1}Ep|76A1yaPul`4iOaMp8Q8pX!1Yd1a67yYGXqS9R(9hlgSGOq$f`iQkkqQE6XC~
hb}M+Yf~?5o2-z4G=^p|NAkOA9verzS*%bb<0|33!FGv6Y

delta 151
zcmZn(XbITxT_85gmw|zSg+Y%YogtH<Bsbs1B`GIA2`I*~&9H=b?}wv~sPZXz<qI+l
zgOl@f3xIkUxOp5lhX@LBPktj@%4uj}Y@nlHY-u)mp@98lC0SV(2Ejbd$<DF`%nZT>
Po43gZFl}a6_{$CeG219$

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index 53736fb..0372e9c 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@
 
 Use the pyinstaller command insiode the "pyinstaller" folder (cd `version2/pyinstaller`)
 
-macOS: `pyinstaller --onefile --add-data "Settings.json:." --windowed --name "3D print Multi-color Molecules" --icon=../../graphical/default_icon.icns --debug=all ../src/main.py`
+macOS: `pyinstaller --onefile --windowed --add-data "Settings.json:." --name "3D print Multi-color Molecules" --icon=../../graphical/default_icon.icns --debug=all --noconsole --exclude=PyQt6 --clean --noupx --strip --optimize=2 ../src/main.py` 
 
 Windows: `pyinstaller --onefile --add-data "Settings.json;." --windowed --name "3D print Multi-color Molecules" --icon=..\..\graphical\default_icon.ico --debug=all ..\src\main.py`
 
diff --git a/version2/.DS_Store b/version2/.DS_Store
index a2c1e52172b133f26f96f111fdd26ea9da4f78d0..c71666afc3030eefb8b79351dd72e85c93ecc77a 100644
GIT binary patch
delta 339
zcmZn(XbITxLUb~lWGRQSp@oiuiKWTpjUv*M=SiweJ})Ldd5;(`bEm|e$!EmWI8N=J
z$js+_%n`_u5lV4M%E?b+U|>KNmf|nSFbq!4&n*B-Ffc5>FgZ}%39I3o10=K=(XF(I
zVAlQ))W^(F%uvLToSW|gw`9ti#ja&e#~hJm5l+CAMR5o7fz5hSH(58cDm-Sz>KZC~
GwFm&DcV>M6

delta 331
zcmZn(XbITxLUb~>OgX!Sp^k!)x#{GMB94=ni77ENNWYo9P)tfBH{Zo2DJMUPfq{WT
zruF~&qq~nfLM2kLO7ItC7zQWj=N15U0D;5g0C6Xv4P}#8inwp~lh9^lH#9c@T4px6
zK{6zQ(fS2Y5i>(ELlHwVvR#vRW;O5oaMTf57GWW#EQ+m+1)FuGZnAD>S9r)u7vB{E
E07TDbu>b%7

diff --git a/version2/pyinstaller/.DS_Store b/version2/pyinstaller/.DS_Store
index cf056bdc06ddcffac850defd49a52400e06f01bf..6a248a1d5dd70bc2d59e73c601e5baba1643ef2e 100644
GIT binary patch
delta 438
zcmZoMXfc=|#>B!ku~2NHo}w@h0|Nsi1A_nqLrPM4aY0f}e$wVb=9SFSAPH86B!*Ik
zOokkUBv5q6WEG}DZi(t@V?zra1rtk?$qSjJ8M`L$Ws<M&M%9&*ZWx@LpIZPFWnjub
zyaZJ?H{ZntWFb(LqwiLp8Nc%}M|2e_1XL7cAlb0ZWCBn>va`#Ai}G^v^U{H$KwmPj
zFr)yzQ_N5T^D9sck9QcmC*Ng~h!cx2UyiI9+1>Z<KfEjmaW~xX+<b(qvB@L5S^U7}
lU}jIo&Fmcf9KcushW&Tu$^0UY96;wX0WD?N93irX831R;Z5#jq

delta 262
zcmZoMXfc=|#>B)qu~2NHo}wrl0|Nsi1A_oVQh9MfQcivnkiT<d;c`YvkPHh$3PUDC
zF+&Nm?Bofog*=kg)rO`PhB^vH=BAT**rXY|C+}mCukS(Dl#^~4oSdIq02E_j(K+sd
zESH<_;sUjfWA2YL>yGX|>WC_zf>*vE1KI2gU@I6>HXmbiWZc-0&AgeNgP#NF%guru
W-<c=#i#T$CQ~*87vN=Lz4Kn}(r9u+`

diff --git a/version2/pyinstaller/3D print Multi-color Molecules.spec b/version2/pyinstaller/3D print Multi-color Molecules.spec
index 73503db..3545261 100644
--- a/version2/pyinstaller/3D print Multi-color Molecules.spec	
+++ b/version2/pyinstaller/3D print Multi-color Molecules.spec	
@@ -10,24 +10,22 @@ a = Analysis(
     hookspath=[],
     hooksconfig={},
     runtime_hooks=[],
-    excludes=[],
+    excludes=['PyQt6'],
     noarchive=True,
+    optimize=2,
 )
 pyz = PYZ(a.pure)
 
 exe = EXE(
     pyz,
     a.scripts,
-    a.binaries,
-    a.datas,
-    [('v', None, 'OPTION')],
-    name='3D Print Multi-Color Molecules',
+    [('O', None, 'OPTION'), ('O', None, 'OPTION'), ('v', None, 'OPTION')],
+    exclude_binaries=True,
+    name='3D print Multi-color Molecules',
     debug=True,
     bootloader_ignore_signals=False,
-    strip=False,
-    upx=True,
-    upx_exclude=[],
-    runtime_tmpdir=None,
+    strip=True,
+    upx=False,
     console=False,
     disable_windowed_traceback=False,
     argv_emulation=False,
@@ -36,9 +34,18 @@ exe = EXE(
     entitlements_file=None,
     icon=['../../graphical/default_icon.icns'],
 )
-app = BUNDLE(
+coll = COLLECT(
     exe,
-    name='3D Print Multi-Color Molecules.app',
+    a.binaries,
+    a.datas,
+    strip=True,
+    upx=False,
+    upx_exclude=[],
+    name='3D print Multi-color Molecules',
+)
+app = BUNDLE(
+    coll,
+    name='3D print Multi-color Molecules.app',
     icon='../../graphical/default_icon.icns',
     bundle_identifier=None,
 )
diff --git a/version2/src/Settings.json b/version2/src/Settings.json
index 49effa3..bf5754d 100644
--- a/version2/src/Settings.json
+++ b/version2/src/Settings.json
@@ -1,5 +1,5 @@
 {
-    "large_c_chain_protection": 100,
+    "large_c_chain_protection": 20,
     "resolution_limit": 8,
     "radius_factor": 70
 }
\ No newline at end of file
diff --git a/version2/src/main.py b/version2/src/main.py
index a2db682..93fd534 100644
--- a/version2/src/main.py
+++ b/version2/src/main.py
@@ -207,23 +207,17 @@ def download_and_display_image(self, image_url):
             image_data = BytesIO(response.content)
             pixmap = QPixmap()
             pixmap.loadFromData(image_data.getvalue())
-
-            # Display the image
-            #self.image_label.setPixmap(pixmap)
-            self.set_image(pixmap)
+            pixmap = pixmap.scaled(self.main_window.image_label.width(), self.main_window.image_label.height(), Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            self.main_window.image_label.setPixmap(pixmap)
         else:
             self.show_error("Error", "Can not load the image") 
 
-    def set_image(self, image_path):
-        pixmap = QPixmap(image_path)
-        pixmap = pixmap.scaled(self.main_window.image_label.width(), self.main_window.image_label.height(), Qt.KeepAspectRatio, Qt.SmoothTransformation)
-        self.main_window.image_label.setPixmap(pixmap)
-
     def set_table_info(self, first_item, second_item, third_item):
         # Update the labels with the fetched data
         self.main_window.table.setItem(0, 1, QTableWidgetItem(first_item))
         self.main_window.table.setItem(1, 1, QTableWidgetItem(second_item))
         self.main_window.table.setItem(2, 1, QTableWidgetItem(third_item))
+        self.main_window.table.viewport().update()
 
     def show_error(self, title, message):
         error_box = QMessageBox()
@@ -311,7 +305,7 @@ def change_variable(self):
         # Write updated settings back to the JSON file
         with open(self.settings_file_path, 'w') as file:
             json.dump(self.settings, file, indent=4)
-
+            print("Variables changed")
 
     def keyPressEvent(self, event):
         if event.key() == Qt.Key_W and event.modifiers() & Qt.ControlModifier:
diff --git a/version2/src/setup.py b/version2/src/setup.py
new file mode 100644
index 0000000..5e59bba
--- /dev/null
+++ b/version2/src/setup.py
@@ -0,0 +1,25 @@
+"""
+This is a setup.py script generated by py2applet
+
+Usage:
+    python setup.py py2app
+"""
+
+from setuptools import setup
+import sys
+
+sys.setrecursionlimit(2000)
+print(sys.getrecursionlimit())
+
+APP = ['main.py']
+DATA_FILES = ["Settings.json"]
+OPTIONS = {
+    'argv_emulation': True
+}
+
+setup(
+    app=APP,
+    data_files=DATA_FILES,
+    options={'py2app': OPTIONS},
+    setup_requires=['py2app'],
+)