diff options
-rwxr-xr-x | Classes/HJMOHandler.m | 19 | ||||
-rw-r--r-- | PicCast.xcodeproj/handler.mode1v3 | 71 | ||||
-rw-r--r-- | PicCast.xcodeproj/handler.pbxuser | 128 |
3 files changed, 130 insertions, 88 deletions
diff --git a/Classes/HJMOHandler.m b/Classes/HJMOHandler.m index ab95766..0c24464 100755 --- a/Classes/HJMOHandler.m +++ b/Classes/HJMOHandler.m @@ -345,18 +345,13 @@ self.urlConn = nil; // manipulate file here - if ([users count] > 0) { - HJManagedImageV *user = [users objectAtIndex:0]; - if (self.squareCropped) { - NSLog(@"here"); - HJMOFileCache* fileCache = objManager.fileCache; - NSString* loadingFile = [[fileCache loadingFilePathForOid:oid] retain]; - UIImage *cropped = [[[UIImage imageWithContentsOfFile:loadingFile] imageByScalingAndCroppingForSize:CGSizeMake(100,100)] retain]; - //[[[UIImageView alloc] initWithImage:[moHandler.moData imageByScalingAndCroppingForSize:CGSizeMake(100,100)]] autorelease]; - [UIImagePNGRepresentation(cropped) writeToFile:loadingFile atomically:YES]; - NSLog(@"after"); - } - } + if (self.squareCropped) { + HJMOFileCache* fileCache = objManager.fileCache; + NSString* loadingFile = [[fileCache loadingFilePathForOid:oid] retain]; + UIImage *cropped = [[[UIImage imageWithContentsOfFile:loadingFile] imageByScalingAndCroppingForSize:CGSizeMake(100,100)] retain]; + //[[[UIImageView alloc] initWithImage:[moHandler.moData imageByScalingAndCroppingForSize:CGSizeMake(100,100)]] autorelease]; + [UIImagePNGRepresentation(cropped) writeToFile:loadingFile atomically:YES]; + } NSString* readyFilename = [self.objManager.fileCache loadingFinishedForOid:oid]; if (readyFilename==nil) { diff --git a/PicCast.xcodeproj/handler.mode1v3 b/PicCast.xcodeproj/handler.mode1v3 index a7484ae..4cdeec7 100644 --- a/PicCast.xcodeproj/handler.mode1v3 +++ b/PicCast.xcodeproj/handler.mode1v3 @@ -197,48 +197,7 @@ <key>Notifications</key> <array/> <key>OpenEditors</key> - <array> - <dict> - <key>Content</key> - <dict> - <key>PBXProjectModuleGUID</key> - <string>4EBFCB2F1360E198005AC5CC</string> - <key>PBXProjectModuleLabel</key> - <string>PicCast-Info.plist</string> - <key>PBXSplitModuleInNavigatorKey</key> - <dict> - <key>Split0</key> - <dict> - <key>PBXProjectModuleGUID</key> - <string>4EBFCB301360E198005AC5CC</string> - <key>PBXProjectModuleLabel</key> - <string>PicCast-Info.plist</string> - <key>_historyCapacity</key> - <integer>0</integer> - <key>bookmark</key> - <string>4E8CFE281361FF1B00B810C6</string> - <key>history</key> - <array> - <string>4E067D401361413100D43FE0</string> - </array> - </dict> - <key>SplitCount</key> - <string>1</string> - </dict> - <key>StatusBarVisibility</key> - <true/> - </dict> - <key>Geometry</key> - <dict> - <key>Frame</key> - <string>{{0, 20}, {1196, 453}}</string> - <key>PBXModuleWindowStatusBarHidden2</key> - <false/> - <key>RubberWindowFrame</key> - <string>210 62 1196 494 0 0 1440 878 </string> - </dict> - </dict> - </array> + <array/> <key>PerspectiveWidths</key> <array> <integer>-1</integer> @@ -315,7 +274,8 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>44</integer> + <integer>26</integer> + <integer>16</integer> <integer>3</integer> <integer>0</integer> </array> @@ -340,7 +300,7 @@ <real>282</real> </array> <key>RubberWindowFrame</key> - <string>51 128 1268 726 0 0 1440 878 </string> + <string>51 129 1268 726 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -358,7 +318,7 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>TopicsViewController.m</string> + <string>HJMOHandler.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -366,11 +326,11 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>TopicsViewController.m</string> + <string>HJMOHandler.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>4E8CFE271361FF1B00B810C6</string> + <string>4E8CFE361362046700B810C6</string> <key>history</key> <array> <string>4E68286F1359595F001EB808</string> @@ -402,13 +362,13 @@ <string>4E8CFDB71361F7C900B810C6</string> <string>4E8CFDB81361F7C900B810C6</string> <string>4E8CFDB91361F7C900B810C6</string> - <string>4E8CFE091361FCE200B810C6</string> - <string>4E8CFE0A1361FCE200B810C6</string> <string>4E8CFE0B1361FCE200B810C6</string> <string>4E8CFE0C1361FCE200B810C6</string> <string>4E8CFE211361FEEF00B810C6</string> - <string>4E8CFE251361FF1B00B810C6</string> - <string>4E8CFE261361FF1B00B810C6</string> + <string>4E8CFE2B1361FFAD00B810C6</string> + <string>4E8CFE301362039700B810C6</string> + <string>4E8CFE311362039700B810C6</string> + <string>4E8CFE351362046700B810C6</string> </array> </dict> <key>SplitCount</key> @@ -422,7 +382,7 @@ <key>Frame</key> <string>{{0, 0}, {964, 680}}</string> <key>RubberWindowFrame</key> - <string>51 128 1268 726 0 0 1440 878 </string> + <string>51 129 1268 726 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -442,7 +402,7 @@ <key>Frame</key> <string>{{0, 685}, {964, 0}}</string> <key>RubberWindowFrame</key> - <string>51 128 1268 726 0 0 1440 878 </string> + <string>51 129 1268 726 0 0 1440 878 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -606,18 +566,17 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>4E8CFE1F1361FE6A00B810C6</string> + <string>4E8CFE371362046700B810C6</string> <string>1C530D57069F1CE1000CFCEE</string> <string>4E8CFDA41361EF4E00B810C6</string> <string>4E8CFDA51361EF4E00B810C6</string> <string>1CD10A99069EF8BA00B06720</string> <string>4E6827C813593DE3001EB808</string> - <string>4EBFCB2F1360E198005AC5CC</string> <string>1C78EAAD065D492600B07095</string> <string>/Users/handler/Documents/code/xCode/PicCast/PicCast.xcodeproj</string> </array> <key>WindowString</key> - <string>51 128 1268 726 0 0 1440 878 </string> + <string>51 129 1268 726 0 0 1440 878 </string> <key>WindowToolsV3</key> <array> <dict> diff --git a/PicCast.xcodeproj/handler.pbxuser b/PicCast.xcodeproj/handler.pbxuser index 9db9273..e833cbd 100644 --- a/PicCast.xcodeproj/handler.pbxuser +++ b/PicCast.xcodeproj/handler.pbxuser @@ -35,7 +35,7 @@ }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Release; + activeBuildConfigurationName = Debug; activeExecutable = 4E6827B513593BAE001EB808 /* acidcow */; activeSDKPreference = iphonesimulator4.2; activeTarget = 1D6058900D05DD3D006BFB54 /* PicCast */; @@ -177,6 +177,14 @@ 4E8CFE261361FF1B00B810C6 /* PBXTextBookmark */ = 4E8CFE261361FF1B00B810C6 /* PBXTextBookmark */; 4E8CFE271361FF1B00B810C6 /* PBXTextBookmark */ = 4E8CFE271361FF1B00B810C6 /* PBXTextBookmark */; 4E8CFE281361FF1B00B810C6 /* PlistBookmark */ = 4E8CFE281361FF1B00B810C6 /* PlistBookmark */; + 4E8CFE2B1361FFAD00B810C6 /* PBXTextBookmark */ = 4E8CFE2B1361FFAD00B810C6 /* PBXTextBookmark */; + 4E8CFE2C1361FFAD00B810C6 /* PBXTextBookmark */ = 4E8CFE2C1361FFAD00B810C6 /* PBXTextBookmark */; + 4E8CFE2D1361FFAD00B810C6 /* PBXTextBookmark */ = 4E8CFE2D1361FFAD00B810C6 /* PBXTextBookmark */; + 4E8CFE301362039700B810C6 /* PBXTextBookmark */ = 4E8CFE301362039700B810C6 /* PBXTextBookmark */; + 4E8CFE311362039700B810C6 /* PBXTextBookmark */ = 4E8CFE311362039700B810C6 /* PBXTextBookmark */; + 4E8CFE321362039700B810C6 /* PBXTextBookmark */ = 4E8CFE321362039700B810C6 /* PBXTextBookmark */; + 4E8CFE351362046700B810C6 /* PBXTextBookmark */ = 4E8CFE351362046700B810C6 /* PBXTextBookmark */; + 4E8CFE361362046700B810C6 /* PBXTextBookmark */ = 4E8CFE361362046700B810C6 /* PBXTextBookmark */; 4EA96020135CF43B009243EE = 4EA96020135CF43B009243EE /* PBXTextBookmark */; 4EA96027135CF455009243EE = 4EA96027135CF455009243EE /* PBXTextBookmark */; 4EBFCB481360E786005AC5CC = 4EBFCB481360E786005AC5CC /* PBXTextBookmark */; @@ -644,7 +652,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 352"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 651; vrLoc = 474; @@ -654,7 +662,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 346"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1220; vrLoc = 9320; @@ -686,7 +694,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 347"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1199; vrLoc = 9320; @@ -718,7 +726,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 349"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1201; vrLoc = 9604; @@ -740,7 +748,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 348"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1139; vrLoc = 9571; @@ -762,7 +770,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 350"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1199; vrLoc = 9281; @@ -784,7 +792,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 355"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1349; vrLoc = 9281; @@ -806,7 +814,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 355"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1211; vrLoc = 9517; @@ -828,7 +836,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 348"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1212; vrLoc = 9636; @@ -850,7 +858,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 347"; rLen = 0; - rLoc = 10347; + rLoc = 10217; rType = 0; vrLen = 1261; vrLoc = 9517; @@ -872,7 +880,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 357"; rLen = 0; - rLoc = 10343; + rLoc = 10216; rType = 0; vrLen = 1199; vrLoc = 9571; @@ -953,7 +961,7 @@ fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; name = "HJMOHandler.m: 350"; rLen = 0; - rLoc = 9804; + rLoc = 9714; rType = 0; vrLen = 1211; vrLoc = 9226; @@ -1178,6 +1186,86 @@ rLen = 0; rLoc = 9223372036854775807; }; + 4E8CFE2B1361FFAD00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 194"; + rLen = 0; + rLoc = 6949; + rType = 0; + vrLen = 2028; + vrLoc = 6045; + }; + 4E8CFE2C1361FFAD00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB14135A194A00BEF0B7 /* HJObjManager.m */; + name = "HJObjManager.m: 11"; + rLen = 0; + rLoc = 334; + rType = 0; + vrLen = 2044; + vrLoc = 2820; + }; + 4E8CFE2D1361FFAD00B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB14135A194A00BEF0B7 /* HJObjManager.m */; + name = "HJObjManager.m: 11"; + rLen = 0; + rLoc = 334; + rType = 0; + vrLen = 2119; + vrLoc = 2820; + }; + 4E8CFE301362039700B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB14135A194A00BEF0B7 /* HJObjManager.m */; + name = "HJObjManager.m: 11"; + rLen = 0; + rLoc = 334; + rType = 0; + vrLen = 1687; + vrLoc = 1837; + }; + 4E8CFE311362039700B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB1C135A194A00BEF0B7 /* HJMOHandler.h */; + name = "HJMOHandler.h: 40"; + rLen = 0; + rLoc = 1217; + rType = 0; + vrLen = 1537; + vrLoc = 397; + }; + 4E8CFE321362039700B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; + name = "HJMOHandler.m: 341"; + rLen = 0; + rLoc = 9544; + rType = 0; + vrLen = 1833; + vrLoc = 9307; + }; + 4E8CFE351362046700B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; + name = "HJMOHandler.m: 341"; + rLen = 0; + rLoc = 9544; + rType = 0; + vrLen = 1778; + vrLoc = 9308; + }; + 4E8CFE361362046700B810C6 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */; + name = "HJMOHandler.m: 354"; + rLen = 0; + rLoc = 10212; + rType = 0; + vrLen = 1894; + vrLoc = 9307; + }; 4EA95FC9135CE8C3009243EE /* PhotoSource.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {903, 2509}}"; @@ -1380,9 +1468,9 @@ }; 4ED6DB14135A194A00BEF0B7 /* HJObjManager.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {929, 1950}}"; + sepNavIntBoundsRect = "{{0, 0}, {929, 1976}}"; sepNavSelRange = "{334, 0}"; - sepNavVisRange = "{2820, 2044}"; + sepNavVisRange = "{1837, 1687}"; }; }; 4ED6DB15135A194A00BEF0B7 /* HJObjManager.h */ = { @@ -1415,16 +1503,16 @@ }; 4ED6DB1B135A194A00BEF0B7 /* HJMOHandler.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1076, 5200}}"; - sepNavSelRange = "{9804, 0}"; - sepNavVisRange = "{9226, 1239}"; + sepNavIntBoundsRect = "{{0, 0}, {1048, 4888}}"; + sepNavSelRange = "{10212, 0}"; + sepNavVisRange = "{9307, 1894}"; }; }; 4ED6DB1C135A194A00BEF0B7 /* HJMOHandler.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 988}}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 949}}"; sepNavSelRange = "{1217, 0}"; - sepNavVisRange = "{742, 938}"; + sepNavVisRange = "{397, 1537}"; }; }; 4ED6DB21135A194A00BEF0B7 /* HJManagedImageVDelegate.h */ = { |