Compare commits

...

5 Commits

2 changed files with 30 additions and 28 deletions

View File

@ -19,7 +19,7 @@
# ============================================================================== # # ============================================================================== #
from os import path import os
import pandas as pd import pandas as pd
from PyQt5.QtWidgets import (QWidget, QVBoxLayout, QDialog, QTabWidget, QGridLayout, QScrollArea, from PyQt5.QtWidgets import (QWidget, QVBoxLayout, QDialog, QTabWidget, QGridLayout, QScrollArea,
QFileDialog, QMessageBox, QLabel) QFileDialog, QMessageBox, QLabel)
@ -60,11 +60,11 @@ class CalibrationConstantKt(QDialog):
filename = QFileDialog.getOpenFileNames(self, "Calibration file", "", "Calibration file (*.xlsx)", filename = QFileDialog.getOpenFileNames(self, "Calibration file", "", "Calibration file (*.xlsx)",
options=QFileDialog.DontUseNativeDialog) options=QFileDialog.DontUseNativeDialog)
print(filename) print(filename)
dir_name = path.dirname(filename[0][0]) dir_name = os.path.dirname(filename[0][0])
file_name = path.basename(filename[0][0]) file_name = os.path.basename(filename[0][0])
print(f"dir name : {dir_name} & file name : {file_name}") print(f"dir name : {dir_name} & file name : {file_name}")
self.data_ABS = pd.read_excel(dir_name + "/" + file_name) self.data_ABS = pd.read_excel(os.path.join(dir_name, file_name))
self.lineEdit_file.setText(file_name) self.lineEdit_file.setText(file_name)
@ -111,4 +111,3 @@ class CalibrationConstantKt(QDialog):
eval("self.label_kt_" + str(x) + "_ABS_" + str(t_index) + ".setStyleSheet('border: 1px solid black;')") eval("self.label_kt_" + str(x) + "_ABS_" + str(t_index) + ".setStyleSheet('border: 1px solid black;')")
eval("self.gridLayout_tab_" + str(t_index) + ".addWidget(self.label_kt_" + str(x) + "_ABS_" + str(t_index) + eval("self.gridLayout_tab_" + str(t_index) + ".addWidget(self.label_kt_" + str(x) + "_ABS_" + str(t_index) +
", " + str(x+1) + ", 1, 1, 1, Qt.AlignCenter)") ", " + str(x+1) + ", 1, 1, 1, Qt.AlignCenter)")

View File

@ -3,7 +3,9 @@
AcouSed for **Acou**stic Backscattering for Concentration of Suspended **Sed**iments in Rivers is a software developped by INRAE, in collaboation with CNR. AcouSed for **Acou**stic Backscattering for Concentration of Suspended **Sed**iments in Rivers is a software developped by INRAE, in collaboation with CNR.
<p> <p>
<img src="logos/AcouSed.png" align="center" width=20% height=20% > <a href="https://riverhydraulics.riverly.inrae.fr/outils/logiciels-pour-la-mesure/acoused">
<img src="logos/AcouSed.png" align="center" width=200px>
</a>
</p> </p>
It is divided in six tabs: It is divided in six tabs:
@ -17,7 +19,7 @@ It is divided in six tabs:
### Standalone software ### Standalone software
AcouSed can be launched with python installation. An executable is available on [River Hydraulics](https://riverhydraulics.riverly.inrae.fr/outils/logiciels-pour-la-mesure/acoused) teams website. AcouSed can be launched with python installation. An executable is available on [River Hydraulics](https://riverhydraulics.riverly.inrae.fr/outils/logiciels-pour-la-mesure/acoused) teams website.
The user needs to download the folder "acoused-packaging" including : The user needs to download the folder "acoused-packaging" including :
- icons and logos folder - icons and logos folder
- _internal folder (python packages) - _internal folder (python packages)
@ -25,7 +27,8 @@ The user needs to download the folder "acoused-packaging" including :
- calibration constant file - calibration constant file
- documentation - documentation
Acoused.exe file must be launched from this folder. Acoused.exe file must be launched from this folder.
Test data can be dowloaded from the [INRAE nextcloud](https://nextcloud.inrae.fr/s/3zZdieztrx7nwYa) Test data can be dowloaded from the [INRAE nextcloud](https://nextcloud.inrae.fr/s/3zZdieztrx7nwYa)
### Python environment ### Python environment
@ -40,7 +43,7 @@ Acoused.
You can use Pypi to get correct software environment and run the You can use Pypi to get correct software environment and run the
program. program.
```shell ```bat
python -m venv env python -m venv env
env\Scripts\activate.bat env\Scripts\activate.bat
python -m pip install -U -r ..\virtualenv\requirements.txt python -m pip install -U -r ..\virtualenv\requirements.txt
@ -91,42 +94,42 @@ If you have any questions or suggestions, please contact us to celine.berni@inra
## Acknowledgment ## Acknowledgment
This study was conducted within the [Rhône Sediment Observatory](https://observatoire-sediments-rhone.fr/) (OSR), a multi-partner research program funded through the Plan Rhône by the European Regional Development Fund (ERDF), Agence de lEau RMC, CNR, EDF and three regional councils (Auvergne-Rhône-Alpes, PACA and Occitanie). This study was conducted within the [Rhône Sediment Observatory](https://observatoire-sediments-rhone.fr/) (OSR), a multi-partner research program funded through the Plan Rhône by the European Regional Development Fund (ERDF), Agence de lEau RMC, CNR, EDF and three regional councils (Auvergne-Rhône-Alpes, PACA and Occitanie).
<p> <p>
<img src="logos/OSR.png" align="center" width=10% height=10% > <a href="https://observatoire-sediments-rhone.fr/">
<img src="logos/OSR.png" align="center" width=200px>
</a>
</p> </p>
## Industrial partners ## Industrial partners
[CNR](https://www.cnr.tm.fr/)
<p> <p>
<img src="logos/CNR.png" align="center" width=10% height=10% > <a href="https://www.cnr.tm.fr/">
</p> <img src="logos/CNR.png" align="center" width=200px>
</a>
[UBERTONE](https://ubertone.com/) <a href="https://ubertone.com/">
<img src="logos/Ubertone.jpg" align="center" width=200px>
</a>
<p> <a href="https://www.edf.fr/hydraulique-isere-drome">
<img src="logos/Ubertone.jpeg" align="center" width=10% height=10% > <img src="logos/EDF.png" align="center" width=200px>
</p> </a>
[EDF](https://www.edf.fr/hydraulique-isere-drome)
<p>
<img src="logos/EDF.png" align="center" width=10% height=10% >
</p> </p>
## License ## License
<p>
<a href="https://www.inrae.fr/">
<img src="logos/BlocMarque-INRAE-Inter.jpg" align="center" width=200px>
</a>
</p>
AcouSed AcouSed
Copyright (C) 2024-2025 - INRAE Copyright (C) 2024-2025 - INRAE
<p>
<img src="logos/BlocMarque-INRAE-Inter.jpg" align="center" width=10% height=10% >
</p>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.