Skip to content

Commit

Permalink
#66: Removed camera control widgets
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoshEhrlich
JoshEhrlich committed Nov 5, 2021
1 parent 908987d commit f2b2a57
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 116 deletions.
14 changes: 7 additions & 7 deletions LumpNav2/LumpNav2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ def setup(self):
self.ui.deleteAllFiducialsButton.connect('clicked()', self.onDeleteAllFiducialsClicked)
self.ui.selectPointsToEraseButton.connect('toggled(bool)', self.onSelectPointsToEraseClicked)
self.ui.markPointCauteryTipButton.connect('clicked()', self.onMarkPointCauteryTipClicked)
self.ui.startStopRecordingButton.connect('toggled(bool)', self.onStartStopRecordingClicked)
self.ui.startStopRecordingButton.connect('toggled(bool)', self.onStartStopRecordingClicked)
self.ui.freezeUltrasoundButton.connect('toggled(bool)', self.onFreezeUltrasoundClicked)
self.pivotSamplingTimer.connect('timeout()', self.onPivotSamplingTimeout)
self.initializeParameterNode() # Make sure parameter node is initialized (needed for module reload)
Expand Down Expand Up @@ -739,12 +739,12 @@ def updateGUIButtons(self):
self.ui.bottomAutoCenterCameraButton.setChecked(False)
self.ui.bottomAutoCenterCameraButton.blockSignals(blockSignalState)

blockSignalState = self.ui.bottomBullseyeCameraButton.blockSignals(True)
if (self.viewpointLogic.getViewpointForViewNode(centerViewNode).isCurrentModeBullseye()):
self.ui.bottomBullseyeCameraButton.setChecked(True)
else:
self.ui.bottomBullseyeCameraButton.setChecked(False)
self.ui.bottomBullseyeCameraButton.blockSignals(blockSignalState)
#blockSignalState = self.ui.bottomBullseyeCameraButton.blockSignals(True)
#if (self.viewpointLogic.getViewpointForViewNode(centerViewNode).isCurrentModeBullseye()):
# self.ui.bottomBullseyeCameraButton.setChecked(True)
#else:
# self.ui.bottomBullseyeCameraButton.setChecked(False)
#self.ui.bottomBullseyeCameraButton.blockSignals(blockSignalState)

def setCustomStyle(self, visible):
"""
Expand Down
113 changes: 4 additions & 109 deletions LumpNav2/Resources/UI/LumpNav2.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,16 +216,6 @@
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QPushButton" name="bottomBullseyeCameraButton">
<property name="text">
<string>Bottom camera</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="toolModelButton">
<property name="text">
Expand Down Expand Up @@ -351,103 +341,13 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
<widget class="QLabel" name="fieldOfViewLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Field of view (degrees):&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="ctkSliderWidget" name="fieldOfViewSlider">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<double>30.000000000000000</double>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<item>
<widget class="QLabel" name="leftRightLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Leftt/Right (mm):&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="ctkSliderWidget" name="cameraXPosSlider">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<double>30.000000000000000</double>
</property>
</widget>
</item>
</layout>
<layout class="QHBoxLayout" name="horizontalLayout_10"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
<widget class="QLabel" name="downUpLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Down/Up (mm):&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="ctkSliderWidget" name="cameraYPosSlider">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<double>30.000000000000000</double>
</property>
</widget>
</item>
</layout>
<layout class="QHBoxLayout" name="horizontalLayout_11"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="QLabel" name="frontBackLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Front/Back (mm):&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item>
<widget class="ctkSliderWidget" name="cameraZPosSlider">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<double>30.000000000000000</double>
</property>
</widget>
</item>
</layout>
<layout class="QHBoxLayout" name="horizontalLayout_12"/>
</item>
<item>
<widget class="ctkCollapsibleButton" name="contourAdjustmentCollpsibleButton">
Expand Down Expand Up @@ -481,7 +381,7 @@
<item>
<widget class="ctkCollapsibleButton" name="advancedCollapsibleButton">
<property name="text">
<string>Advanced</string>
<string>Settings</string>
</property>
<property name="checked">
<bool>false</bool>
Expand Down Expand Up @@ -624,11 +524,6 @@
<header>ctkCollapsibleButton.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ctkSliderWidget</class>
<extends>QWidget</extends>
<header>ctkSliderWidget.h</header>
</customwidget>
<customwidget>
<class>qMRMLWidget</class>
<extends>QWidget</extends>
Expand Down

0 comments on commit f2b2a57

Please sign in to comment.