Adding key to interpreter feedback

napulen · May 27, 2020 · e4410de · e4410de
1 parent a55a85f
commit e4410de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/harmalysis/__main__.py b/harmalysis/__main__.py
@@ -20,7 +20,6 @@
 import harmalysis.parsers.chordlabel
 import harmalysis.classes.pitch_class
 import lark.exceptions
-import sys
 
 test_strings = [
     'C:viio65',
@@ -29,9 +28,10 @@
 ]
 
 if __name__ == '__main__':
+    main_key = 'C major'
     while True:
         try:
-            query = input('> ')
+            query = input(f'({main_key})  > ')
         except EOFError:
             break
         try:
@@ -40,12 +40,12 @@
         except lark.exceptions.UnexpectedCharacters:
             print('Invalid entry. Try again.')
             continue
-        print('\tMain key: ' + str(roman.main_key))
-        print('\tSecondary key: ' + str(roman.secondary_key))
+        print('\tCurrent key: ' + str(roman.main_key))
+        print('\tTonicized key: ' + str(roman.secondary_key))
         print('\tIntervallic construction: ' + str(roman.chord))
         print('\tInversion: ' + str(roman.chord.inversion))
         print('\tChord label: ' + chordlabel)
         print('\tDefault function: ' + roman.chord.default_function)
-        print('\tContextual function: ' + roman.chord.contextual_function)
-
+        # print('\tContextual function: ' + roman.chord.contextual_function)
+        main_key = roman.main_key
 
diff --git a/harmalysis/__version__.py b/harmalysis/__version__.py
@@ -16,6 +16,6 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 '''
 
-VERSION = (0, 6, 2)
+VERSION = (0, 6, 3)
 
 __version__ = '.'.join(map(str, VERSION))