From a31f51672fe92d8d5cb2c9319a0ba35a52d3b51b Mon Sep 17 00:00:00 2001 From: David Doan Date: Wed, 13 Dec 2023 01:37:24 -0500 Subject: grinds --- src/mainwindow.cpp | 53 +++++++++++++++++++++++---------------------- src/raytracer/raytracer.cpp | 4 ++-- 2 files changed, 29 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1adb66d..f096b7e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -384,158 +384,159 @@ void MainWindow::onValChangexySlider(int newValue) { //wSlider->setValue(newValue); xyBox->setValue(newValue/100.f); settings.xy = xyBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangexyBox(double newValue) { xySlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.xy = xyBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangexzSlider(int newValue) { //wSlider->setValue(newValue); xzBox->setValue(newValue/100.f); settings.xz = xzBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangexzBox(double newValue) { xzSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.xz = xzBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangexwSlider(int newValue) { //wSlider->setValue(newValue); xwBox->setValue(newValue/100.f); settings.xw = xwBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangexwBox(double newValue) { xwSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.xw = xwBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeyzSlider(int newValue) { //wSlider->setValue(newValue); yzBox->setValue(newValue/100.f); settings.yz = yzBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeyzBox(double newValue) { yzSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.yz = yzBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeywSlider(int newValue) { //wSlider->setValue(newValue); ywBox->setValue(newValue/100.f); settings.yw = ywBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeywBox(double newValue) { ywSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.yw = ywBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangezwSlider(int newValue) { //wSlider->setValue(newValue); zwBox->setValue(newValue/100.f); settings.zw = zwBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangezwBox(double newValue) { zwSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.zw = zwBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeRotationSlider(int newValue) { //wSlider->setValue(newValue); rotationBox->setValue(newValue/100.f); settings.rotation = rotationBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeRotationBox(double newValue) { rotationSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.rotation = rotationBox->value(); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::onValChangeWSlider(int newValue) { //wSlider->setValue(newValue); wBox->setValue(newValue/100.f); settings.w = wBox->value(); - // rayTracer->settingsChanged(imageLabel); - ray->wSliderChanged(imageLabel); + rayTracer->settingsChanged(imageLabel); + // ray->wSliderChanged(imageLabel); } void MainWindow::onValChangeWBox(double newValue) { wSlider->setValue(int(newValue*100.f)); //wBox->setValue(newValue); settings.w = wBox->value(); - // rayTracer->settingsChanged(imageLabel); - ray->wSliderChanged(imageLabel); + rayTracer->settingsChanged(imageLabel); + // ray->wSliderChanged(imageLabel); } void MainWindow::onRotateNegative() { - settings.negative = !settings.negative; + // settings.negative = !settings.negative; + rayTracer->settingsChanged(imageLabel); } void MainWindow::updateXySlider(double value) { xySlider->setValue(int(value*100.f)); xyBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateXzSlider(double value) { xzSlider->setValue(int(value*100.f)); xzBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateXwSlider(double value) { xwSlider->setValue(int(value*100.f)); xwBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateYzSlider(double value) { yzSlider->setValue(int(value*100.f)); yzBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateYwSlider(double value) { ywSlider->setValue(int(value*100.f)); ywBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateZwSlider(double value) { zwSlider->setValue(int(value*100.f)); zwBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } void MainWindow::updateRotationSlider(float value) { rotationSlider->setValue(int(value*100.f)); rotationBox->setValue(value); - rayTracer->settingsChanged(imageLabel); + // rayTracer->settingsChanged(imageLabel); } \ No newline at end of file diff --git a/src/raytracer/raytracer.cpp b/src/raytracer/raytracer.cpp index d9d467d..449a04a 100644 --- a/src/raytracer/raytracer.cpp +++ b/src/raytracer/raytracer.cpp @@ -221,9 +221,9 @@ void RayTracer::settingsChanged(QLabel* imageLabel) { m_image = image; } -void RayTracer::wSliderChanged(QLabel* imageLabel) { +// void RayTracer::wSliderChanged(QLabel* imageLabel) { -} +// } void RayTracer::keyPressEvent(QKeyEvent *event) { m_keyMap[Qt::Key(event->key())] = true; -- cgit v1.2.3-70-g09d2