FCL/sf/app/camera: comparison camerauis/cameraxui/cxui/src/cxuistillprecaptureview.cpp

equal deleted inserted replaced

-:64817133cd1d
+:42ba2d16bf40
 * Contributors:
 *
 * Description:
 *
 */
+#include <QVariant>
+#include <QMetaType>
+#include <QGraphicsLayout>
 #include <hbpushbutton.h>
 #include <hblabel.h>
 #include <hbtoolbar.h>
 #include <hbaction.h>
 #include <hbmainwindow.h>
 #include <hbtransparentwindow.h>
-#include <QVariant>
-#include <QMetaType>
 #include <hbslider.h>
 #include <hblistwidget.h>
 #include <hbdialog.h>
 #include <hblistwidgetitem.h>
 #include <hbtoolbarextension.h>
 #include "cxenamespace.h" // CxeSettingIds
 #include "cxuienums.h"
 #include "cxesettings.h"
 #include "cxefeaturemanager.h" // mEngine->featureManager()
 #include "cxuidocumentloader.h"
+#ifdef Q_OS_SYMBIAN
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxuistillprecaptureviewTraces.h"
 #endif
+#endif //Q_OS_SYMBIAN
 #include "cxuistillprecaptureview.h"
 #include "cxuiserviceprovider.h"
 #include "cxuisettingdialog.h"
 #include "cxuisettingradiobuttonlist.h"
 #include "cxuizoomslider.h"
 this, SLOT(handleSnapshot(CxeError::Id)));
 connect(&mEngine->stillCaptureControl(), SIGNAL(stateChanged(CxeStillCaptureControl::State, CxeError::Id)),
 this, SLOT(handleStillCaptureStateChanged(CxeStillCaptureControl::State, CxeError::Id)));
 connect(&mEngine->viewfinderControl(), SIGNAL(stateChanged(CxeViewfinderControl::State, CxeError::Id)),
 this, SLOT(handleViewfinderStateChanged(CxeViewfinderControl::State, CxeError::Id)));
-connect(&(mEngine->settings()), SIGNAL(sceneChanged(CxeScene&)),
-this, SLOT(handleSceneChanged(CxeScene&)));
 connect(&mEngine->stillCaptureControl(), SIGNAL(availableImagesChanged()),
 this, SLOT(updateImagesLeftLabel()));
+mEngine->settings().listenForSetting(CxeSettingIds::IMAGE_SCENE_DATA, this, SLOT(handleSceneChanged(const QVariant&)));
 loadDefaultWidgets();
 hideControls();
-mSelfTimer = new CxuiSelfTimer(mEngine->settings());
-connect(mSelfTimer, SIGNAL(timerFinished()), this, SLOT(focusAndCapture()));
-int value = Cxe::GeoTaggingDisclaimerDisabled;
-mEngine->settings().get(CxeSettingIds::GEOTAGGING_DISCLAIMER, value);
-if(value == Cxe::GeoTaggingDisclaimerEnabled) {
-launchGeoTaggingDisclaimerDialog();
-}
 OstTrace0( camerax_performance, DUP1_CXUISTILLPRECAPTUREVIEW_CONSTRUCT, "msg: e_CX_STILLPRECAPVIEW_CONSTRUCT 0" );
 CX_DEBUG_EXIT_FUNCTION();
 }
 * Loads default widgets in layouts xml.
 */
 void CxuiStillPrecaptureView::loadDefaultWidgets()
 {
 CX_DEBUG_ENTER_FUNCTION();
-CX_DEBUG_ASSERT(mDocumentLoader);
+CX_ASSERT_ALWAYS(mDocumentLoader);
 // get pointer to the viewfinder
 QGraphicsWidget *widget = NULL;
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_VIEWFINDER);
 mViewfinder = qobject_cast<HbTransparentWindow *>(widget);
