seyfferju74439
/
Tinnitus_Musik_Therapie_Projektarbeit_Repo
Watch 0
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Keine inhaltlichen nderungen

master
seyffejn 4 years ago
parent
5e00186874
commit
49857ef8e8
3 changed files with 35 additions and 34 deletions
Split View Show Diff Stats
  1. 26
    31
      TinnitusAnalyse/.idea/workspace.xml
  2. 3
    3
      TinnitusAnalyse/TinnitusAnalyse_GUI.py
  3. 6
    0
      TinnitusAnalyse/TinnitusDaten.csv

+ 26
- 31
TinnitusAnalyse/.idea/workspace.xml View File

@@ -2,12 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5b3f2136-e422-4072-84be-e86e40fa2d55" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/../.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/../.gitignore" afterDir="false" />
<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$/27130.png" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Headphones Icon.ico" beforeDir="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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,10 +13,10 @@
</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="97">
<state relative-caret-position="-1464">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<folding>
<element signature="e#0#117#0" expanded="true" />
@@ -33,17 +28,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="935">
<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="-1326">
<caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
<state relative-caret-position="1034">
<caret line="92" lean-forward="true" selection-start-line="92" selection-end-line="92" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
@@ -101,10 +96,10 @@
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="2971" />
<option name="y" value="-27" />
<option name="width" value="1113" />
<option name="height" value="769" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1696" />
<option name="height" value="1066" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
@@ -222,7 +217,7 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="2552" y="-8" width="1696" height="1026" extended-state="6" />
<frame x="-8" y="-8" width="2576" height="1416" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.18479118" />
@@ -230,7 +225,7 @@
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.29787233" />
<window_info anchor="bottom" id="Run" order="2" weight="0.20732658" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.39977604" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -268,36 +263,36 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/WriteToCSV.py" />
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/tkinter/ttk.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="9367">
<caret line="552" selection-start-line="552" selection-end-line="552" />
<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/tkinter/__init__.py">
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python35/Lib/tkinter/ttk.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="1557" selection-start-line="1557" selection-end-line="1557" />
<state relative-caret-position="9367">
<caret line="552" selection-start-line="552" selection-end-line="552" />
</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="-1326">
<caret line="18" column="36" lean-forward="true" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
<state relative-caret-position="-1464">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<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="97">
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
<state relative-caret-position="1034">
<caret line="92" lean-forward="true" selection-start-line="92" selection-end-line="92" />
<folding>
<element signature="e#0#117#0" expanded="true" />
<element signature="e#0#11#0" expanded="true" />
</folding>
</state>
</provider>

+ 3
- 3
TinnitusAnalyse/TinnitusAnalyse_GUI.py View File

@@ -15,8 +15,8 @@ def links_scale_lautstärke_change(self):


def links_scale_frequenz_change(self):
#tinnitus.linksFrequenz = float(linksScaleFrequenz.get())/1000 # scale liefert 20-20kHz, tinnitus.frequenz in Hz
print("Links Frequenz = ", linksFrequenz)
tinnitus.linksFrequenz = float(linksScaleFrequenz.get())*1000 # scale liefert 20-20kHz, tinnitus.frequenz in Hz
print("Links Frequenz = ", tinnitus.linksFrequenz/1000, "kHz")
sound.play()


@@ -95,7 +95,7 @@ def unten_button_ohren_synchro():

def unten_button_speichern_press():
print("button speichern pressed")
# Wenn man Speichern will bevor ein Name eingegeben wurde
# Wenn man Speichern will bevor ein Name eingegeben wurde kann man nicht speichern
if (not untenEntryVorname.get()) or (not untenEntryNachname.get()) or \
(untenEntryNachname == "Erst Namen..") or (untenEntryVorname == "..eintragen bitte"):
nachname.set("Erst Namen..")

+ 6
- 0
TinnitusAnalyse/TinnitusDaten.csv View File

@@ -0,0 +1,6 @@
linke Frequenz;1890.0
linke Lautstärke;0.18
linkes Rauschen;0
rechte Frequenz;600
rechte Lautstärke;0
rechtes Rauschen;0

Write Preview
Loading…
Cancel
Save