diff --git a/src/mediaComp/models/Picture.py b/src/mediaComp/models/Picture.py index bda7540..5d766ed 100644 --- a/src/mediaComp/models/Picture.py +++ b/src/mediaComp/models/Picture.py @@ -205,7 +205,7 @@ def getBasicPixel(self, x, y): tuple of int the color of the pixel at position (x,y) as a tuple """ - return self.getPixel(x,y).getColor().getRGB() + return self.getPixelAt(x,y).getColor().getRGB() def setBasicPixel(self, x, y, rgb): """Sets the pixel at specified coordinates to a color based on rgb(tuple) @@ -218,7 +218,7 @@ def setBasicPixel(self, x, y, rgb): the color the pixel will be set to """ col = Color(rgb[0], rgb[1], rgb[2]) - self.getPixel(x,y).setColor(col) + self.getPixelAt(x,y).setColor(col) def getPixelAt(self, x, y): """Return the pixel at specified coordinates @@ -459,8 +459,8 @@ def copyInto(self, dest, upperLeftX, upperLeftY): srcHeight = self.getHeight() for x in range(0, srcWidth): for y in range(0, srcHeight): - srcPix = self.getPixel(x, y) - dstPix = dest.getPixel(x+upperLeftX, y+upperLeftY) + srcPix = self.getPixelAt(x, y) + dstPix = dest.getPixelAt(x+upperLeftX, y+upperLeftY) dstPix.setColor(srcPix.getColor()) return dest diff --git a/src/mediaComp/models/SoundExplorer.py b/src/mediaComp/models/SoundExplorer.py index 0d4bd58..a4067ae 100644 --- a/src/mediaComp/models/SoundExplorer.py +++ b/src/mediaComp/models/SoundExplorer.py @@ -115,7 +115,7 @@ def create_wave_form(self): try: sample_index = int(pixel * frames_per_pixel) if sample_index < sound.getLengthInFrames(): - sample_value = sound.getSampleValue(sample_index) + sample_value = sound.getSampleValueAt(sample_index) # Normalize the sample value to fit in the display y = (sample_height // 2) - (sample_value * (sample_height // 2) / max_value) # Clamp y to valid range