-CX_DEBUG_ASSERT(mViewfinder);
+CX_ASSERT_ALWAYS(mViewfinder);
+reloadIndicatorWidgets();
+CX_DEBUG_EXIT_FUNCTION();
+}
+/*!
+* Loads default indicators from docml and modifies the visibility
+* according to current settings.
+*/
+void CxuiStillPrecaptureView::reloadIndicatorWidgets()
+{
+CX_DEBUG_ENTER_FUNCTION();
+CX_ASSERT_ALWAYS(mDocumentLoader);
+bool ok = false;
+mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_INDICATORS_SECTION, &ok);
+CX_ASSERT_ALWAYS(ok);
+QGraphicsWidget *widget = NULL;
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_QUALITY_ICON);
 mQualityIcon = qobject_cast<HbLabel *>(widget);
-CX_DEBUG_ASSERT(mQualityIcon);
+CX_ASSERT_ALWAYS(mQualityIcon);
+widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_FLASHBLINK_INDICATOR_ICON);
+HbLabel *flashBlinkingIcon = qobject_cast<HbLabel *>(widget);
+CX_ASSERT_ALWAYS(flashBlinkingIcon);
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_GEOTAGGING_INDICATOR_ICON);
 mGeoTaggingIndicatorIcon = qobject_cast<HbLabel *>(widget);
-CX_DEBUG_ASSERT(mGeoTaggingIndicatorIcon);
+CX_ASSERT_ALWAYS(mGeoTaggingIndicatorIcon);
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_FACE_TRACKING_ICON);
 mFaceTrackingIcon = qobject_cast<HbLabel *>(widget);
-CX_DEBUG_ASSERT(mFaceTrackingIcon);
+CX_ASSERT_ALWAYS(mFaceTrackingIcon);
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_INDICATOR_CONTAINER);
 mIndicators = qobject_cast<HbWidget *>(widget);
-CX_DEBUG_ASSERT(mIndicators);
+CX_ASSERT_ALWAYS(mIndicators);
+QGraphicsLayout *layout = mIndicators->layout();
+QGraphicsLayoutItem *graphicsLayoutItem = NULL;
+QGraphicsItem *graphicsItem = NULL;
+QString key = "";
+int currentSettingValue = -1;
+bool isSettingOff = false;
+// Go through the items in the layout to check whether they should be
+// shown or not in the indicator pane. Start from the last towards
+// the first, so that removing items from between works correctly.
+for (int i = layout->count() - 1; i >= 0; i--) {
+graphicsLayoutItem = layout->itemAt(i);
+isSettingOff = false;
+if (graphicsLayoutItem) {
+graphicsItem = graphicsLayoutItem->graphicsItem();
+currentSettingValue = -1;
+if (graphicsItem == mGeoTaggingIndicatorIcon) {
+key = CxeSettingIds::GEOTAGGING;
+currentSettingValue = mEngine->settings().get(key, currentSettingValue);
+if (currentSettingValue == Cxe::GeoTaggingOff) {
+isSettingOff = true;
+}
+} else if (graphicsItem == mFaceTrackingIcon) {
+key = CxeSettingIds::FACE_TRACKING;
+currentSettingValue = mEngine->settings().get(key, currentSettingValue);
+// facetracking implementation does not use
+// enum for on/off values but instead
+// 0 for off and 1 for on.
+if (currentSettingValue == 0) {
+isSettingOff = true;
+}
+} else if (graphicsItem == flashBlinkingIcon) {
+//remove flash indicator
+isSettingOff = true;
+}
+if (isSettingOff) {
+layout->removeAt(i);
+}
+}
+}
 // create background for indicator container
 createWidgetBackgroundGraphic(mIndicators, TRANSPARENT_BACKGROUND_GRAPHIC);
