Misc.

Change float format for display.
Take old file format into account.
Ignore config check (for the moment).

.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

.idea/cfa-analysis.iml

+<?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

.idea/inspectionProfiles/profiles_settings.xml

+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file

.idea/misc.xml

+<?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

.idea/modules.xml

+<?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

.idea/vcs.xml

+<?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

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__(

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