Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 03:46:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars

Browse source
This commit is contained in:
Howard Stearns 2015-10-29 08:27:12 -07:00
commit c47d246987
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/ui/AudioStatsDialog.cpp
View file

@ -65,11 +65,12 @@ AudioStatsDialog::AudioStatsDialog(QWidget* parent) :
// Get statistics from the Audio Client // Get statistics from the Audio Client
_stats = &DependencyManager::get<AudioClient>()->getStats(); _stats = &DependencyManager::get<AudioClient>()->getStats();
// Create layouter // Create layout
_form = new QFormLayout(); _form = new QFormLayout();
_form->setSizeConstraint(QLayout::SetFixedSize);
QDialog::setLayout(_form); QDialog::setLayout(_form);
// Load and initilize all channels // Load and initialize all channels
renderStats(); renderStats();
_audioDisplayChannels = QVector<QVector<AudioStatsDisplay*>>(1); _audioDisplayChannels = QVector<QVector<AudioStatsDisplay*>>(1);
@ -80,10 +81,8 @@ AudioStatsDialog::AudioStatsDialog(QWidget* parent) :
_downstreamID = addChannel(_form, _downstreamStats, COLOR3); _downstreamID = addChannel(_form, _downstreamStats, COLOR3);
_upstreamInjectedID = addChannel(_form, _upstreamInjectedStats, COLOR0); _upstreamInjectedID = addChannel(_form, _upstreamInjectedStats, COLOR0);
connect(averageUpdateTimer, SIGNAL(timeout()), this, SLOT(updateTimerTimeout())); connect(averageUpdateTimer, SIGNAL(timeout()), this, SLOT(updateTimerTimeout()));
averageUpdateTimer->start(1000); averageUpdateTimer->start(1000);
} }
int AudioStatsDialog::addChannel(QFormLayout* form, QVector<QString>& stats, const unsigned color) { int AudioStatsDialog::addChannel(QFormLayout* form, QVector<QString>& stats, const unsigned color) {
@ -243,7 +242,6 @@ void AudioStatsDialog::paintEvent(QPaintEvent* event) {
} }
QDialog::paintEvent(event); QDialog::paintEvent(event);
setFixedSize(width(), height());
} }
void AudioStatsDialog::reject() { void AudioStatsDialog::reject() {

4
interface/src/ui/BandwidthDialog.cpp
View file

@ -72,8 +72,9 @@ BandwidthDialog::BandwidthDialog(QWidget* parent) :
this->setWindowTitle("Bandwidth Details"); this->setWindowTitle("Bandwidth Details");
// Create layouter // Create layout
QFormLayout* form = new QFormLayout(); QFormLayout* form = new QFormLayout();
form->setSizeConstraint(QLayout::SetFixedSize);
this->QDialog::setLayout(form); this->QDialog::setLayout(form);
QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>(); QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
@ -118,7 +119,6 @@ void BandwidthDialog::paintEvent(QPaintEvent* event) {
for (unsigned int i=0; i<_CHANNELCOUNT; i++) for (unsigned int i=0; i<_CHANNELCOUNT; i++)
_allChannelDisplays[i]->paint(); _allChannelDisplays[i]->paint();
this->QDialog::paintEvent(event); this->QDialog::paintEvent(event);
this->setFixedSize(this->width(), this->height());
} }
void BandwidthDialog::reject() { void BandwidthDialog::reject() {