Changeset 998

Timestamp:

Oct 13, 2006, 1:34:15 AM (16 years ago)

Author:

livings124

Message:

Pieces View is working again

Location:

trunk/macosx

Files:

• English.lproj/InfoWindow.nib/keyedobjects.nib (modified) (previous)
• PiecesView.m (modified) (9 diffs)
• Torrent.h (modified) (1 diff)
• Torrent.m (modified) (1 diff)

trunk/macosx/PiecesView.m

@@ -203 +203 @@
     NSImage * image = [fImageView image];
 
-    int8_t * pieces = malloc(fNumPieces);
+    int8_t * pieces;
+    float * piecesPercent;
     
     BOOL showAvailablity = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"];
-    
     if (showAvailablity)
+    {   
+        pieces = malloc(fNumPieces);
         [fTorrent getAvailability: pieces size: fNumPieces];
+    }
     else
-        [fTorrent getAmountFinished: pieces size: fNumPieces];
+    {   
+        piecesPercent = malloc(fNumPieces * sizeof(float));
+        [fTorrent getAmountFinished: piecesPercent size: fNumPieces];
+        
+        int i;
+        for (i = 0; i < fNumPieces; i++)
+            NSLog(@"%f", piecesPercent[i]);
+    }
     
     int i, j, piece, index = -1;
+    float piecePercent;
     NSPoint point;
     NSRect rect = NSMakeRect(0, 0, fWidth, fWidth);
@@ -229 +240 @@
             
             pieceImage = nil;
-            piece = pieces[index];
             
             if (showAvailablity)
             {
+                piece = pieces[index];
                 if (piece < 0)
                 {
@@ -282 +293 @@
             else
             {
+                piecePercent = piecesPercent[index];
                 /*if (i==0)
                     pieceImage = fBlue1Piece;
@@ -293 +305 @@
                     pieceImage = fBluePiece;
                 
-                else */if (piece <= 0)
+                else */if (piecePercent <= 0.0)
                 {
                     if (first || fPieces[index] != 0)
@@ -301 +313 @@
                     }
                 }
-                else if (piece < 25)
+                else if (piecePercent < 0.25)
                 {
                     if (first || fPieces[index] != 1)
@@ -309 +321 @@
                     }
                 }
-                else if (piece < 50)
+                else if (piecePercent < 0.50)
                 {
                     if (first || fPieces[index] != 2)
@@ -317 +329 @@
                     }
                 }
-                else if (piece < 75)
+                else if (piecePercent < 0.75)
                 {
                     if (first || fPieces[index] != 3)
@@ -325 +337 @@
                     }
                 }
-                else if (piece < 100)
+                else if (piecePercent < 1.0)
                 {
                     if (first || fPieces[index] != 4)
@@ -364 +376 @@
     }
     
-    free(pieces);
-}
+    if (showAvailablity)
+        free(pieces);
+    else
+        free(piecesPercent);
+}
+
+/*- (void) toggleView: (id) sender
+{
+    NSUserDefaults * defaults = [NSUserDefaults standardUserDefaults];
+    [defaults setBool: ![defaults boolForKey: @"PiecesViewShowAvailability"]
+                forKey: @"PiecesViewShowAvailability"];
+    
+    [self updateView: YES];
+}*/
 
 @end

trunk/macosx/Torrent.h

@@ -67 +67 @@
 
 - (void) getAvailability: (int8_t *) tab size: (int) size;
-- (void) getAmountFinished: (int8_t *) tab size: (int) size;
+- (void) getAmountFinished: (float *) tab size: (int) size;
 
 - (void)            update;

trunk/macosx/Torrent.m

@@ -165 +165 @@
 }
 
-- (void) getAmountFinished: (int8_t *) tab size: (int) size
+- (void) getAmountFinished: (float *) tab size: (int) size
 {
     tr_torrentAmountFinished(fHandle, tab, size);