+mIndicators->setVisible(true);
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*!
 * Widgets are created at the time they are first loaded.
 */
 void CxuiStillPrecaptureView::loadWidgets()
 {
 CX_DEBUG_ENTER_FUNCTION();
-CX_DEBUG_ASSERT(mDocumentLoader);
+CX_ASSERT_ALWAYS(mDocumentLoader);
-if( mWidgetsLoaded ) {
+if (mWidgetsLoaded) {
 CX_DEBUG(("Widgets already loaded"));
 CX_DEBUG_EXIT_FUNCTION();
 return;
 }
 bool ok = false;
 OstTrace0( camerax_performance, DUP4_CXUISTILLPRECAPTUREVIEW_LOADWIDGETS, "msg: e_CX_DOCUMENTLOADER_LOAD 1" );
 mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_WIDGETS_SECTION, &ok);
-Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing");
+CX_ASSERT_ALWAYS(ok);
 if (CxuiServiceProvider::isCameraEmbedded()) {
 mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_EMBEDDED_SECTION, &ok);
 } else {
 mDocumentLoader->load(STILL_1ST_XML, STILL_PRE_CAPTURE_STANDALONE_SECTION, &ok);
 }
 OstTrace0( camerax_performance, DUP5_CXUISTILLPRECAPTUREVIEW_LOADWIDGETS, "msg: e_CX_DOCUMENTLOADER_LOAD 0" );
-Q_ASSERT_X(ok, "camerax ui", "error in xml file parsing");
+CX_ASSERT_ALWAYS(ok);
 // get pointers to ui components from the layout data
 QGraphicsWidget *widget = NULL;
 QObject *object = NULL;
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_ZOOM_SLIDER);
 mSlider = qobject_cast<CxuiZoomSlider *>(widget);
-CX_DEBUG_ASSERT(mSlider);
+CX_ASSERT_ALWAYS(mSlider);
 mSlider->addZoomButtons();
 createWidgetBackgroundGraphic(mSlider, TRANSPARENT_BACKGROUND_GRAPHIC);
-if (mSelfTimer) {
-// let selftimer class get needed selftimer related widgets
-// from the documentloader
-mSelfTimer->loadSelftimerWidgets(mDocumentLoader);
-}
 // create background for selftimer containers
 HbWidget *container = NULL;
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_SELFTIMER_CONTAINER);
 container = qobject_cast<HbWidget *>(widget);
-CX_DEBUG_ASSERT(container);
+CX_ASSERT_ALWAYS(container);
 createWidgetBackgroundGraphic(container, TRANSPARENT_BACKGROUND_GRAPHIC);
 // connect selftimer start button to hide controls
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_SELFTIMER_START_BUTTON);
 HbPushButton *startButton = qobject_cast<HbPushButton *>(widget);
-CX_DEBUG_ASSERT(startButton);
+CX_ASSERT_ALWAYS(startButton);
 connect(startButton, SIGNAL(released()), this, SLOT(hideControls()));
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_TOOLBAR);
 mToolbar = qobject_cast<HbToolBar *>(widget);
-CX_DEBUG_ASSERT(mToolbar);
+CX_ASSERT_ALWAYS(mToolbar);
 object = mDocumentLoader->findObject(STILL_PRE_CAPTURE_FLASH_ACTION);
 mFlashSetting = qobject_cast<HbAction *>(object);
-CX_DEBUG_ASSERT(mFlashSetting);
+CX_ASSERT_ALWAYS(mFlashSetting);
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_IMAGES_LEFT_LABEL);
 mImagesLeft = qobject_cast<HbLabel *>(widget);
-CX_DEBUG_ASSERT(mImagesLeft);
+CX_ASSERT_ALWAYS(mImagesLeft);
 widget = mDocumentLoader->findWidget(STILL_PRE_CAPTURE_IMAGES_LEFT_CONTAINER);
 mImagesLeftContainer = qobject_cast<HbWidget *>(widget);
-CX_DEBUG_ASSERT(mImagesLeftContainer);
+CX_ASSERT_ALWAYS(mImagesLeftContainer);
 createWidgetBackgroundGraphic(mImagesLeftContainer, TRANSPARENT_BACKGROUND_GRAPHIC);
 updateImagesLeftLabel();
