Changeset 985 for trunk/macosx

Timestamp:

Oct 5, 2006, 9:21:30 PM (16 years ago)

Author:

livings124

Message:

Don't redraw the progress bar completely each time. The number of pieces for the bar is returned to the previous, larger value.

Location:

trunk/macosx

Files:

• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (7 diffs)

trunk/macosx/Torrent.h

@@ -53 +53 @@
     
     int fOrderValue;
+    
+    NSBitmapImageRep * fBitmap;
+    int8_t * fPieces;
 }
 

trunk/macosx/Torrent.m

@@ -28 +28 @@
 #define BAR_HEIGHT 12.0
 
+#define MAX_PIECES 324
+#define BLANK_PIECE -99
+
 @interface Torrent (Private)
 
@@ -139 +142 @@
         [fShortStatusString release];
         [fRemainingTimeString release];
+        
+        
+        [fBitmap release];
+        free(fPieces);
     }
     [super dealloc];
@@ -821 +828 @@
     fShortStatusString = [[NSMutableString alloc] initWithCapacity: 30];
     fRemainingTimeString = [[NSMutableString alloc] initWithCapacity: 30];
+    
+    //set up advanced bar
+    fBitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: nil
+        pixelsWide: MAX_PIECES pixelsHigh: BAR_HEIGHT bitsPerSample: 8 samplesPerPixel: 4 hasAlpha: YES
+        isPlanar: NO colorSpaceName: NSCalibratedRGBColorSpace bytesPerRow: 0 bitsPerPixel: 0];
+    
+    fPieces = malloc(MAX_PIECES);
+    int i;
+    for (i = 0; i < MAX_PIECES; i++)
+        fPieces[i] = BLANK_PIECE;
 
     [self update];
@@ -828 +845 @@
 - (NSImage *) advancedBar
 {
-    int width = 225; //amount of pixels/"pieces"
-    
-    NSBitmapImageRep * bitmap = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes: nil
-        pixelsWide: width pixelsHigh: BAR_HEIGHT bitsPerSample: 8 samplesPerPixel: 4 hasAlpha: YES
-        isPlanar: NO colorSpaceName: NSCalibratedRGBColorSpace bytesPerRow: 0 bitsPerPixel: 0];
-
     int h, w;
     uint32_t * p;
-    uint8_t * bitmapData = [bitmap bitmapData];
-    int bytesPerRow = [bitmap bytesPerRow];
-
-    int8_t * pieces = malloc(width);
-    [self getAvailability: pieces size: width];
+    uint8_t * bitmapData = [fBitmap bitmapData];
+    int bytesPerRow = [fBitmap bytesPerRow];
+
+    int8_t * pieces = malloc(MAX_PIECES);
+    [self getAvailability: pieces size: MAX_PIECES];
     int avail = 0;
-    for (w = 0; w < width; w++)
+    for (w = 0; w < MAX_PIECES; w++)
         if (pieces[w] != 0)
             avail++;
 
     //first two lines: dark blue to show progression, green to show available
-    int end = lrintf(floor([self progress] * width));
+    int end = [self progress] * MAX_PIECES;
     p = (uint32_t *) bitmapData;
 
@@ -860 +871 @@
         p[w + bytesPerRow / 4] = kGreen;
     }
-    for (; w < width; w++)
+    for (; w < MAX_PIECES; w++)
     {
         p[w] = kWhite;
@@ -868 +879 @@
     //lines 2 to 14: blue or grey depending on whether we have the piece or not
     uint32_t color;
-    for( w = 0; w < width; w++ )
-    {
+    BOOL change;
+    for (w = 0; w < MAX_PIECES; w++)
+    {
+        change = NO;
         if (pieces[w] < 0)
-            color = kGreen;
+        {
+            if (fPieces[w] != -1)
+            {
+                color = kGreen;
+                fPieces[w] = -1;
+                change = YES;
+            }
+        }
         else if (pieces[w] == 0)
-            color = kGray;
+        {
+            if (fPieces[w] != 0)
+            {
+                color = kGray;
+                fPieces[w] = 0;
+                change = YES;
+            }
+        }
         else if (pieces[w] == 1)
-            color = kBlue1;
+        {
+            if (fPieces[w] != 1)
+            {
+                color = kBlue1;
+                fPieces[w] = 1;
+                change = YES;
+            }
+        }
         else if (pieces[w] == 2)
-            color = kBlue2;
+        {
+            if (fPieces[w] != 2)
+            {
+                color = kBlue2;
+                fPieces[w] = 2;
+                change = YES;
+            }
+        }
         else
-            color = kBlue3;
-        
-        //point to pixel (w, 2) and draw "vertically"
-        p = (uint32_t *) ( bitmapData + 2 * bytesPerRow ) + w;
-        for( h = 2; h < BAR_HEIGHT; h++ )
         {
-            p[0] = color;
-            p = (uint32_t *) ( (uint8_t *) p + bytesPerRow );
+            if (fPieces[w] != 3)
+            {
+                color = kBlue3;
+                fPieces[w] = 3;
+                change = YES;
+            }
         }
+        
+        if (change)
+        {
+            //point to pixel (w, 2) and draw "vertically"
+            p = (uint32_t *)(bitmapData + 2 * bytesPerRow) + w;
+            for (h = 2; h < BAR_HEIGHT; h++)
+            {
+                p[0] = color;
+                p = (uint32_t *)((uint8_t *)p + bytesPerRow);
+            }
+        }
     }
 
@@ -893 +944 @@
     
     //actually draw image
-    NSImage * bar = [[NSImage alloc] initWithSize: [bitmap size]];
-    [bar addRepresentation: bitmap];
-    [bitmap release];
-    
+    NSImage * bar = [[NSImage alloc] initWithSize: [fBitmap size]];
+    [bar addRepresentation: fBitmap];
     [bar setScalesWhenResized: YES];