Feature/UI section refactor #247

toloudis · 2025-02-25T01:17:29Z

Start to make a more generic ui for setting properties on objects. In this way we will establish patterns for having dockable windows with the lists of editable object properties. Currently only the Camera is implemented, but AreaLight, SphereLight, ClipPlane, Volume, and RenderSettings would follow.

Implementation details are added in inline review comments, see below.

before:

after:

toloudis · 2025-03-09T17:31:40Z

renderlib/core/prty/prtyProperty.h

the naming here is such that core/prty is the name of a library with a (loose) namespace prty that could have many classes in it. Currently prtyProperty is the only one. This is a foundational class that can store a named value for the UI. A future reorg moves core out of renderlib along with many other non-rendering classes.

toloudis · 2025-03-09T17:33:33Z

renderlib/core/prty/prtyProperty.h

+  // non-copy, just use paren operator
+  T& operator()() const { return value; }
+
+  // set up the rule of 5


the following several functions are just boilerplate made explicit for how to copy/move these objects in various c++ language scenarios.

toloudis · 2025-03-09T17:40:19Z

agave_app/GLView3D.cpp

  m_viewerWindow->gesture.input.setDoubleClickTime((double)QApplication::doubleClickInterval() / 1000.0);

+  // camera is created deep down inside m_viewerWindow.
+  m_cameraDataObject = new CameraDataObject(&m_viewerWindow->m_CCamera);


initialization order for cameras is now slightly different so we can introduce the CameraDataObject from which the gui will be constructed.

toloudis · 2025-03-09T19:25:42Z

renderlib/uiInfo.hpp

These are definitions for basic data needed to set up ui controls. This will expand over time.

toloudis · 2025-03-09T19:26:35Z

agave_app/qtControls/controlFactory.h

all the methods in controlFactory are about taking the generic uiInfos and prtyProperties and creating actual Qt user interface that updates the values of the prtyProperties

toloudis · 2025-03-09T19:28:19Z

agave_app/CameraWidget.cpp

+
+#include <QLabel>
+
+QCameraWidget::QCameraWidget(QWidget* pParent, RenderSettings* rs, CameraDataObject* cdo)


now all this class has to do is produce the ui info for each property of the camera, and make calls into the controlFactory to create the ui... as seen below. A sort of ideal world would be where this is just a generic loop over all the properties and the uiinfos.

toloudis · 2025-03-09T19:36:30Z

renderlib/CameraDataObject.hpp

+  prtyProperty<float> FieldOfView{ "FieldOfView", 30.0f };
+  prtyProperty<float> FocalDistance{ "FocalDistance", 0.0f };
+
+  CCamera* m_camera;


note that this class holds on to the actual CCamera which is used for real rendering, so that it can update things properly. Each DataObject class may have different internals in addition to its collection of properties.

renderlib/core/prty/prtyProperty.h

ShrimpCryptid · 2025-03-10T18:11:25Z

renderlib/core/prty/prtyProperty.h

+  // direct assignment from a value
+  prtyProperty& operator=(const T& val)
+  {
+    value = val;
+    return *this;
+  }


Will anything bad happen if this doesn't call notifyAll? Is this assignment operator only used to sync the property value with internal values?

great point here, I'm not actually sure but I think for now I will update it to notify. Or else disable this operator entirely.

ShrimpCryptid · 2025-03-10T18:26:40Z

agave_app/qtControls/controlFactory.h

+QNumericSlider*
+create(const IntSliderSpinnerUiInfo* info, std::shared_ptr<prtyProperty<int>> prop);


Missing equivalent declaration for addRow?

ShrimpCryptid · 2025-03-10T18:37:39Z

agave_app/qtControls/controlFactory.cpp

+  slider->setValue(prop->get(), true);
+  QObject::connect(slider, &QNumericSlider::valueChanged, [slider, prop](double value) { prop->set(value, true); });
+  // TODO how would this capture the "previous" value, for undo?
+  QObject::connect(slider, &QNumericSlider::valueChangeCommit, [slider, prop]() { prop->notifyAll(true); });


Does this still need to call notifyAll if prtyProperty already does so on set?

this piece of code is concerned with the possibility of undo, and that we might not want to undo every single slider move, but still want the slider moves to update the rendering in realtime. It's not worked out well enough yet, and will almost certainly be discarded/reworked.

ShrimpCryptid · 2025-03-10T18:39:44Z

agave_app/CameraWidget.cpp

