nichts wichtiges

.gitignore

@@ -14,3 +14,6 @@ TinnitusAnalyse/MeinTinnitus.wav
 *.pyc
 TinnitusAnalyse/.idea/dictionaries/Julian.xml
 *.csv
+TinnitusAnalyse/.idea/workspace.xml
+TinnitusAnalyse/.idea/workspace.xml
+TinnitusAnalyse/__pycache__/SoundGenerator.cpython-35.pyc

TinnitusAnalyse/.idea/workspace.xml

@@ -2,10 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="5b3f2136-e422-4072-84be-e86e40fa2d55" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/dictionaries/Julian.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dictionaries/Julian.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/SoundGenerator.py" beforeDir="false" afterPath="$PROJECT_DIR$/SoundGenerator.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/TinnitusAnalyse_GUI.py" beforeDir="false" afterPath="$PROJECT_DIR$/TinnitusAnalyse_GUI.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/TinnitusDaten.csv" beforeDir="false" afterPath="$PROJECT_DIR$/TinnitusDaten.csv" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,11 +14,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/TinnitusAnalyse_GUI.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+            <state relative-caret-position="398">
+              <caret line="299" lean-forward="true" selection-start-line="299" selection-end-line="299" />
               <folding>
                 <element signature="e#0#117#0" expanded="true" />
               </folding>
@@ -31,17 +29,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/tkinter/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="874">
+            <state relative-caret-position="26435">
               <caret line="1557" selection-start-line="1557" selection-end-line="1557" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/SoundGenerator.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="729">
-              <caret line="96" column="24" lean-forward="true" selection-start-line="96" selection-start-column="24" selection-end-line="96" selection-end-column="24" />
+            <state relative-caret-position="254">
+              <caret line="75" column="20" selection-start-line="75" selection-start-column="20" selection-end-line="75" selection-end-column="20" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
               </folding>
@@ -49,6 +47,18 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../../../DigitalFilter.py">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="61">
+              <caret line="16" selection-start-line="16" selection-end-line="16" />
+              <folding>
+                <element signature="e#0#47#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/site-packages/matplotlib/axes/_base.py">
           <provider selected="true" editor-type-id="text-editor">
@@ -111,8 +121,9 @@
         <option value="$PROJECT_DIR$/DigitalFilter1.py" />
         <option value="$PROJECT_DIR$/Noise Experiment.py" />
         <option value="$PROJECT_DIR$/DigitalFilter.py" />
-        <option value="$PROJECT_DIR$/SoundGenerator.py" />
         <option value="$PROJECT_DIR$/TinnitusAnalyse_GUI.py" />
+        <option value="$PROJECT_DIR$/../../../DigitalFilter.py" />
+        <option value="$PROJECT_DIR$/SoundGenerator.py" />
       </list>
     </option>
   </component>
@@ -153,7 +164,7 @@
     </option>
   </component>
   <component name="RunManager" selected="Python.TinnitusAnalyse_GUI">
-    <configuration name="DigitalFilter" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="DigitalFilter (1)" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="TinnitusAnalyse" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -161,11 +172,11 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/../../.." />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/DigitalFilter.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/../../../DigitalFilter.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -174,7 +185,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="DigitalFilter1" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="DigitalFilter" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="TinnitusAnalyse" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -186,7 +197,7 @@
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/DigitalFilter1.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/DigitalFilter.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -261,10 +272,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Python.TinnitusAnalyse_GUI" />
+        <item itemvalue="Python.DigitalFilter (1)" />
         <item itemvalue="Python.SoundGenerator" />
         <item itemvalue="Python.DigitalFilter" />
         <item itemvalue="Python.Noise Experiment" />
-        <item itemvalue="Python.DigitalFilter1" />
       </list>
     </recent_temporary>
   </component>
@@ -331,6 +342,13 @@
     <entry file="file://$PROJECT_DIR$/DigitalFilter1.py" />
     <entry file="file://$PROJECT_DIR$/Noise Experiment.py" />
     <entry file="file://$PROJECT_DIR$/DigitalFilter.py" />
+    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/tkinter/__init__.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="26435">
+          <caret line="1557" selection-start-line="1557" selection-end-line="1557" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/site-packages/matplotlib/axes/_base.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="3349">
@@ -345,29 +363,32 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/tkinter/__init__.py">
+    <entry file="file://$PROJECT_DIR$/../../../DigitalFilter.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="874">
-          <caret line="1557" selection-start-line="1557" selection-end-line="1557" />
+        <state relative-caret-position="61">
+          <caret line="16" selection-start-line="16" selection-end-line="16" />
+          <folding>
+            <element signature="e#0#47#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/SoundGenerator.py">
+    <entry file="file://$PROJECT_DIR$/TinnitusAnalyse_GUI.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="729">
-          <caret line="96" column="24" lean-forward="true" selection-start-line="96" selection-start-column="24" selection-end-line="96" selection-end-column="24" />
+        <state relative-caret-position="398">
+          <caret line="299" lean-forward="true" selection-start-line="299" selection-end-line="299" />
           <folding>
-            <element signature="e#0#11#0" expanded="true" />
+            <element signature="e#0#117#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/TinnitusAnalyse_GUI.py">
+    <entry file="file://$PROJECT_DIR$/SoundGenerator.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="155" lean-forward="true" selection-start-line="155" selection-end-line="155" />
+        <state relative-caret-position="254">
+          <caret line="75" column="20" selection-start-line="75" selection-start-column="20" selection-end-line="75" selection-end-column="20" />
           <folding>
-            <element signature="e#0#117#0" expanded="true" />
+            <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>

TinnitusAnalyse/SoundGenerator.py

@@ -1,7 +1,7 @@
 import math
 import wave  # bearbeiten von .wav-Dateien
 import struct
-import sounddevice as sd  # zum abspielen des audio-arrays
+import sounddevice as sd
 import numpy as np
 import sys  # für Fehlermeldungen
 
@@ -73,7 +73,7 @@ class Sound:
         # zuerst muss ein Array mit Audiodaten gefüllt werden
         audio = []
         freq = self.tinnitus.linksFrequenz
-        dauer_ms = 10000.0  # 10 Sekunden
+        dauer_ms = 1000.0  # 10 Sekunden
         amp = self.tinnitus.linksLautstaerke
         rauschen = self.tinnitus.linksRauschenLautstaerke
 

TinnitusAnalyse/TinnitusDaten.csv

@@ -1,10 +1,10 @@
-Vorname;asdad
-Nachname;sada
-linke Frequenz;0.0
-linke Lautstärke;0.0
+Vorname;asd
+Nachname;asda
+linke Frequenz;770.0
+linke Lautstärke;0.01
 linkes Rauschen;0.0
-rechte Frequenz;0.0
-rechte Lautstärke;0.0
+rechte Frequenz;1410.0
+rechte Lautstärke;0.03
 rechtes Rauschen;0.0
-Kommentar;
+Kommentar;asd