History

Merge branch 'master' of https://github.com/highfidelity/hifi into android

Atlante45 committed 11 years ago

Commit 4ef87b92 parents df96e02 347c74e113 files · +3501 −2168Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 113 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+54−52
@@ -12,18 +12,21 @@ · 11 unmodified lines
12#include <QFileDialog>12#include <QFileDialog>
13 13
14#include <AudioClient.h>14#include <AudioClient.h>
15#include <devices/Faceshift.h>
16#include <devices/SixenseManager.h>
15 17
16#include "Application.h"18#include "Application.h"
17#include "MainWindow.h"19#include "MainWindow.h"
18#include "Menu.h"20#include "Menu.h"
19#include "ModelsBrowser.h"21#include "ModelsBrowser.h"
20#include "PreferencesDialog.h"22#include "PreferencesDialog.h"
23#include "Snapshot.h"
21#include "UserActivityLogger.h"24#include "UserActivityLogger.h"
22 25
23const int PREFERENCES_HEIGHT_PADDING = 20;26const int PREFERENCES_HEIGHT_PADDING = 20;
24 27
25PreferencesDialog::PreferencesDialog() :28PreferencesDialog::PreferencesDialog(QWidget* parent) :
26 QDialog(Application::getInstance()->getWindow()) {29 QDialog(parent) {
27 30
28 setAttribute(Qt::WA_DeleteOnClose);31 setAttribute(Qt::WA_DeleteOnClose);
29 32
@@ -118,51 +121,53 @@ void PreferencesDialog::loadPreferences() { · 88 unmodified lines
118 121
119 ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));122 ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));
120 123
121 ui.snapshotLocationEdit->setText(menuInstance->getSnapshotsLocation());124 ui.snapshotLocationEdit->setText(SettingHandles::snapshotsLocation.get());
122 125
123 ui.scriptsLocationEdit->setText(menuInstance->getScriptsLocation());126 ui.scriptsLocationEdit->setText(qApp->getScriptsLocation());
124 127
125 ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *128 ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *
126 ui.pupilDilationSlider->maximum());129 ui.pupilDilationSlider->maximum());
127 130
128 ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *131 auto faceshift = DependencyManager::get<Faceshift>();
132 ui.faceshiftEyeDeflectionSider->setValue(faceshift->getEyeDeflection() *
129 ui.faceshiftEyeDeflectionSider->maximum());133 ui.faceshiftEyeDeflectionSider->maximum());
130 134
131 ui.faceshiftHostnameEdit->setText(menuInstance->getFaceshiftHostname());135 ui.faceshiftHostnameEdit->setText(faceshift->getHostname());
132
133 const InboundAudioStream::Settings& streamSettings = menuInstance->getReceivedAudioStreamSettings();
134
135 ui.dynamicJitterBuffersCheckBox->setChecked(streamSettings._dynamicJitterBuffers);
136 ui.staticDesiredJitterBufferFramesSpin->setValue(streamSettings._staticDesiredJitterBufferFrames);
137 ui.maxFramesOverDesiredSpin->setValue(streamSettings._maxFramesOverDesired);
138 ui.useStdevForJitterCalcCheckBox->setChecked(streamSettings._useStDevForJitterCalc);
139 ui.windowStarveThresholdSpin->setValue(streamSettings._windowStarveThreshold);
140 ui.windowSecondsForDesiredCalcOnTooManyStarvesSpin->setValue(streamSettings._windowSecondsForDesiredCalcOnTooManyStarves);
141 ui.windowSecondsForDesiredReductionSpin->setValue(streamSettings._windowSecondsForDesiredReduction);
142 ui.repetitionWithFadeCheckBox->setChecked(streamSettings._repetitionWithFade);
143 136
144 auto audio = DependencyManager::get<AudioClient>();137 auto audio = DependencyManager::get<AudioClient>();
138 MixedProcessedAudioStream& stream = audio->getReceivedAudioStream();
139
140 ui.dynamicJitterBuffersCheckBox->setChecked(stream.getDynamicJitterBuffers());
141 ui.staticDesiredJitterBufferFramesSpin->setValue(stream.getDesiredJitterBufferFrames());
142 ui.maxFramesOverDesiredSpin->setValue(stream.getMaxFramesOverDesired());
143 ui.useStdevForJitterCalcCheckBox->setChecked(stream.getUseStDevForJitterCalc());
144 ui.windowStarveThresholdSpin->setValue(stream.getWindowStarveThreshold());
145 ui.windowSecondsForDesiredCalcOnTooManyStarvesSpin->setValue(
146 stream.getWindowSecondsForDesiredCalcOnTooManyStarves());
147 ui.windowSecondsForDesiredReductionSpin->setValue(stream.getWindowSecondsForDesiredReduction());
148 ui.repetitionWithFadeCheckBox->setChecked(stream.getRepetitionWithFade());
149
145 ui.outputBufferSizeSpinner->setValue(audio->getOutputBufferSize());150 ui.outputBufferSizeSpinner->setValue(audio->getOutputBufferSize());
146 151
147 ui.outputStarveDetectionCheckBox->setChecked(audio->getOutputStarveDetectionEnabled());152 ui.outputStarveDetectionCheckBox->setChecked(audio->getOutputStarveDetectionEnabled());
148 ui.outputStarveDetectionThresholdSpinner->setValue(audio->getOutputStarveDetectionThreshold());153 ui.outputStarveDetectionThresholdSpinner->setValue(audio->getOutputStarveDetectionThreshold());
149 ui.outputStarveDetectionPeriodSpinner->setValue(audio->getOutputStarveDetectionPeriod());154 ui.outputStarveDetectionPeriodSpinner->setValue(audio->getOutputStarveDetectionPeriod());
150 155
151 ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView());156 ui.realWorldFieldOfViewSpin->setValue(qApp->getViewFrustum()->getRealWorldFieldOfView());
152 157
153 ui.fieldOfViewSpin->setValue(menuInstance->getFieldOfView());158 ui.fieldOfViewSpin->setValue(qApp->getViewFrustum()->getFieldOfView());
154 159
155 ui.leanScaleSpin->setValue(myAvatar->getLeanScale());160 ui.leanScaleSpin->setValue(myAvatar->getLeanScale());
156 161
157 ui.avatarScaleSpin->setValue(myAvatar->getScale());162 ui.avatarScaleSpin->setValue(myAvatar->getScale());
158 163
159 ui.maxOctreePPSSpin->setValue(menuInstance->getMaxOctreePacketsPerSecond());164 ui.maxOctreePPSSpin->setValue(qApp->getOctreeQuery().getMaxOctreePacketsPerSecond());
160
161 ui.oculusUIAngularSizeSpin->setValue(menuInstance->getOculusUIAngularSize());
162 165
163 ui.sixenseReticleMoveSpeedSpin->setValue(menuInstance->getSixenseReticleMoveSpeed());166 ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getOculusUIAngularSize());
164 167
165 ui.invertSixenseButtonsCheckBox->setChecked(menuInstance->getInvertSixenseButtons());168 SixenseManager& sixense = SixenseManager::getInstance();
169 ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed());
170 ui.invertSixenseButtonsCheckBox->setChecked(sixense.getInvertButtons());
166 171
167}172}
168 173
@@ -214,11 +219,11 @@ void PreferencesDialog::savePreferences() { · 45 unmodified lines
214 }219 }
215 220
216 if (!ui.snapshotLocationEdit->text().isEmpty() && QDir(ui.snapshotLocationEdit->text()).exists()) {221 if (!ui.snapshotLocationEdit->text().isEmpty() && QDir(ui.snapshotLocationEdit->text()).exists()) {
217 Menu::getInstance()->setSnapshotsLocation(ui.snapshotLocationEdit->text());222 SettingHandles::snapshotsLocation.set(ui.snapshotLocationEdit->text());
218 }223 }
219 224
220 if (!ui.scriptsLocationEdit->text().isEmpty() && QDir(ui.scriptsLocationEdit->text()).exists()) {225 if (!ui.scriptsLocationEdit->text().isEmpty() && QDir(ui.scriptsLocationEdit->text()).exists()) {
221 Menu::getInstance()->setScriptsLocation(ui.scriptsLocationEdit->text());226 qApp->setScriptsLocation(ui.scriptsLocationEdit->text());
222 }227 }
223 228
224 myAvatar->getHead()->setPupilDilation(ui.pupilDilationSlider->value() / (float)ui.pupilDilationSlider->maximum());229 myAvatar->getHead()->setPupilDilation(ui.pupilDilationSlider->value() / (float)ui.pupilDilationSlider->maximum());
@@ -228,36 +233,35 @@ void PreferencesDialog::savePreferences() { · 3 unmodified lines
228 auto glCanvas = DependencyManager::get<GLCanvas>();233 auto glCanvas = DependencyManager::get<GLCanvas>();
229 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());234 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
230 235
231 Menu::getInstance()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());236 qApp->getViewFrustum()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
232 237
233 Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());238 qApp->getViewFrustum()->setFieldOfView(ui.fieldOfViewSpin->value());
234
235 Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
236 (float)ui.faceshiftEyeDeflectionSider->maximum());
237 239
238 Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text()); 240 auto faceshift = DependencyManager::get<Faceshift>();
241 faceshift->setEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
242 (float)ui.faceshiftEyeDeflectionSider->maximum());
239 243
240 Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());244 faceshift->setHostname(ui.faceshiftHostnameEdit->text());
241 245
242 Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());246 qApp->getOctreeQuery().setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());
243
244 Menu::getInstance()->setSixenseReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());
245
246 Menu::getInstance()->setInvertSixenseButtons(ui.invertSixenseButtonsCheckBox->isChecked());
247
248 InboundAudioStream::Settings streamSettings;
249 streamSettings._dynamicJitterBuffers = ui.dynamicJitterBuffersCheckBox->isChecked();
250 streamSettings._staticDesiredJitterBufferFrames = ui.staticDesiredJitterBufferFramesSpin->value();
251 streamSettings._maxFramesOverDesired = ui.maxFramesOverDesiredSpin->value();
252 streamSettings._useStDevForJitterCalc = ui.useStdevForJitterCalcCheckBox->isChecked();
253 streamSettings._windowStarveThreshold = ui.windowStarveThresholdSpin->value();
254 streamSettings._windowSecondsForDesiredCalcOnTooManyStarves = ui.windowSecondsForDesiredCalcOnTooManyStarvesSpin->value();
255 streamSettings._windowSecondsForDesiredReduction = ui.windowSecondsForDesiredReductionSpin->value();
256 streamSettings._repetitionWithFade = ui.repetitionWithFadeCheckBox->isChecked();
257 247
258 Menu::getInstance()->setReceivedAudioStreamSettings(streamSettings);248 qApp->getApplicationOverlay().setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->value());
249
250 SixenseManager& sixense = SixenseManager::getInstance();
251 sixense.setReticleMoveSpeed(ui.sixenseReticleMoveSpeedSpin->value());
252 sixense.setInvertButtons(ui.invertSixenseButtonsCheckBox->isChecked());
259 253
260 auto audio = DependencyManager::get<AudioClient>();254 auto audio = DependencyManager::get<AudioClient>();
255 MixedProcessedAudioStream& stream = audio->getReceivedAudioStream();
256
257 stream.setDynamicJitterBuffers(ui.dynamicJitterBuffersCheckBox->isChecked());
258 stream.setStaticDesiredJitterBufferFrames(ui.staticDesiredJitterBufferFramesSpin->value());
259 stream.setMaxFramesOverDesired(ui.maxFramesOverDesiredSpin->value());
260 stream.setUseStDevForJitterCalc(ui.useStdevForJitterCalcCheckBox->isChecked());
261 stream.setWindowStarveThreshold(ui.windowStarveThresholdSpin->value());
262 stream.setWindowSecondsForDesiredCalcOnTooManyStarves(ui.windowSecondsForDesiredCalcOnTooManyStarvesSpin->value());
263 stream.setWindowSecondsForDesiredReduction(ui.windowSecondsForDesiredReductionSpin->value());
264 stream.setRepetitionWithFade(ui.repetitionWithFadeCheckBox->isChecked());
261 265
262 QMetaObject::invokeMethod(audio.data(), "setOutputBufferSize", Q_ARG(int, ui.outputBufferSizeSpinner->value()));266 QMetaObject::invokeMethod(audio.data(), "setOutputBufferSize", Q_ARG(int, ui.outputBufferSizeSpinner->value()));
263 267
@@ -266,6 +270,4 @@ void PreferencesDialog::savePreferences() { · 2 unmodified lines
266 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());270 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
267 271
268 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());272 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
269
270 Application::getInstance()->bumpSettings();
271}273}