drap 0.0.3.post7__py3-none-any.whl → 0.0.3.post9__py3-none-any.whl

drap/qt_adjust.py

@@ -2,7 +2,9 @@
 import os
 from PyQt5.QtCore import QLibraryInfo, QCoreApplication
 
-def fix_qt_plugin_paths(prefer_platform: str | None = None) -> None:
+from typing import Optional
+
+def fix_qt_plugin_paths(prefer_platform: Optional[str] = None) -> None:
 
     os.environ.pop("QT_QPA_PLATFORM_PLUGIN_PATH", None)
     os.environ.pop("QT_PLUGIN_PATH", None)

drap/utils.py

@@ -59,7 +59,7 @@ class ImageCropper(QMainWindow):
         print("teste")
         
         
-        self.setWindowTitle('Analysis droplet parameters.')
+        self.setWindowTitle('Analysis Droplet Parameters')
         self.setGeometry(100, 100, 1200, 600)
 
         # Criar um widget central e configurar o layout
@@ -91,7 +91,7 @@ class ImageCropper(QMainWindow):
         
 
         # Create a button to crop the image
-        self.crop_button = QPushButton('Cut Image', self)
+        self.crop_button = QPushButton('Crop Image', self)
         self.controls_layout.addWidget(self.crop_button)
         self.crop_button.clicked.connect(self.crop_image)
 
@@ -179,12 +179,12 @@ class ImageCropper(QMainWindow):
 
 
         #Create a button to choose the directory and upload an image
-        self.load_directory_button = QPushButton('Concatene edf files samples and background ', self)
+        self.load_directory_button = QPushButton('Match files from samples and background', self)
         self.controls_layout.addWidget(self.load_directory_button)
         self.load_directory_button.clicked.connect(self.contate_sort_images_edf_size_drop)
     
         # Checkbox para opção extra
-        self.check_option = QCheckBox("Print PDF with images", self)
+        self.check_option = QCheckBox("Print a PDF with images", self)
         self.check_option.setChecked(False)  # desmarcado por padrão
         self.controls_layout.addWidget(self.check_option)
         
@@ -215,11 +215,13 @@ class ImageCropper(QMainWindow):
             QMessageBox.warning(self, 'Warning', 'No video selected.')
             return
         
-        self.file_path = os.path.normpath(self.file_path)
-        self.file_path = QFileInfo(self.file_path).fileName();
-        self.file_path = Path(self.file_path);
-        self.file_path = self.file_path.resolve();
-        self.file_path = os.path.normpath(self.file_path);
+        self.file_path = os.path.normpath(str(Path(self.file_path).expanduser().resolve()))
+        
+        # self.file_path = os.path.normpath(self.file_path)
+        # self.file_path = QFileInfo(self.file_path).fileName();
+        # self.file_path = Path(self.file_path);
+        # self.file_path = self.file_path.resolve();
+        # self.file_path = os.path.normpath(self.file_path);
             
         video = cv2.VideoCapture(self.file_path);
         
@@ -376,7 +378,7 @@ class ImageCropper(QMainWindow):
         save_path = Path(save_path);
         save_path = save_path.resolve();
         save_path = os.path.normpath(save_path);
-        save_path = os.path.join(save_path, 'image_cuted.png');
+        save_path = os.path.join(save_path, 'image_croped.png');
         save_path = os.path.normpath(save_path);
         os.makedirs(os.path.dirname(save_path), exist_ok=True)
         if save_path:
@@ -459,7 +461,7 @@ class ImageCropper(QMainWindow):
         save_path = Path(save_path);
         save_path = save_path.resolve();
         save_path = os.path.normpath(save_path);
-        save_path = os.path.join(save_path, 'data_image_cuted.txt');
+        save_path = os.path.join(save_path, 'data_image_croped.txt');
         os.makedirs(os.path.dirname(save_path), exist_ok=True)
         if save_path:
             with open(save_path, 'w') as file:
@@ -1549,7 +1551,7 @@ def save_data_edf(data_in, output_file, option):
 
     file_op = open(output_file, "w", encoding='utf-8');
 
