Feature/serialize prtyobjects

agave_app/AppearanceDockWidget2.cpp

@@ -5,7 +5,7 @@ QAppearanceDockWidget2::QAppearanceDockWidget2(QWidget* pParent,
                                                ViewerWindow* vw,
                                                AppearanceObject* ado)
   : QDockWidget(pParent)
-  , m_AppearanceWidget(nullptr, rs, ado)
+  , m_AppearanceWidget(nullptr, rs, vw, ado)
 {
   setWindowTitle("Appearance");
 

agave_app/AppearanceWidget.cpp

@@ -32,33 +32,33 @@ QAppearanceWidget2::QAppearanceWidget2(QWidget* pParent, RenderSettings* rs, Vie
   //   }
   // }
 
-  QComboBox* rendererType = addRow(*m_appearanceDataObject->getRendererTypeUiInfo());
-  m_MainLayout.addRow("Renderer", rendererType);
-  QComboBox* shadingType = addRow(*m_appearanceDataObject->getShadingTypeUiInfo());
-  m_MainLayout.addRow("Shading Type", shadingType);
-  QNumericSlider* densityScale = addRow(*m_appearanceDataObject->getDensityScaleUiInfo());
-  m_MainLayout.addRow("Scattering Density", densityScale);
-  QNumericSlider* gradientFactor = addRow(*m_appearanceDataObject->getGradientFactorUiInfo());
-  m_MainLayout.addRow("Shading Type Mixture", gradientFactor);
-  QNumericSlider* stepSizePrimaryRay = addRow(*m_appearanceDataObject->getStepSizePrimaryRayUiInfo());
-  m_MainLayout.addRow("Step Size Primary Ray", stepSizePrimaryRay);
-  QNumericSlider* stepSizeSecondaryRay = addRow(*m_appearanceDataObject->getStepSizeSecondaryRayUiInfo());
-  m_MainLayout.addRow("Step Size Secondary Ray", stepSizeSecondaryRay);
-  QCheckBox* interpolateCheckBox = addRow(*m_appearanceDataObject->getInterpolateUiInfo());
-  m_MainLayout.addRow("Interpolate", interpolateCheckBox);
-  QColorPushButton* backgroundColorButton = addRow(*m_appearanceDataObject->getBackgroundColorUiInfo());
-  m_MainLayout.addRow("Background Color", backgroundColorButton);
-  QCheckBox* showBoundingBoxCheckBox = addRow(*m_appearanceDataObject->getShowBoundingBoxUiInfo());
-  m_MainLayout.addRow("Show Bounding Box", showBoundingBoxCheckBox);
-  QColorPushButton* boundingBoxColorButton = addRow(*m_appearanceDataObject->getBoundingBoxColorUiInfo());
-  m_MainLayout.addRow("Bounding Box Color", boundingBoxColorButton);
-  QCheckBox* showScaleBarCheckBox = addRow(*m_appearanceDataObject->getShowScaleBarUiInfo());
-  m_MainLayout.addRow("Show Scale Bar", showScaleBarCheckBox);
+  // QComboBox* rendererType = addRow(*m_appearanceDataObject->getRendererTypeUiInfo());
+  // m_MainLayout.addRow("Renderer", rendererType);
+  // QComboBox* shadingType = addRow(*m_appearanceDataObject->getShadingTypeUiInfo());
+  // m_MainLayout.addRow("Shading Type", shadingType);
+  // QNumericSlider* densityScale = addRow(*m_appearanceDataObject->getDensityScaleUiInfo());
+  // m_MainLayout.addRow("Scattering Density", densityScale);
+  // QNumericSlider* gradientFactor = addRow(*m_appearanceDataObject->getGradientFactorUiInfo());
+  // m_MainLayout.addRow("Shading Type Mixture", gradientFactor);
+  // QNumericSlider* stepSizePrimaryRay = addRow(*m_appearanceDataObject->getStepSizePrimaryRayUiInfo());
+  // m_MainLayout.addRow("Step Size Primary Ray", stepSizePrimaryRay);
+  // QNumericSlider* stepSizeSecondaryRay = addRow(*m_appearanceDataObject->getStepSizeSecondaryRayUiInfo());
+  // m_MainLayout.addRow("Step Size Secondary Ray", stepSizeSecondaryRay);
+  // QCheckBox* interpolateCheckBox = addRow(*m_appearanceDataObject->getInterpolateUiInfo());
+  // m_MainLayout.addRow("Interpolate", interpolateCheckBox);
+  // QColorPushButton* backgroundColorButton = addRow(*m_appearanceDataObject->getBackgroundColorUiInfo());
+  // m_MainLayout.addRow("Background Color", backgroundColorButton);
+  // QCheckBox* showBoundingBoxCheckBox = addRow(*m_appearanceDataObject->getShowBoundingBoxUiInfo());
+  // m_MainLayout.addRow("Show Bounding Box", showBoundingBoxCheckBox);
+  // QColorPushButton* boundingBoxColorButton = addRow(*m_appearanceDataObject->getBoundingBoxColorUiInfo());
+  // m_MainLayout.addRow("Bounding Box Color", boundingBoxColorButton);
+  // QCheckBox* showScaleBarCheckBox = addRow(*m_appearanceDataObject->getShowScaleBarUiInfo());
+  // m_MainLayout.addRow("Show Scale Bar", showScaleBarCheckBox);
 
-  QObject::connect(rendererType, &QComboBox::currentIndexChanged, [this, vw](int index) { vw->setRenderer(index); });
-  QObject::connect(shadingType, &QComboBox::currentIndexChanged, [this, gradientFactor](int index) {
-    gradientFactor->setEnabled(index == 2);
-  });
+  // QObject::connect(rendererType, &QComboBox::currentIndexChanged, [this, vw](int index) { vw->setRenderer(index); });
+  // QObject::connect(shadingType, &QComboBox::currentIndexChanged, [this, gradientFactor](int index) {
+  //   gradientFactor->setEnabled(index == 2);
+  // });
 }
 
 QSize

agave_app/AppearanceWidget.h

@@ -32,5 +32,5 @@ class QAppearanceWidget2 : public QWidget
   RenderSettings* m_renderSettings;
 
 private:
-  AppearanceObject* m_appearanceDataObject;
+  AppearanceObject* m_appearanceObject;
 };

