drap 0.0.3.post2__py3-none-any.whl → 0.0.3.post6__py3-none-any.whl

drap/gui.py

@@ -1,5 +1,13 @@
 from .utils import *
 
+from PyQt5.QtWidgets import QApplication
+import sys
+
+from .qt_adjust import fix_qt_plugin_paths, assert_not_using_cv2_plugins
+# from .safe_cv import im
+
+
+
 from PyQt5.QtWidgets import QApplication, QMainWindow, QLabel, QVBoxLayout, QWidget, QPushButton, QFileDialog, QMessageBox, QLineEdit, QHBoxLayout, QGroupBox, QCheckBox
 from PyQt5.QtGui import QPixmap, QPainter, QPen, QImage, QMouseEvent, QColor
 from PyQt5.QtCore import Qt, QPoint, QRect, QFileInfo
@@ -16,7 +24,7 @@ from reportlab.lib.pagesizes import A4, letter
 from reportlab.platypus import SimpleDocTemplate, Table, TableStyle
 from reportlab.pdfgen import canvas
 from reportlab.lib import colors
-import os
+
 import copy
 import time as timelib
 from datetime import datetime
@@ -25,7 +33,6 @@ import numpy as np
 import sys
 import re
 import argparse
-import cv2
 import matplotlib
 
 import matplotlib.pyplot as plt
@@ -38,8 +45,24 @@ matplotlib.use('Agg')
 
 def main_gui():
     
+    
+    fix_qt_plugin_paths(prefer_platform=None)
+    
     app = QApplication(sys.argv)
     cropper = ImageCropper()
+    
+    
+    
+    try:
+        assert_not_using_cv2_plugins()
+    except RuntimeError as e:
+        # Mostre uma mensagem amigável e encerre
+        from PyQt5.QtWidgets import QMessageBox
+        QMessageBox.critical(None, "Qt plugin error", str(e))
+        sys.exit(1)
+    
+    
+    
     sys.exit(app.exec_())
 
 

drap/qt_adjust.py

@@ -0,0 +1,41 @@
+
+import os
+from PyQt5.QtCore import QLibraryInfo, QCoreApplication
+
+def fix_qt_plugin_paths(prefer_platform: str | None = None) -> None:
+    """
+    Força o Qt a usar os plugins do PyQt5 e remove caminhos herdados do cv2.
+    Chame isso ANTES de criar o QApplication.
+    """
+    # 1) Limpa variáveis que podem apontar para plugins errados
+    os.environ.pop("QT_QPA_PLATFORM_PLUGIN_PATH", None)
+    os.environ.pop("QT_PLUGIN_PATH", None)
+
+    # 2) Define plataforma padrão (ajude o usuário)
+    if prefer_platform:
+        os.environ["QT_QPA_PLATFORM"] = prefer_platform
+    else:
+        os.environ.setdefault("QT_QPA_PLATFORM", "xcb")  # ou 'wayland' conforme seu público
+
+    # 3) Remove library paths que contenham plugins do cv2
+    for p in list(QCoreApplication.libraryPaths()):
+        if "cv2/qt/plugins" in p:
+            QCoreApplication.removeLibraryPath(p)
+
+    # 4) Garante o diretório oficial de plugins do PyQt5
+    pyqt_plugins = QLibraryInfo.location(QLibraryInfo.PluginsPath)
+    QCoreApplication.addLibraryPath(pyqt_plugins)
+
+def assert_not_using_cv2_plugins() -> None:
+    """
+    Se ainda houver um caminho de plugins do cv2, emite uma dica amigável.
+    """
+    for p in QCoreApplication.libraryPaths():
+        if "cv2/qt/plugins" in p:
+            raise RuntimeError(
+                "Qt ainda está apontando para plugins do OpenCV (cv2/qt/plugins). "
+                "Instale apenas 'opencv-python-headless' e remova resíduos:\n"
+                "  pip uninstall -y opencv-python opencv-contrib-python\n"
+                "  # apague a pasta 'cv2' do seu site-packages deste venv\n"
+                "  pip install --no-cache-dir opencv-python-headless PyQt5\n"
+            )

