equal
deleted
inserted
replaced
176 CX_DEBUG_ENTER_FUNCTION(); |
176 CX_DEBUG_ENTER_FUNCTION(); |
177 CX_DEBUG_ASSERT(mSettingStore); |
177 CX_DEBUG_ASSERT(mSettingStore); |
178 |
178 |
179 // If this is one of scene settings, |
179 // If this is one of scene settings, |
180 // store it as modification of current scene. |
180 // store it as modification of current scene. |
181 CxeError::Id err = setSceneSettingValue(key, newValue.toInt()); |
181 CxeError::Id err = setSceneSettingValue(key, newValue); |
182 CX_DEBUG(( "status storing to scene data: %d", err)); |
182 CX_DEBUG(( "status storing to scene data: %d", err)); |
183 |
183 |
184 // If not scene specific, store the setting value. |
184 // If not scene specific, store the setting value. |
185 if (err == CxeError::NotFound) { |
185 if (err == CxeError::NotFound) { |
186 CX_DEBUG(( "writing value to settings store" )); |
186 CX_DEBUG(( "writing value to settings store" )); |
238 { |
238 { |
239 CX_DEBUG_ENTER_FUNCTION(); |
239 CX_DEBUG_ENTER_FUNCTION(); |
240 |
240 |
241 CxeError::Id err = CxeError::None; |
241 CxeError::Id err = CxeError::None; |
242 |
242 |
243 mCurrentImgScene.clear(); |
|
244 |
|
245 // load the scene setting default values for the new scene id = "newScene" |
243 // load the scene setting default values for the new scene id = "newScene" |
246 CxeScene sceneSettings; |
244 CxeScene sceneSettings; |
247 err = imageScene(newScene, sceneSettings); |
245 err = imageScene(newScene, sceneSettings); |
248 |
246 |
249 // create of copy of the new scene as we use it for accessing the scene settings later. |
247 // create of copy of the new scene as we use it for accessing the scene settings later. |
250 if (CxeError::None == err) { |
248 if (CxeError::None == err) { |
|
249 mCurrentImgScene.clear(); |
251 loadSceneData(mCurrentImgScene, sceneSettings); |
250 loadSceneData(mCurrentImgScene, sceneSettings); |
252 } |
251 } |
253 |
252 |
254 CX_DEBUG_EXIT_FUNCTION(); |
253 CX_DEBUG_EXIT_FUNCTION(); |
255 |
254 |
264 CxeError::Id CxeSettingsModelImp::setVideoScene(const QString &newScene) |
263 CxeError::Id CxeSettingsModelImp::setVideoScene(const QString &newScene) |
265 { |
264 { |
266 CX_DEBUG_ENTER_FUNCTION(); |
265 CX_DEBUG_ENTER_FUNCTION(); |
267 |
266 |
268 CxeError::Id err = CxeError::None; |
267 CxeError::Id err = CxeError::None; |
269 |
|
270 mCurrentVidScene.clear(); |
|
271 |
268 |
272 // load the scene setting default values for the new scene id = "newScene" |
269 // load the scene setting default values for the new scene id = "newScene" |
273 CxeScene sceneSettings; |
270 CxeScene sceneSettings; |
274 err = videoScene(newScene, sceneSettings); |
271 err = videoScene(newScene, sceneSettings); |
275 |
272 |
276 // create of copy of the new scene as we use it for accessing the scene settings later. |
273 // create of copy of the new scene as we use it for accessing the scene settings later. |
277 if (CxeError::None == err) { |
274 if (CxeError::None == err) { |
|
275 mCurrentVidScene.clear(); |
278 loadSceneData(mCurrentVidScene, sceneSettings); |
276 loadSceneData(mCurrentVidScene, sceneSettings); |
279 } |
277 } |
280 |
278 |
281 CX_DEBUG_EXIT_FUNCTION(); |
279 CX_DEBUG_EXIT_FUNCTION(); |
282 |
280 |
378 |
376 |
379 |
377 |
380 /* |
378 /* |
381 * set scene setting value associated with the key |
379 * set scene setting value associated with the key |
382 */ |
380 */ |
383 CxeError::Id CxeSettingsModelImp::setSceneSettingValue(const QString &key, int newValue) |
381 CxeError::Id CxeSettingsModelImp::setSceneSettingValue(const QString &key, QVariant newValue) |
384 { |
382 { |
385 CX_DEBUG_ENTER_FUNCTION(); |
383 CX_DEBUG_ENTER_FUNCTION(); |
386 |
384 |
387 CxeError::Id err = CxeError::None; |
385 CxeError::Id err = CxeError::None; |
388 |
386 |
414 CX_DEBUG_ENTER_FUNCTION(); |
412 CX_DEBUG_ENTER_FUNCTION(); |
415 |
413 |
416 runtimeKeys.append(CxeRuntimeKeys::PRIMARY_CAMERA_CAPTURE_KEYS); |
414 runtimeKeys.append(CxeRuntimeKeys::PRIMARY_CAMERA_CAPTURE_KEYS); |
417 runtimeKeys.append(CxeRuntimeKeys::PRIMARY_CAMERA_AUTOFOCUS_KEYS); |
415 runtimeKeys.append(CxeRuntimeKeys::PRIMARY_CAMERA_AUTOFOCUS_KEYS); |
418 runtimeKeys.append(CxeRuntimeKeys::SECONDARY_CAMERA_CAPTURE_KEYS); |
416 runtimeKeys.append(CxeRuntimeKeys::SECONDARY_CAMERA_CAPTURE_KEYS); |
419 runtimeKeys.append(CxeRuntimeKeys::CONTRAST_ITEMS); |
417 runtimeKeys.append(CxeRuntimeKeys::FREE_MEMORY_LEVELS); |
420 runtimeKeys.append(CxeRuntimeKeys::STILL_MAX_ZOOM_LIMITS); |
418 runtimeKeys.append(CxeRuntimeKeys::STILL_MAX_ZOOM_LIMITS); |
421 runtimeKeys.append(CxeRuntimeKeys::VIDEO_MAX_ZOOM_LIMITS); |
419 runtimeKeys.append(CxeRuntimeKeys::VIDEO_MAX_ZOOM_LIMITS); |
422 |
420 |
423 CX_DEBUG_EXIT_FUNCTION(); |
421 CX_DEBUG_EXIT_FUNCTION(); |
424 } |
422 } |