Skip to content

Add greyscale colormap to 2d viewer #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanicaSTFC wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add greyscale colormap to 2d viewer #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e4eea2
First attempt
DanicaSTFC Apr 23, 2025
c806d9f
Update colourbar range
DanicaSTFC Apr 25, 2025
873df04
fix rendering issues
DanicaSTFC Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 85 additions & 2 deletions src/idvc/dvc_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def __init__(self):
self.CreateWorkingTempFolder()

#Load Settings:
self.settings = QSettings("CCPi", "DVC Interface v24.0.1")
self.settings = QSettings("CCPi", "DVC Interface v24.1.1")

if self.settings.value("copy_files"):
self.copy_files = True
Expand Down Expand Up @@ -1296,7 +1296,7 @@ def CreateRegistrationPanel(self):
self.registration_parameters = rp

def createRegistrationViewer(self):
# print("Create reg viewer")
print("Create reg viewer")
#Get current orientation and slice of 2D viewer, registration viewer will be set up to have these
self.orientation = self.vis_widget_2D.frame.viewer.getSliceOrientation()
self.current_slice = self.vis_widget_2D.frame.viewer.getActiveSlice()
Expand Down Expand Up @@ -1324,6 +1324,7 @@ def createRegistrationViewer(self):
#Clear for next image visualisation:
self.orientation = None
self.current_slice = None
self._addColorBarRegistration(self.vis_widget_reg.frame.viewer)

self.vis_widget_reg.frame.viewer.style.AddObserver("MouseWheelForwardEvent",
self.vis_widget_reg.PlaneClipper.UpdateClippingPlanes, 0.9)
Expand Down Expand Up @@ -1700,6 +1701,7 @@ def confirmRegistration(self):
- the widgets for setting point0, the registration box size and the translation are enabled
- the full dimension (possibly downsampled) reference image is displayed on the viewer.
"""
print("confirming")
rp = self.registration_parameters
v = self.vis_widget_reg.frame.viewer
self.registration_parameters['start_registration_button'].setText("Restart Registration")
Expand All @@ -1713,9 +1715,11 @@ def confirmRegistration(self):
rp['set_auto_reg_button'].setVisible(False)
rp['set_auto_reg_label'].setVisible(False)
v.setInput3DData(self.ref_image_data)
self.scalar_bar.SetVisibility(False)
v.style.UpdatePipeline()
if rp['point_zero_entry'].text() != "":
self.createPoint0(self.getPoint0WorldCoords())


def UpdateViewerSettingsPanelForRegistration(self):
vs_widgets = self.visualisation_setting_widgets
Expand Down Expand Up @@ -2092,6 +2096,7 @@ def reg_viewer_update(self, type = None):
self.subtract.Update()
# update
v.setInputData(self.subtract.GetOutput())
self.updateColorBarFromDifferenceImage()


if type == 'starting registration':
Expand All @@ -2106,6 +2111,7 @@ def reg_viewer_update(self, type = None):
if (self.progress_window.isVisible()):
self.progress_window.setValue(100)
self.progress_window.close()
v.ren.Render()

def OnKeyPressEventForRegistration(self, interactor, event):
key_code = interactor.GetKeyCode()
Expand Down Expand Up @@ -3924,6 +3930,83 @@ def _addColorBar(self, viewer_widget):
else:
logging.warning('Wrong viewer type {}'.format(type(viewer)))

def _addColorBarRegistration(self, viewer):
# create the scalar_bar
scalar_bar = vtk.vtkScalarBarActor()
# scalar_bar.SetOrientationToHorizontal()
scalar_bar.SetOrientationToVertical()

# Adjust the size of the scalar bar (set width and height as needed)
# Width as a fraction of the window or scene size
original_height = scalar_bar.GetHeight()
scalar_bar.SetHeight(0.4) # Height as a fraction of the window or scene size
scalar_bar.SetWidth(scalar_bar.GetWidth() * scalar_bar.GetHeight() / original_height)
scalar_bar.SetTitle('Difference \nVref − Vcor')
fontsize = self.settings_window.fontsize_widget.value()
title_property = scalar_bar.GetTitleTextProperty()
title_property.SetJustificationToCentered()
title_property.SetFontSize(fontsize)
title_property.SetItalic(False)
print(scalar_bar.GetVerticalTitleSeparation())
scalar_bar.SetVerticalTitleSeparation(20)
label_property = scalar_bar.GetLabelTextProperty()
label_property.SetFontSize(fontsize)
label_property.SetItalic(False)
scalar_bar.SetTextPad(4)
#data = self.ref_image_data
#data = self.subtract.GetOutput()
#scalars = data.GetPointData().GetScalars()
#if scalars:
# cmin, cmax = scalars.GetRange()
#else:
# print("No scalars found in ref_image_data.")
# cmin, cmax = 0, 1 # fallback
#print("cmin cmax", cmin, cmax)
lut2D = self._createLookupTableGrayscale()
#lut2D.SetTableRange(cmin, cmax)
#lut2D.Build()
scalar_bar.SetLookupTable(lut2D)
viewer.getRenderer().AddActor2D(scalar_bar)
print("I created the colorbar")
scalar_bar.SetVisibility(False)
self.scalar_bar = scalar_bar


def _createLookupTableGrayscale(self):
lut = vtk.vtkLookupTable()
lut.SetNumberOfTableValues(256)
lut.SetRange(0.0, 1.0) # Fixed range

list(map(
lambda i: lut.SetTableValue(i, i / 255.0, i / 255.0, i / 255.0, 1.0),
range(256)
))
lut.Build()
return lut

def updateColorBarFromDifferenceImage(self):
self.scalar_bar.SetVisibility(True)
# Get the output data from the subtract filter
data = self.subtract.GetOutput()

# Retrieve the scalar data from the output
scalars = data.GetPointData().GetScalars()

# Check if scalars exist in the data

# Get the min and max scalar values


cmin, cmax = scalars.GetRange()
print(f"Updating color bar with range: {cmin} to {cmax}")

lut2D = self.scalar_bar.GetLookupTable()
current_range = lut2D.GetTableRange()
if (cmin, cmax) != current_range:
lut2D.SetTableRange(cmin, cmax) # Set the new range based on the data
self.scalar_bar.Modified()
self.vis_widget_reg.frame.viewer.getRenderer().GetRenderWindow().Render()

def createVectors2D(self, displ, viewer_widget):
'''Creates displacement vectors in 2D

Expand Down
2 changes: 2 additions & 0 deletions src/idvc/ui/windows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ def displayImageData(self):
if self.parent.current_slice:
if self.parent.current_slice <= self.frame.viewer.img3D.GetExtent()[self.frame.viewer.getSliceOrientation()*2+1]:
self.frame.viewer.displaySlice(self.parent.current_slice)
print("display slice")
print("slice is",self.parent.current_slice)


if self.viewer == viewer3D:
Expand Down