{drap-0.0.3.post2.dist-info → drap-0.0.3.post6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drap
-Version: 0.0.3.post2
+Version: 0.0.3.post6
 Summary: Tool for analyzing droplet size and concentration using video and EDF images
 Author-email: "Gabriel Braga Marques Teobaldo, Oleg Prymak, Natalie Wolff,  Matthias Epple, Marco Aurélio Brizzotti Andrade, Cássio Alves and Cristiano Luis Pinto de Oliveira" <alves.casssio@gmail.com>
 License: MIT
@@ -10,13 +10,13 @@ Keywords: saxs,x-ray,edf,opencv,pyqt5,droplet
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: opencv-python
+Requires-Dist: opencv-python-headless>=4.9
+Requires-Dist: PyQt5>=5.15
 Requires-Dist: numpy
 Requires-Dist: matplotlib
 Requires-Dist: fabio
 Requires-Dist: pillow
 Requires-Dist: reportlab
-Requires-Dist: PyQt5
 Dynamic: license-file
 
 # Droplet Computer program

drap-0.0.3.post6.dist-info/RECORD

@@ -0,0 +1,13 @@
+drap/__init__.py,sha256=RF05F-NDoYmyOjQ1EgdKSfsx2tTYCheTpL0AYrFmdI0,47
+drap/automation.py,sha256=TvCwFeYgrKxc50kaQkV2ETGyD1RhxCCX5oCGMWo2JjU,1294
+drap/gui.py,sha256=LzBBQwFiF6IcOZfBkWB6wnKsBKD-v-6Un8VoJMG7eKU,1553
+drap/main.py,sha256=IBMQp932Qd6aBSeWCoQH2MQhMtmEU_yZKOsUO_U9Wmk,1201
+drap/qt_adjust.py,sha256=hERZBrPBQvEi-Us5JN1bQwlmjwhnPcxjnoZsPe8V7_A,1710
+drap/terminal_interface.py,sha256=vCnobMdtxKvCUaFsu0fWmChd65a-Osn41LdMtSdMdO4,2201
+drap/utils.py,sha256=5IIjrGB4MBR2FX6Gdh7rCYJOZpGSFn8eTj0g3yPaHxU,66804
+drap-0.0.3.post6.dist-info/licenses/LICENSE,sha256=iHcEhVN-5ifqXsDa1Ny38sIBS7SJ9-eYJQRtHiJ3QU0,1098
+drap-0.0.3.post6.dist-info/METADATA,sha256=Z346eZqUd7njt0OefmE7T0EExVkexy7efCuBtges8f8,1367
+drap-0.0.3.post6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+drap-0.0.3.post6.dist-info/entry_points.txt,sha256=8AnGrT_RVCkh26SYRqjRTbstT4BMuOO68qRFqPfPr8M,69
+drap-0.0.3.post6.dist-info/top_level.txt,sha256=jYMnBoijRdvPMYoMlILxlRNbSdKUX3_uwMa7DLRE4zE,5
+drap-0.0.3.post6.dist-info/RECORD,,

{drap-0.0.3.post2.dist-info → drap-0.0.3.post6.dist-info}/entry_points.txt

@@ -1,3 +1,3 @@
 [console_scripts]
 drap = drap.main:main
-drap-gui = drap.gui:gui
+drap-gui = drap.gui:main_gui

drap-0.0.3.post2.dist-info/RECORD

@@ -1,12 +0,0 @@
-drap/__init__.py,sha256=RF05F-NDoYmyOjQ1EgdKSfsx2tTYCheTpL0AYrFmdI0,47
-drap/automation.py,sha256=TvCwFeYgrKxc50kaQkV2ETGyD1RhxCCX5oCGMWo2JjU,1294
-drap/gui.py,sha256=M4XRdqAzABBQjVIDnR3OCs387GzGo5HUIWB0ErWiZo8,1074
-drap/main.py,sha256=IBMQp932Qd6aBSeWCoQH2MQhMtmEU_yZKOsUO_U9Wmk,1201
-drap/terminal_interface.py,sha256=vCnobMdtxKvCUaFsu0fWmChd65a-Osn41LdMtSdMdO4,2201
-drap/utils.py,sha256=5IIjrGB4MBR2FX6Gdh7rCYJOZpGSFn8eTj0g3yPaHxU,66804
-drap-0.0.3.post2.dist-info/licenses/LICENSE,sha256=iHcEhVN-5ifqXsDa1Ny38sIBS7SJ9-eYJQRtHiJ3QU0,1098
-drap-0.0.3.post2.dist-info/METADATA,sha256=7_3SQ7D4wduYIlz8Ci4VG3dN43BtiEVUF_1i8jNMIgk,1347
-drap-0.0.3.post2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-drap-0.0.3.post2.dist-info/entry_points.txt,sha256=r_V3SXtWJt15QVs78jIxD7JJ41KgRtOhigYZFDcMEus,64
-drap-0.0.3.post2.dist-info/top_level.txt,sha256=jYMnBoijRdvPMYoMlILxlRNbSdKUX3_uwMa7DLRE4zE,5
-drap-0.0.3.post2.dist-info/RECORD,,