diff Syncopation models/music_objects.py @ 13:bc3b9022ebc4

Merged.

--- a/Syncopation models/music_objects.py	Fri Apr 03 16:38:32 2015 +0100
+++ b/Syncopation models/music_objects.py	Fri Apr 03 17:05:31 2015 +0100
@@ -1,12 +1,12 @@
 
-from BasicFuncs import ceiling
+from basic_functions import ceiling, string_to_sequence
 
-import ParameterSetter 
-import RhythmParser 
+import parameter_setter 
+import rhythm_parser 
 
 class Note():
 	def __init__(self, argstring):
-		intlist = map(int,argstring.split(','))
+		intlist = string_to_sequence(argstring)
 		self.startTime = intlist[0]
 		self.duration = intlist[1]
 		self.velocity = intlist[2]
@@ -20,7 +20,7 @@
 			self.string_to_note_sequence(noteSequenceString)
 
 	def string_to_note_sequence(self, noteSequenceString):
-		noteSequenceString = RhythmParser.discardSpaces(noteSequenceString)
+		noteSequenceString = rhythm_parser.discardSpaces(noteSequenceString)
 		# try:
 			# Turning "(1,2,3),(4,5,6),(7,8,9)" into ["1,2,3","4,5,6,","7,8,9"]
 		listStrings = noteSequenceString[1:-1].split("),(")
@@ -30,13 +30,14 @@
 	# toString()
 
 
-print NoteSequence("(1,2,3),(4,5,6),(7,8,9)")
-# class VelocitySequence(list):
-# 	def __init__(self, noteSequenceString=None):
-# 		if noteSequenceString!=None:
-# 			self.string_to_note_sequence(noteSequenceString)
+#print NoteSequence("(1,2,3),(4,5,6),(7,8,9)")
+class VelocitySequence(list):
+	def __init__(self, noteSequenceString=None):
+		if noteSequenceString!=None:
+			self.string_to_note_sequence(noteSequenceString)
 
-# 	def string_to_note_sequence(string):
+	def string_to_note_sequence(self,inputString):
+		self.extend(string_to_sequence(inputString))
 
 
 class BarList(list):
@@ -48,6 +49,8 @@
 
 
 
+
+
 class Bar:
 
 	def __init__(self, rhythmSequence, timeSignature, ticksPerQuarter=None, qpmTempo=None, nextBar=None, prevBar=None):
@@ -66,12 +69,12 @@
 
 	def get_note_sequence(self):
 		#if self.noteSequence==None:
-		#	self.noteSequence = velocitySequenceToNotes(self.velocitySequence)
+		#	self.noteSequence = velocity_sequence_to_notes(self.velocitySequence)
 		return self.noteSequence
 
 	def get_velocity_sequence(self):
 		if self.velocitySequence==None:
-			self.velocitySequence = noteSequenceToVelocities(self.velocitySequence)
+			self.velocitySequence = note_sequence_to_velocities(self.velocitySequence)
 		return self.velocitySequence
 
 	def get_binary_sequence(self):