+// Create self timer.
+// Let selftimer class get needed selftimer related widgets from the documentloader
+mSelfTimer = new CxuiSelfTimer(mEngine->settings());
+CX_ASSERT_ALWAYS(mSelfTimer);
+connect(mSelfTimer, SIGNAL(timerFinished()), this, SLOT(focusAndCapture()));
+mSelfTimer->loadSelftimerWidgets(mDocumentLoader);
 if (CxuiServiceProvider::isCameraEmbedded()) {
 CX_DEBUG(("EMBEDDED: camera in embedded mode"));
 if (!CxuiServiceProvider::instance()->allowQualityChange()) {
 // Setting widgets loaded here so updating icons works.
 mWidgetsLoaded = true;
 // Update toolbar flash mode icon
-int flash;
+int flash = mEngine->settings().get<int>(CxeSettingIds::FLASH_MODE);
-if (mEngine->settings().get(CxeSettingIds::FLASH_MODE, flash) == CxeError::None) {
+handleSettingValueChanged(CxeSettingIds::FLASH_MODE, flash);
-handleSettingValueChanged(CxeSettingIds::FLASH_MODE, flash);
-}
 // Update toolbar scene mode icon
-QString sceneId;
+updateSceneIcon(mEngine->settings().get<QString>(CxeSettingIds::IMAGE_SCENE));
-if (mEngine->settings().get(CxeSettingIds::SCENE_ID, sceneId) == CxeError::None) {
-updateSceneIcon(sceneId);
-}
 hideControls();
+// Check if we need to show the geotagging disclaimer for first time use.
+Cxe::GeoTaggingDisclaimer value = mEngine->settings().get<Cxe::GeoTaggingDisclaimer>(CxeSettingIds::GEOTAGGING_DISCLAIMER, Cxe::GeoTaggingDisclaimerDisabled);
+if (value == Cxe::GeoTaggingDisclaimerEnabled) {
+launchGeoTaggingDisclaimerDialog();
+}
 // View is ready. Needed for startup performance automated testing.
 emit viewReady();
 OstTrace0( camerax_performance, DUP1_CXUISTILLPRECAPTUREVIEW_LOADWIDGETS, "msg: e_CX_STILLPRECAPTUREVIEW_LOADWIDGETS 0" );
 // Read the value from settings. Ignoring reading error.
 // On error (missing settings) default to "postcapture on".
 int showPostcapture(-1);
 if(mEngine) {
-mEngine->settings().get(CxeSettingIds::STILL_SHOWCAPTURED, showPostcapture);
+showPostcapture = mEngine->settings().get<int>(CxeSettingIds::STILL_SHOWCAPTURED, -1);
 }
 CX_DEBUG_EXIT_FUNCTION();
 return showPostcapture != 0; // 0 == no postcapture
 }
 CX_DEBUG(("CxuiStillPrecaptureView - icon: %s", icon.toAscii().constData()));
 if (mDocumentLoader) {
 QObject *obj = mDocumentLoader->findObject(iconObjectName);
-CX_DEBUG_ASSERT(obj);
+CX_ASSERT_ALWAYS(obj);
 qobject_cast<HbAction *>(obj)->setIcon(HbIcon(icon));
 }
 } else {
 CX_DEBUG(("CxuiStillPrecaptureView - widgets not loaded yet, ignored!"));
 }
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (mQualityIcon && mEngine) {
 QString icon = "";
-int currentValue = -1;
+int currentValue = mEngine->settings().get<int>(CxeSettingIds::IMAGE_QUALITY, -1);
-mEngine->settings().get(CxeSettingIds::IMAGE_QUALITY, currentValue);
 icon = getSettingItemIcon(CxeSettingIds::IMAGE_QUALITY, currentValue);
 mQualityIcon->setIcon(HbIcon(icon));
 }
 */
 void CxuiStillPrecaptureView::focusAndCapture()
 {
 CX_DEBUG_ENTER_FUNCTION();
-if (!mEngine->autoFocusControl().supported()) {
+if (!mEngine->autoFocusControl().supported() ||
+mEngine->autoFocusControl().isFixedFocusMode(mEngine->autoFocusControl().mode())) {
 // autofocus is not supported, so start capturing straight away
 capture();
 } else {
+setCapturePending();
 // start focusing
 // Auto-focus can only work if viewfinder is running
 if (mEngine->viewfinderControl().state() == CxeViewfinderControl::Running) {
 mEngine->autoFocusControl().start(false);
 }
-setCapturePending();
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 /*
 Slot for handling scene mode change
 \param scene QVariantMap containing settings related to the new scene mode
 */
-void CxuiStillPrecaptureView::handleSceneChanged(CxeScene &scene)
+void CxuiStillPrecaptureView::handleSceneChanged(const QVariant &newSceneData)
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (mEngine->mode() == Cxe::ImageMode) {
+CxeScene scene = newSceneData.toMap();
 // update toolbar scene mode icon
 updateSceneIcon(scene[CxeSettingIds::SCENE_ID].toString());
 // for now, we are only interested in flashmode change
 if (scene.contains(CxeSettingIds::FLASH_MODE)) {
 CX_DEBUG(("updating flash to: %d", scene[CxeSettingIds::FLASH_MODE].value<int>()));
 handleSettingValueChanged(CxeSettingIds::FLASH_MODE, scene[CxeSettingIds::FLASH_MODE]);
 } else {
 // No flash mode specified within the scene.
 // Check from setting model what is it currently.
-int flashMode(Cxe::FlashAuto);
+Cxe::FlashMode flashMode = mEngine->settings().get<Cxe::FlashMode>(CxeSettingIds::FLASH_MODE, Cxe::FlashAuto);
-mEngine->settings().get(CxeSettingIds::FLASH_MODE, flashMode);
 handleSettingValueChanged(CxeSettingIds::FLASH_MODE, QVariant(flashMode));
 }
 }
 CX_DEBUG_EXIT_FUNCTION();
 }
 // update the quality indicator on screen
 updateQualityIcon();
 // update images left when quality values are changed
 updateImagesLeftLabel();
 } else if (key == CxeSettingIds::FACE_TRACKING) {
+reloadIndicatorWidgets();
 updateFaceTrackingIcon();
+} else if (key == CxeSettingIds::GEOTAGGING) {
+reloadIndicatorWidgets();
 }
 // update toolbar flash icon
 if (mFlashSetting && key == CxeSettingIds::FLASH_MODE) {
 CX_DEBUG((("flash mode: %d"), newValue.toInt()));
 QString settingsKey = action->property(PROPERTY_KEY_SETTING_ID).toString();
 CX_DEBUG(("settingsKey=%s", settingsKey.toAscii().constData()));
 launchSettingsDialog(action);
 // special case to get value changed event to the selftimer class
 if (settingsKey == CxeSettingIds::SELF_TIMER) {
-// if selftimer is active remember the previously selected value
+// selftimer is not found in settings so set the value now
-if (mSelfTimer->isEnabled()) {
+mSettingsDialogList->setOriginalSelectedItemByValue(mSelfTimer->getTimeout());
-mSettingsDialogList->setOriginalSelectedItemByValue(mSelfTimer->getTimeout());
-}
 connect(mSettingsDialogList, SIGNAL(valueSelected(int)),
 mSelfTimer, SLOT(changeTimeOut(int)));
 }
 }
 {
 CX_DEBUG_ENTER_FUNCTION();
 if (mFaceTrackingIcon && mEngine) {
 QString key = "";
 QString icon = "";
-int currentValue = -1;
 key = CxeSettingIds::FACE_TRACKING;
-mEngine->settings().get(key, currentValue);
+int currentValue = mEngine->settings().get<int>(key, -1);
 icon = getSettingItemIcon(key, currentValue);
 mFaceTrackingIcon->setIcon(HbIcon(icon));
 }

changeset 48	42ba2d16bf40
parent 37	64817133cd1d
child 56	01e205c615b9