Skip to content

Commit a73b8c6

Browse files
jessdtatejessdtate
committed
added nan checkbox to node mapping. also changed some tab orderings
1 parent 37c3e77 commit a73b8c6

File tree

5 files changed

+83
-9
lines changed

5 files changed

+83
-9
lines changed

‎src/Interface/Modules/Fields/CreateLatVol.ui‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,17 @@
205205
</item>
206206
</layout>
207207
</widget>
208+
<tabstops>
209+
<tabstop>xSizeSpinBox_</tabstop>
210+
<tabstop>ySizeSpinBox_</tabstop>
211+
<tabstop>zSizeSpinBox_</tabstop>
212+
<tabstop>padPercentageSpinBox_</tabstop>
213+
<tabstop>dataAtNodesButton_</tabstop>
214+
<tabstop>dataAtCellsButton_</tabstop>
215+
<tabstop>dataAtNoneButton_</tabstop>
216+
<tabstop>elementSizeNormalizedButton_</tabstop>
217+
<tabstop>elementSizeOneButton_</tabstop>
218+
</tabstops>
208219
<resources/>
209220
<connections/>
210221
</ui>

‎src/Interface/Modules/Fields/MapFieldDataFromSourceToDestinationDialog.ui‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,13 @@
147147
</item>
148148
</layout>
149149
</widget>
150+
<tabstops>
151+
<tabstop>methodComboBox_</tabstop>
152+
<tabstop>maxDistanceSpinBox_</tabstop>
153+
<tabstop>noMaxCheckBox_</tabstop>
154+
<tabstop>defaultValueDoubleSpinBox_</tabstop>
155+
<tabstop>useNanForUnassignedValuesCheckBox_</tabstop>
156+
</tabstops>
150157
<resources/>
151158
<connections>
152159
<connection>
@@ -156,12 +163,12 @@
156163
<slot>setDisabled(bool)</slot>
157164
<hints>
158165
<hint type="sourcelabel">
159-
<x>70</x>
160-
<y>139</y>
166+
<x>134</x>
167+
<y>107</y>
161168
</hint>
162169
<hint type="destinationlabel">
163-
<x>187</x>
164-
<y>114</y>
170+
<x>361</x>
171+
<y>102</y>
165172
</hint>
166173
</hints>
167174
</connection>
@@ -172,8 +179,8 @@
172179
<slot>setDisabled(bool)</slot>
173180
<hints>
174181
<hint type="sourcelabel">
175-
<x>50</x>
176-
<y>197</y>
182+
<x>236</x>
183+
<y>206</y>
177184
</hint>
178185
<hint type="destinationlabel">
179186
<x>378</x>

‎src/Interface/Modules/Fields/MapFieldDataOntoNodes.ui‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,21 +117,52 @@
117117
</property>
118118
</widget>
119119
</item>
120-
<item row="3" column="0">
120+
<item row="5" column="0">
121121
<widget class="QLabel" name="label_6">
122122
<property name="text">
123123
<string>Maximum Distance:</string>
124124
</property>
125125
</widget>
126126
</item>
127-
<item row="3" column="1">
127+
<item row="5" column="1">
128128
<widget class="QLineEdit" name="maximumDistanceLineEdit_"/>
129129
</item>
130+
<item row="4" column="1">
131+
<widget class="QCheckBox" name="useNanForUnassignedValuesCheckBox_">
132+
<property name="text">
133+
<string>Use NaN</string>
134+
</property>
135+
</widget>
136+
</item>
130137
</layout>
131138
</widget>
132139
</item>
133140
</layout>
134141
</widget>
142+
<tabstops>
143+
<tabstop>quantityComboBox_</tabstop>
144+
<tabstop>interpolationComboBox_</tabstop>
145+
<tabstop>outsideValueDoubleSpinBox_</tabstop>
146+
<tabstop>useNanForUnassignedValuesCheckBox_</tabstop>
147+
<tabstop>maximumDistanceLineEdit_</tabstop>
148+
</tabstops>
135149
<resources/>
136-
<connections/>
150+
<connections>
151+
<connection>
152+
<sender>useNanForUnassignedValuesCheckBox_</sender>
153+
<signal>toggled(bool)</signal>
154+
<receiver>outsideValueDoubleSpinBox_</receiver>
155+
<slot>setDisabled(bool)</slot>
156+
<hints>
157+
<hint type="sourcelabel">
158+
<x>242</x>
159+
<y>104</y>
160+
</hint>
161+
<hint type="destinationlabel">
162+
<x>255</x>
163+
<y>78</y>
164+
</hint>
165+
</hints>
166+
</connection>
167+
</connections>
137168
</ui>

‎src/Interface/Modules/Fields/MapFieldDataOntoNodesDialog.cc‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <Core/Algorithms/Legacy/Fields/Mapping/MapFieldDataOntoNodes.h>
3131
#include <Dataflow/Network/ModuleStateInterface.h> ///TODO: extract into intermediate
3232
#include <Core/Logging/Log.h>
33+
#include <Core/Math/MiscMath.h>
3334

3435
using namespace SCIRun::Gui;
3536
using namespace SCIRun::Dataflow::Networks;
@@ -46,4 +47,23 @@ MapFieldDataOntoNodesDialog::MapFieldDataOntoNodesDialog(const std::string& name
4647
addComboBoxManager(interpolationComboBox_, Parameters::InterpolationModel);
4748
addDoubleSpinBoxManager(outsideValueDoubleSpinBox_, Parameters::OutsideValue);
4849
addDoubleLineEditManager(maximumDistanceLineEdit_, Parameters::MaxDistance);
50+
connect(useNanForUnassignedValuesCheckBox_, SIGNAL(stateChanged(int)), this, SLOT(setUseNanForUnassignedValues(int)));
4951
}
52+
53+
void MapFieldDataOntoNodesDialog::pullSpecial()
54+
{
55+
if (IsNan(state_->getValue(Parameters::OutsideValue).toDouble()))
56+
{
57+
useNanForUnassignedValuesCheckBox_->setChecked(true);
58+
}
59+
}
60+
61+
void MapFieldDataOntoNodesDialog::setUseNanForUnassignedValues(int state)
62+
{
63+
if (!pulling_)
64+
{
65+
if (0 != state)
66+
state_->setValue(Parameters::OutsideValue, std::numeric_limits<double>::quiet_NaN());
67+
}
68+
}
69+

‎src/Interface/Modules/Fields/MapFieldDataOntoNodesDialog.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ class SCISHARE MapFieldDataOntoNodesDialog : public ModuleDialogGeneric,
4545
MapFieldDataOntoNodesDialog(const std::string& name,
4646
SCIRun::Dataflow::Networks::ModuleStateHandle state,
4747
QWidget* parent = 0);
48+
protected:
49+
virtual void pullSpecial() override;
50+
private Q_SLOTS:
51+
void setUseNanForUnassignedValues(int state);
52+
4853
};
4954

5055
}

0 commit comments

Comments
 (0)