agave_app/CMakeLists.txt

@@ -37,10 +37,6 @@ target_sources(agaveapp PRIVATE
 	"${CMAKE_CURRENT_SOURCE_DIR}/cgiparser.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/commandBuffer.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/commandBuffer.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/Film.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/Film.h"
-	"${CMAKE_CURRENT_SOURCE_DIR}/Focus.cpp"
-	"${CMAKE_CURRENT_SOURCE_DIR}/Focus.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/GLView3D.cpp"
 	"${CMAKE_CURRENT_SOURCE_DIR}/GLView3D.h"
 	"${CMAKE_CURRENT_SOURCE_DIR}/loadDialog.cpp"

agave_app/CameraDockWidget.cpp

@@ -2,7 +2,7 @@
 
 QCameraDockWidget::QCameraDockWidget(QWidget* pParent, RenderSettings* rs, CameraObject* cdo)
   : QDockWidget(pParent)
-  , m_CameraWidget(nullptr, cam, rs, cdo)
+  , m_CameraWidget(nullptr, rs, cdo)
 {
   setWindowTitle("Camera");
 

agave_app/CameraWidget.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Camera.h"
 #include "qtControls/Controls.h"
 
 // #include "renderlib/core/prty/prtyProperty.h"

agave_app/GLView3D.cpp

@@ -140,8 +140,6 @@ GLView3D::onNewImage(Scene* scene)
 
 GLView3D::~GLView3D()
 {
-  delete m_appearanceDataObject;
-
   makeCurrent();
   check_gl("view dtor makecurrent");
   // doneCurrent();

agave_app/GLView3D.h

@@ -12,8 +12,8 @@
 #include <QOpenGLWidget>
 #include <QTimer>
 
-class AppearanceDataObject;
-class CameraDataObject;
+class AppearanceObject;
+class CameraObject;
 class CStatus;
 class ImageXYZC;
 class IRenderWindow;
@@ -70,7 +70,6 @@ class GLView3D : public QOpenGLWidget
   // tied to the above camera.  CCamera must outlive this:
   // CameraObject* getCameraDataObject() { return m_cameraObject; }
   void setCameraObject(CameraObject* cameraObject);
-  AppearanceObject* getAppearanceDataObject() { return m_appearanceDataObject; }
 
   void fromViewerState(const Serialize::ViewerState& s);