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
1212 #include <QFileDialog>
1313
1414 #include <AudioClient.h>
15+#include <devices/Faceshift.h>
16+#include <devices/SixenseManager.h>
1517
1618 #include "Application.h"
1719 #include "MainWindow.h"
1820 #include "Menu.h"
1921 #include "ModelsBrowser.h"
2022 #include "PreferencesDialog.h"
23+#include "Snapshot.h"
2124 #include "UserActivityLogger.h"
2225
2326 const int PREFERENCES_HEIGHT_PADDING = 20;
2427
25−PreferencesDialog::PreferencesDialog() :
26− QDialog(Application::getInstance()->getWindow()) {
28+PreferencesDialog::PreferencesDialog(QWidget* parent) :
29+ QDialog(parent) {
2730
2831 setAttribute(Qt::WA_DeleteOnClose);
2932
@@ -118,51 +121,53 @@ void PreferencesDialog::loadPreferences() { · 88 unmodified lines
118121
119122 ui.sendDataCheckBox->setChecked(!menuInstance->isOptionChecked(MenuOption::DisableActivityLogger));
120123
121− ui.snapshotLocationEdit->setText(menuInstance->getSnapshotsLocation());
124+ ui.snapshotLocationEdit->setText(SettingHandles::snapshotsLocation.get());
122125
123− ui.scriptsLocationEdit->setText(menuInstance->getScriptsLocation());
126+ ui.scriptsLocationEdit->setText(qApp->getScriptsLocation());
124127
125128 ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *
126129 ui.pupilDilationSlider->maximum());
127130
128− ui.faceshiftEyeDeflectionSider->setValue(menuInstance->getFaceshiftEyeDeflection() *
131+ auto faceshift = DependencyManager::get<Faceshift>();
132+ ui.faceshiftEyeDeflectionSider->setValue(faceshift->getEyeDeflection() *
129133 ui.faceshiftEyeDeflectionSider->maximum());
130134
131− ui.faceshiftHostnameEdit->setText(menuInstance->getFaceshiftHostname());
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);
135+ ui.faceshiftHostnameEdit->setText(faceshift->getHostname());
143136
144137 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+
145150 ui.outputBufferSizeSpinner->setValue(audio->getOutputBufferSize());
146151
147152 ui.outputStarveDetectionCheckBox->setChecked(audio->getOutputStarveDetectionEnabled());
148153 ui.outputStarveDetectionThresholdSpinner->setValue(audio->getOutputStarveDetectionThreshold());
149154 ui.outputStarveDetectionPeriodSpinner->setValue(audio->getOutputStarveDetectionPeriod());
150155
151− ui.realWorldFieldOfViewSpin->setValue(menuInstance->getRealWorldFieldOfView());
156+ ui.realWorldFieldOfViewSpin->setValue(qApp->getViewFrustum()->getRealWorldFieldOfView());
152157
153− ui.fieldOfViewSpin->setValue(menuInstance->getFieldOfView());
158+ ui.fieldOfViewSpin->setValue(qApp->getViewFrustum()->getFieldOfView());
154159
155160 ui.leanScaleSpin->setValue(myAvatar->getLeanScale());
156161
157162 ui.avatarScaleSpin->setValue(myAvatar->getScale());
158163
159− ui.maxOctreePPSSpin->setValue(menuInstance->getMaxOctreePacketsPerSecond());
160−
161− ui.oculusUIAngularSizeSpin->setValue(menuInstance->getOculusUIAngularSize());
164+ ui.maxOctreePPSSpin->setValue(qApp->getOctreeQuery().getMaxOctreePacketsPerSecond());
162165
163− ui.sixenseReticleMoveSpeedSpin->setValue(menuInstance->getSixenseReticleMoveSpeed());
166+ ui.oculusUIAngularSizeSpin->setValue(qApp->getApplicationOverlay().getOculusUIAngularSize());
164167
165− ui.invertSixenseButtonsCheckBox->setChecked(menuInstance->getInvertSixenseButtons());
168+ SixenseManager& sixense = SixenseManager::getInstance();
169+ ui.sixenseReticleMoveSpeedSpin->setValue(sixense.getReticleMoveSpeed());
170+ ui.invertSixenseButtonsCheckBox->setChecked(sixense.getInvertButtons());
166171
167172 }
168173
@@ -214,11 +219,11 @@ void PreferencesDialog::savePreferences() { · 45 unmodified lines
214219 }
215220
216221 if (!ui.snapshotLocationEdit->text().isEmpty() && QDir(ui.snapshotLocationEdit->text()).exists()) {
217− Menu::getInstance()->setSnapshotsLocation(ui.snapshotLocationEdit->text());
222+ SettingHandles::snapshotsLocation.set(ui.snapshotLocationEdit->text());
218223 }
219224
220225 if (!ui.scriptsLocationEdit->text().isEmpty() && QDir(ui.scriptsLocationEdit->text()).exists()) {
221− Menu::getInstance()->setScriptsLocation(ui.scriptsLocationEdit->text());
226+ qApp->setScriptsLocation(ui.scriptsLocationEdit->text());
222227 }
223228
224229 myAvatar->getHead()->setPupilDilation(ui.pupilDilationSlider->value() / (float)ui.pupilDilationSlider->maximum());
@@ -228,36 +233,35 @@ void PreferencesDialog::savePreferences() { · 3 unmodified lines
228233 auto glCanvas = DependencyManager::get<GLCanvas>();
229234 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
230235
231− Menu::getInstance()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
236+ qApp->getViewFrustum()->setRealWorldFieldOfView(ui.realWorldFieldOfViewSpin->value());
232237
233− Menu::getInstance()->setFieldOfView(ui.fieldOfViewSpin->value());
234−
235− Menu::getInstance()->setFaceshiftEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
236− (float)ui.faceshiftEyeDeflectionSider->maximum());
238+ qApp->getViewFrustum()->setFieldOfView(ui.fieldOfViewSpin->value());
237239
238− Menu::getInstance()->setFaceshiftHostname(ui.faceshiftHostnameEdit->text());
240+ auto faceshift = DependencyManager::get<Faceshift>();
241+ faceshift->setEyeDeflection(ui.faceshiftEyeDeflectionSider->value() /
242+ (float)ui.faceshiftEyeDeflectionSider->maximum());
239243
240− Menu::getInstance()->setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());
241−
242− Menu::getInstance()->setOculusUIAngularSize(ui.oculusUIAngularSizeSpin->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();
244+ faceshift->setHostname(ui.faceshiftHostnameEdit->text());
245+
246+ qApp->getOctreeQuery().setMaxOctreePacketsPerSecond(ui.maxOctreePPSSpin->value());
257247
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());
259253
260254 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());
261265
262266 QMetaObject::invokeMethod(audio.data(), "setOutputBufferSize", Q_ARG(int, ui.outputBufferSizeSpinner->value()));
263267
@@ -266,6 +270,4 @@ void PreferencesDialog::savePreferences() { · 2 unmodified lines
266270 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
267271
268272 Application::getInstance()->resizeGL(glCanvas->width(), glCanvas->height());
269−
270− Application::getInstance()->bumpSettings();
271273 }