Skip to content

Commit 8dd58a2

Browse files
committed
Remove restriction on compare data and readback PV presence
1 parent b7e9185 commit 8dd58a2

File tree

3 files changed

+6
-19
lines changed

3 files changed

+6
-19
lines changed

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ComparisonDataEditorDialog.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ConfigPvEntry.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,13 @@ public void setToleranceProperty(Double toleranceProperty) {
7979
}
8080

8181
public ConfigPv toConfigPv() {
82-
ConfigPv configPv = ConfigPv.builder()
82+
return ConfigPv.builder()
8383
.pvName(pvNameProperty.get())
8484
.readbackPvName(readBackPvNameProperty.get())
8585
.readOnly(readOnlyProperty.get())
86+
.pvCompareMode(pvCompareModeProperty.get())
87+
.tolerance(toleranceProperty.get())
8688
.build();
87-
if (!readBackPvNameProperty.isEmpty().get() &&
88-
pvCompareModeProperty.get() != null) {
89-
configPv.setPvCompareMode(pvCompareModeProperty.get());
90-
configPv.setTolerance(toleranceProperty.get());
91-
}
92-
return configPv;
9389
}
9490

9591
@Override

app/save-and-restore/app/src/main/java/org/phoebus/applications/saveandrestore/ui/configuration/ConfigurationController.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ public void initialize() {
269269
values.add(0, null);
270270
ComboBoxTableCell<ConfigPvEntry, PvCompareMode> tableCell = new ComboBoxTableCell<>(values) {
271271

272+
/*
272273
@Override
273274
public void startEdit() {
274275
String readBackPvName = getTableView().getItems().get(getIndex()).getReadBackPvNameProperty().get();
@@ -279,6 +280,8 @@ public void startEdit() {
279280
super.startEdit();
280281
}
281282
283+
*/
284+
282285
@Override
283286
public void commitEdit(PvCompareMode pvCompareMode) {
284287
if (pvCompareMode == null) {

0 commit comments

Comments
 (0)