Merge pull request #14 from larus-breeze/easy_analysis_plots

Easy analysis plots
larus-breeze · Dec 21, 2024 · 524287e · 524287e
2 parents 21a45b7 + ade63ac
commit 524287e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/analysis/README_create_binary.md b/analysis/README_create_binary.md
@@ -5,7 +5,7 @@
   - Linux: ```source myvenv/bin/activate``` 
   - Windows: ```.\myvenv/Scripts/activate.ps1```
 - Install dependencies with ```pip install -r requirements.txt```
-- Create binary with pyinstaller analysis_plots.py
+- Create binary with pyinstaller larus_analyzer.py
 
 # Create updates sensor_data_analyzer binaries
 The files data_analyzer_commit_*_[linux|windos.exe] are binaries from the 

diff --git a/analysis/_internal/README.md b/analysis/_internal/README.md
@@ -0,0 +1,2 @@
+# Sensor data analyzer - binaries
+The files here are compiled versions of the ../sensor_data_analyzer/ for different platforms
diff --git a/analysis/data_analyzer_commit_6598331_linux → ...ternal/data_analyzer_commit_6598331_linux b/analysis/data_analyzer_commit_6598331_linux → ...ternal/data_analyzer_commit_6598331_linux
diff --git a/.../data_analyzer_commit_6598331_windows.exe → .../data_analyzer_commit_6598331_windows.exe b/.../data_analyzer_commit_6598331_windows.exe → .../data_analyzer_commit_6598331_windows.exe
diff --git a/analysis/analysis_plots.py → analysis/larus_analyzer.py b/analysis/analysis_plots.py → analysis/larus_analyzer.py
@@ -218,7 +218,7 @@ def export_csv(self):
         self.waitingWidget.setWindowTitle("Saving data")
 
         # Create a label with a message
-        label = QLabel("Please wait...")
+        label = QLabel("Please wait!\nthis will take \nsome minutes")
 
         dialog_layout = QVBoxLayout()
         dialog_layout.addWidget(label)

diff --git a/analysis/larus_to_df.py b/analysis/larus_to_df.py
@@ -48,9 +48,9 @@ def __init__(self, file):
                     raise Exception("There must be a {} file".format(eeprom_file_path))
 
                 if "linux" in sys.platform:
-                    subprocess.call(["{}/data_analyzer_commit_6598331_linux".format(os.getcwd()), file])
+                    subprocess.call(["{}/_internal/data_analyzer_commit_6598331_linux".format(os.getcwd()), file])
                 elif "win" in sys.platform:
-                    subprocess.call(["{}/data_analyzer_commit_6598331_windows.exe".format(os.getcwd()), file])
+                    subprocess.call(["{}/_internal/data_analyzer_commit_6598331_windows.exe".format(os.getcwd()), file])
                 else:
                     raise Exception("Platform not supported: {}".format(sys.platform))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Sensor data analyzer - binaries
		The files here are compiled versions of the ../sensor_data_analyzer/ for different platforms