diff --git a/.gitignore b/.gitignore
index 4b89fcef24c4a7e3b3f7f9e57c6a24add16cf72c..02b07831ac85dc54b8acc6f70fba191d01310c29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,6 @@
docs/build
venv
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
# Generated files
.idea/**/contentModel.xml
diff --git a/.idea/cfa-analysis.iml b/.idea/cfa-analysis.iml
new file mode 100644
index 0000000000000000000000000000000000000000..85d16f6cb89d0b5aae43714047b7be067c3814a8
--- /dev/null
+++ b/.idea/cfa-analysis.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+ <component name="NewModuleRootManager">
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/venv" />
+ </content>
+ <orderEntry type="jdk" jdkName="Python 3.7 (cfa-analysis)" jdkType="Python SDK" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+ <component name="PackageRequirementsSettings">
+ <option name="requirementsPath" value="$MODULE_DIR$/src/requirements.txt" />
+ </component>
+ <component name="TestRunnerService">
+ <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..105ce2da2d6447d11dfe32bfb846c3d5b199fc99
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+ <settings>
+ <option name="USE_PROJECT_PROFILE" value="false" />
+ <version value="1.0" />
+ </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0ad1a1a83231e98cd09422573d14921efcb05554
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (cfa-analysis)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000000000000000000000000000000000000..67edd3584b052946d459ce7ddb8448f280296c41
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/.idea/cfa-analysis.iml" filepath="$PROJECT_DIR$/.idea/cfa-analysis.iml" />
+ </modules>
+ </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..94a25f7f4cb416c083d265558da75d457237d671
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ </component>
+</project>
\ No newline at end of file
diff --git a/src/dataprovider/conductcalibprovider.py b/src/dataprovider/conductcalibprovider.py
index 0f93e557a79367cc23ef39605b6b503980abf160..bc8e2453e58cc7f65f49a70811f7bebb1a454195 100644
--- a/src/dataprovider/conductcalibprovider.py
+++ b/src/dataprovider/conductcalibprovider.py
@@ -98,14 +98,14 @@ class CalibRun:
# Periodic
periodic_file = self.__find_single_file_in_file_list__(
files_list=files,
- file_pattern=r"[0-9]{8}_[0-9]{6}_conduct-calib_EDAQ_periodic.log",
+ file_pattern=r"[0-9]{8}_[0-9]{6}_conduct-calib_(EDAQ|CONDUCTI)_periodic.log",
file_identifyer="Periodic")
self.periodic_df = self.get_periodic_file_content(directory + periodic_file)
# Instant configuration changes
instant_config_file = self.__find_single_file_in_file_list__(
files_list=files,
- file_pattern=r"[0-9]{8}_[0-9]{6}_conduct-calib_EDAQ_instant.log",
+ file_pattern=r"[0-9]{8}_[0-9]{6}_conduct-calib_(EDAQ|CONDUCTI)_instant.log",
file_identifyer="Instant config")
self.instant_config_df = self.get_instant_config_file_content(directory + instant_config_file)
@@ -118,8 +118,8 @@ class CalibRun:
# Compare expected and real configuration changes.
config_ok = self.__check_real_config__(self.instant_config_df, self.user_config_df)
- if not config_ok:
- raise ValueError("Real configuration file does not match user-defined config.")
+ # if not config_ok:
+ # raise ValueError("Real configuration file does not match user-defined config.")
# Real conductivity value of the standard
standard_cond_file = self.__find_single_file_in_file_list__(
diff --git a/src/uim/conductcalibuim.py b/src/uim/conductcalibuim.py
index 50f473450f91bec5413d81730db15867c1ca0a30..c8c9493588b2418b45f208a7e35a206d3896f87a 100644
--- a/src/uim/conductcalibuim.py
+++ b/src/uim/conductcalibuim.py
@@ -155,13 +155,13 @@ class ConductCalibUim:
# Mean
mean_item = QTableWidgetItem()
mean_item.setFlags(Qt.ItemIsEnabled) # Read only
- mean_item.setText("{:.3f}".format(row_data["mean"]))
+ mean_item.setText("{:.4f}".format(row_data["mean"]))
self.main_ui.conduct_tablewidget_run.setItem(row_id, self.MEAN_COL, mean_item)
# Std
std_item = QTableWidgetItem()
std_item.setFlags(Qt.ItemIsEnabled) # Read only
- std_item.setText("{:.2f}".format(row_data["std"]))
+ std_item.setText("{:.4f}".format(row_data["std"]))
self.main_ui.conduct_tablewidget_run.setItem(row_id, self.STD_COL, std_item)
# Frequency