292 // we check if the file name has changed already |
292 // we check if the file name has changed already |
293 appUi->StartFileNameCheck(); |
293 appUi->StartFileNameCheck(); |
294 } |
294 } |
295 // Draw the current image - snapshot or thumbnail |
295 // Draw the current image - snapshot or thumbnail |
296 CWindowGc& gc = SystemGc(); |
296 CWindowGc& gc = SystemGc(); |
297 gc.SetFaded( EFalse ); |
|
298 |
|
299 gc.SetBrushColor( KRgbBlack ); |
|
300 gc.Clear(); |
|
301 |
|
302 const CFbsBitmap* snapshot = iController.SnapshotImage(); |
297 const CFbsBitmap* snapshot = iController.SnapshotImage(); |
303 TRect containerRect = Rect(); |
298 TRect containerRect = Rect(); |
304 |
299 |
|
300 TBool lateOperation = ( ECamCapturing == iController.CurrentOperation() |
|
301 || ECamCompleting == iController.CurrentOperation() ); |
|
302 |
|
303 if ( iView.Id().iUid != ECamViewIdVideoPostCapture && |
|
304 ( iController.ActiveCamera() != ECamActiveCameraSecondary || |
|
305 lateOperation ) ) |
|
306 { |
|
307 gc.SetFaded( EFalse ); |
|
308 gc.SetBrushColor( KRgbBlack ); |
|
309 gc.Clear( iProcessingTextLayout.TextRect() ); |
|
310 } |
|
311 |
305 // If snapshot contains a bitmap |
312 // If snapshot contains a bitmap |
306 if ( snapshot ) |
313 if ( snapshot ) |
307 { |
314 { |
308 OstTrace0( CAMERAAPP_PERFORMANCE, CCAMPOSTCAPTURECONTAINER_DRAW, "e_CAM_APP_SNAPSHOT_DRAW 1" ); //CCORAPP_SNAPSHOT_DRAW_START |
315 OstTrace0( CAMERAAPP_PERFORMANCE, CCAMPOSTCAPTURECONTAINER_DRAW, "e_CAM_APP_SNAPSHOT_DRAW 1" ); //CCORAPP_SNAPSHOT_DRAW_START |
309 |
316 |
339 gc.BitBlt( vfRect.iTl, snapshot, bmCropRect ); |
346 gc.BitBlt( vfRect.iTl, snapshot, bmCropRect ); |
340 |
347 |
341 OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMPOSTCAPTURECONTAINER_DRAW, "e_CAM_APP_SNAPSHOT_DRAW 0" ); //CCORAPP_SNAPSHOT_DRAW_END |
348 OstTrace0( CAMERAAPP_PERFORMANCE, DUP1_CCAMPOSTCAPTURECONTAINER_DRAW, "e_CAM_APP_SNAPSHOT_DRAW 0" ); //CCORAPP_SNAPSHOT_DRAW_END |
342 } |
349 } |
343 |
350 |
344 TBool lateOperation = ( ECamCapturing == iController.CurrentOperation() |
351 if( iProcessingText && //iProcessingBg && |
345 || ECamCompleting == iController.CurrentOperation() ); |
352 iController.ActiveCamera() != ECamActiveCameraSecondary && |
346 |
353 lateOperation ) |
347 if( iProcessingText && //iProcessingBg && |
354 { |
348 iController.ActiveCamera() != ECamActiveCameraSecondary && |
355 PRINT( _L("Camera <> CCamPostCaptureContainer: draw processing text..") ); |
349 lateOperation |
356 // When iProcessingText exists (and we are in correct state), the processing |
350 ) |
357 // image text needs to be drawn. |
351 { |
358 //iProcessingBg->Draw( gc, Rect() ); |
352 PRINT( _L("Camera <> CCamPostCaptureContainer: draw processing text..") ); |
|
353 // When iProcessingText exists (and we are in correct state), the processing |
|
354 // image text needs to be drawn. |
|
355 //iProcessingBg->Draw( gc, Rect() ); |
|
356 |
359 |
357 gc.SetBrushColor( KRgbWhite ); |
360 gc.SetBrushColor( KRgbWhite ); |
358 gc.SetBrushStyle( CGraphicsContext::ENullBrush ); |
361 gc.SetBrushStyle( CGraphicsContext::ENullBrush ); |
359 iProcessingTextLayout.DrawText( gc, *iProcessingText, ETrue, KRgbBlack ); |
362 iProcessingTextLayout.DrawText( gc, *iProcessingText, ETrue, KRgbBlack ); |
360 } |
363 } |
361 |
364 |
362 if( iBatteryPaneController ) |
365 if( iBatteryPaneController ) |
363 { |
366 { |
364 if( iPaneInUse == ECamPaneCounter ) |
367 if( iPaneInUse == ECamPaneCounter ) |
365 { |
368 { |
366 iNaviCounterControl->DrawNaviCtr( gc ); |
369 iNaviCounterControl->DrawNaviCtr( gc ); |
367 } |
370 } |
368 // Draw the battery pane |
371 // Draw the battery pane |
369 iBatteryPaneController->Draw( gc ); |
372 iBatteryPaneController->Draw( gc ); |
370 } |
373 } |
371 |
374 |
372 if ( iController.ActiveCamera() == ECamActiveCameraSecondary ) |
375 if ( iController.ActiveCamera() == ECamActiveCameraSecondary ) |