-    if option == 0: file_op.write("Frame, dropDX(mm), dropDY(mm), surface(mm^2), Volume(\u03bcL),RelativeConcentration(%), date, time(s), time(min)\n")
+    if option == 0: file_op.write("Frame, dropDX(mm), dropDY(mm), surface(mm^2), RelativeConcentration(%), date, time(s)\n")
     else: file_op.write("Frame, date, time(s) \n")
 
     for i_data in data_in:

{drap-0.0.3.post7.dist-info → drap-0.0.3.post9.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: drap
-Version: 0.0.3.post7
+Version: 0.0.3.post9
 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
 Project-URL: Homepage, https://test.pypi.org/project/DrAP/
 Project-URL: Source, https://test.pypi.org/project/DrAP/
 Keywords: saxs,x-ray,edf,opencv,pyqt5,droplet
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: opencv-python-headless>=4.9
@@ -34,16 +34,16 @@ The graphical user interface provides:
 
 Install:
 
-python -m venv venv
+    python -m venv venv
 
-source venv/bin/activate
+    source venv/bin/activate
 
-pip install drap
+    pip install drap
 
 Use:
 
-drap -o 1 (Gui interface)
+    drap -o 1 (Gui interface)
 
-drap -o 2 (Terminal interface)
+    drap -o 2 (Terminal interface)
 
-drap -o 3  (Automatic file: name_videos.dat)
+    drap -o 3  (Automatic file: name_videos.dat)

drap-0.0.3.post9.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=7zw5aVwP7svwHMLl9Vj5N9zqwmVrv61S3ipjRJLNoAk,907
+drap/terminal_interface.py,sha256=vCnobMdtxKvCUaFsu0fWmChd65a-Osn41LdMtSdMdO4,2201
+drap/utils.py,sha256=-vUtbswvbBbEScvs-tnYzUhQvI4M22sDwXTvzxJAiII,66888
+drap-0.0.3.post9.dist-info/licenses/LICENSE,sha256=iHcEhVN-5ifqXsDa1Ny38sIBS7SJ9-eYJQRtHiJ3QU0,1098
+drap-0.0.3.post9.dist-info/METADATA,sha256=1TotPhZgS7SWpVT_eVzWSP4J_rCHoUZfayFwAdy0dbk,1392
+drap-0.0.3.post9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+drap-0.0.3.post9.dist-info/entry_points.txt,sha256=8AnGrT_RVCkh26SYRqjRTbstT4BMuOO68qRFqPfPr8M,69
+drap-0.0.3.post9.dist-info/top_level.txt,sha256=jYMnBoijRdvPMYoMlILxlRNbSdKUX3_uwMa7DLRE4zE,5
+drap-0.0.3.post9.dist-info/RECORD,,

drap-0.0.3.post7.dist-info/RECORD

@@ -1,13 +0,0 @@
-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=K4lqMC7aZ8RlcA65BIVtftRoZWY9OVrAQQP-IHN2f_E,875
-drap/terminal_interface.py,sha256=vCnobMdtxKvCUaFsu0fWmChd65a-Osn41LdMtSdMdO4,2201
-drap/utils.py,sha256=5IIjrGB4MBR2FX6Gdh7rCYJOZpGSFn8eTj0g3yPaHxU,66804
-drap-0.0.3.post7.dist-info/licenses/LICENSE,sha256=iHcEhVN-5ifqXsDa1Ny38sIBS7SJ9-eYJQRtHiJ3QU0,1098
-drap-0.0.3.post7.dist-info/METADATA,sha256=1RABw2n4uyrNMlQr-GkTaxlHzQHPCYqGquu5F1BQdTg,1367
-drap-0.0.3.post7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-drap-0.0.3.post7.dist-info/entry_points.txt,sha256=8AnGrT_RVCkh26SYRqjRTbstT4BMuOO68qRFqPfPr8M,69
-drap-0.0.3.post7.dist-info/top_level.txt,sha256=jYMnBoijRdvPMYoMlILxlRNbSdKUX3_uwMa7DLRE4zE,5
-drap-0.0.3.post7.dist-info/RECORD,,