fixed debug textarea not updating and updated qtutils
This commit is contained in:
parent
3ec9f35fd6
commit
4473aee625
@ -94,7 +94,7 @@ void MainWindow::updateSimu()
|
||||
ui->drawWidget->updateDudesBehavior();
|
||||
ui->drawWidget->setFlatSphere(ui->flatSphereSlider->value());
|
||||
ui->drawWidget->setSurfaceRatio(ui->surfaceRatioSlider->value());
|
||||
if(m_debugEnabled)
|
||||
if(ui->debugGroupBox->isVisible())
|
||||
updateDebugMessage();
|
||||
ui->drawWidget->repaint();
|
||||
}
|
||||
|
@ -26,7 +26,6 @@ private:
|
||||
int m_simSpeed;
|
||||
bool m_simSpeedChanged;
|
||||
bool m_paused;
|
||||
bool m_debugEnabled;
|
||||
Coord m_debugCursorPos;
|
||||
|
||||
void updateDebugMessage();
|
||||
|
@ -23,7 +23,7 @@ EditorImage* QtUtils::loadImage(const QString &filename)
|
||||
img->width = glImage.width();
|
||||
img->height = glImage.height();
|
||||
img->allocate(glImage.byteCount());
|
||||
memcpy(img->pixels, glImage.bits(), glImage.byteCount());
|
||||
memcpy(img->pixels.data(), glImage.bits(), glImage.byteCount());
|
||||
return img;
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ EditorImage::EditorImage(int myWidth, int myHeight, float frequency, float ampli
|
||||
depth = 32;
|
||||
Image::allocate(width*height*depth);
|
||||
|
||||
GLubyte *data = (GLubyte*)Image::pixels;
|
||||
GLubyte *data = (GLubyte*)Image::pixels.data();
|
||||
|
||||
float xFactor = 1.0f / (width - 1);
|
||||
float yFactor = 1.0f / (height - 1);
|
||||
|
Loading…
x
Reference in New Issue
Block a user