+  QNumericSlider* slider = addRow(CameraUiDescription::m_exposure, &m_cameraDataObject->Exposure);
+  m_MainLayout.addRow("Exposure", slider);
+  QComboBox* comboBox = addRow(CameraUiDescription::m_exposureIterations, &m_cameraDataObject->ExposureIterations);
+  m_MainLayout.addRow("Exposure Time", comboBox);
+  QCheckBox* checkBox = addRow(CameraUiDescription::m_noiseReduction, &m_cameraDataObject->NoiseReduction);
+  m_MainLayout.addRow("Noise Reduction", checkBox);
+  QNumericSlider* slider2 = addRow(CameraUiDescription::m_apertureSize, &m_cameraDataObject->ApertureSize);
+  m_MainLayout.addRow("Aperture Size", slider2);
+  QNumericSlider* slider3 = addRow(CameraUiDescription::m_fieldOfView, &m_cameraDataObject->FieldOfView);
+  m_MainLayout.addRow("Field of view", slider3);
+  QNumericSlider* slider4 = addRow(CameraUiDescription::m_focalDistance, &m_cameraDataObject->FocalDistance);
+  m_MainLayout.addRow("Focal distance", slider4);


Very clean!

…ling Feature/tfeditor styling

# Conflicts: # agave_app/tfeditor/gradients.cpp

Co-authored-by: Peyton Lee <[email protected]>

…ified

Base automatically changed from feature/update-docs to main March 3, 2025 01:44

toloudis commented Mar 9, 2025

View reviewed changes

renderlib/uiInfo.hpp

Copy link

Contributor Author

toloudis Mar 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are definitions for basic data needed to set up ui controls. This will expand over time.

toloudis commented Mar 9, 2025

View reviewed changes

toloudis marked this pull request as ready for review March 9, 2025 19:34

toloudis requested a review from a team as a code owner March 9, 2025 19:34

toloudis requested review from ShrimpCryptid and rugeli and removed request for a team March 9, 2025 19:34

toloudis commented Mar 9, 2025

View reviewed changes

ShrimpCryptid approved these changes Mar 10, 2025

View reviewed changes

rugeli approved these changes Mar 11, 2025

View reviewed changes

toloudis linked an issue Jun 11, 2025 that may be closed by this pull request

refactor: object properties layer #250

Open

toloudis force-pushed the feature/ui-section-refactor branch from 9a21f5a to 478121d Compare September 3, 2025 16:04

toloudis changed the base branch from main to feature/properties September 3, 2025 16:10

toloudis added 12 commits October 16, 2025 10:50

bump tensorstore

d7b783d

bump libczi

ad917f4

Qt 6.9.3

1fd6e52

bump tensorstore version

2290bf2

try without explicit icu4c

f0ca1c2

don't use vcpkg eigen3

1d62bfe

remove windows eigen flag

125e9c3

add nsis

0ab01dd

alternate install of nsis

4ca85bd

try making a linux artifact while we're at it

2adeafd

try install libczi special for linux

85ce450

wip on linux

a4c97b6

toloudis and others added 29 commits November 27, 2025 07:23

one more try for zlib include fix

3651a56

more explicit attempt

91a7b27

try again

f83048f

go back to just the ssl fix

8116701

try tensorstore system zlib on apple

6bb347b

finish ci fixes

21d6774

update license

9ffde96

add some light/dark mode and wip styling adjustments

90dda8b

dark/light mode styling

d995b6e

antialias the subgrid

1c07fc3

cleanup

58851c5

cleanup

6e15a65

PR review cleanup

9f4364b

Merge pull request #304 from allen-cell-animated/feature/tfeditor-sty…

d601c03

…ling Feature/tfeditor styling

start a property class

7372d42

start building out a better form builder for any object properties

62d1813

refactor, use new CameraDataObject for ui

d9abf2f

move controls into subdir

34ecd33

# Conflicts: # agave_app/tfeditor/gradients.cpp

control factory

c80ec9d

remove the QObject based camera data objects

909c3e7

fix includes

2bbcb28

unit tests for prtyProperty

3435325

use a trait for streamable property value types for debugging

9ec6484

just enforce streamability all the time

b6d7345

separate out the main dock windows

970ead1

bring ui description out of the qt area

685a566

Update renderlib/core/prty/prtyProperty.h

4fa0f15

Co-authored-by: Peyton Lee <[email protected]>

assigning a value to property should trigger the observers to get not…

6dd0226

…ified

implement addrow for int slider/spinner input

d8a50d1

toloudis force-pushed the feature/ui-section-refactor branch from 478121d to d8a50d1 Compare December 6, 2025 00:42


		#include <QLabel>

		QCameraWidget::QCameraWidget(QWidget* pParent, RenderSettings* rs, CameraDataObject* cdo)

		QNumericSlider*
		create(const IntSliderSpinnerUiInfo* info, std::shared_ptr<prtyProperty<int>> prop);

Feature/UI section refactor #247

Are you sure you want to change the base?

Feature/UI section refactor #247

Uh oh!

Conversation

toloudis commented Feb 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

toloudis commented Feb 25, 2025 •

edited

Loading