mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 03:57:26 -05:00
Compare commits
1 Commits
master
...
2687-histo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
291853c32e |
@@ -42,7 +42,6 @@ public class ChannelDFTFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorChannelDFT(channelCount);
|
return new VectorChannelDFT(channelCount);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarChannelDFT(channelCount);
|
return new ScalarChannelDFT(channelCount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ public class DcRemovalFilterFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorDcRemovalFilter(gain);
|
return new VectorDcRemovalFilter(gain);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarDcRemovalFilter(gain);
|
return new ScalarDcRemovalFilter(gain);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ public class FmDemodulatorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new VectorFMDemodulator512();
|
return new VectorFMDemodulator512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarFMDemodulator();
|
return new ScalarFMDemodulator();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ public class ComplexGainFactory
|
|||||||
return new VectorComplexGainControl();
|
return new VectorComplexGainControl();
|
||||||
}
|
}
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ComplexGainControl();
|
return new ComplexGainControl();
|
||||||
}
|
}
|
||||||
@@ -65,7 +64,6 @@ public class ComplexGainFactory
|
|||||||
return new VectorComplexGain(gain);
|
return new VectorComplexGain(gain);
|
||||||
}
|
}
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarComplexGain(gain);
|
return new ScalarComplexGain(gain);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ public class MagnitudeFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new VectorMagnitudeCalculator512();
|
return new VectorMagnitudeCalculator512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarMagnitudeCalculator();
|
return new ScalarMagnitudeCalculator();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ public class ComplexMixerFactory
|
|||||||
return new VectorComplexMixer(frequency, sampleRate);
|
return new VectorComplexMixer(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
{
|
{
|
||||||
return new ScalarComplexMixer(frequency, sampleRate);
|
return new ScalarComplexMixer(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ public class OscillatorFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorRealOscillator(frequency, sampleRate);
|
return new VectorRealOscillator(frequency, sampleRate);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarRealOscillator(frequency, sampleRate);
|
return new ScalarRealOscillator(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
@@ -70,7 +69,6 @@ public class OscillatorFactory
|
|||||||
case VECTOR_SIMD_PREFERRED:
|
case VECTOR_SIMD_PREFERRED:
|
||||||
return new VectorComplexOscillator(frequency, sampleRate);
|
return new VectorComplexOscillator(frequency, sampleRate);
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new ScalarComplexOscillator(frequency, sampleRate);
|
return new ScalarComplexOscillator(frequency, sampleRate);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,8 +45,7 @@ public class DifferentialDemodulatorFactory
|
|||||||
case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate);
|
case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate);
|
||||||
case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate);
|
case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate);
|
||||||
case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate);
|
case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate);
|
||||||
case SCALAR, UNCALIBRATED -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate);
|
default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate); //Includes SCALAR case
|
||||||
default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate);
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -660,7 +660,7 @@ public class AliasConfigurationEditor extends SplitPane implements IAliasListRef
|
|||||||
nameColumn.setPrefWidth(140);
|
nameColumn.setPrefWidth(140);
|
||||||
|
|
||||||
TableColumn groupColumn = new TableColumn();
|
TableColumn groupColumn = new TableColumn();
|
||||||
groupColumn.setText("Category");
|
groupColumn.setText("Group");
|
||||||
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
||||||
groupColumn.setPrefWidth(140);
|
groupColumn.setPrefWidth(140);
|
||||||
|
|
||||||
|
|||||||
@@ -1094,7 +1094,7 @@ public class AliasItemEditor extends Editor<Alias>
|
|||||||
GridPane.setConstraints(getColorPicker(), 7, row);
|
GridPane.setConstraints(getColorPicker(), 7, row);
|
||||||
mTextFieldPane.getChildren().add(getColorPicker());
|
mTextFieldPane.getChildren().add(getColorPicker());
|
||||||
|
|
||||||
Label groupLabel = new Label("Category");
|
Label groupLabel = new Label("Group");
|
||||||
groupLabel.setLabelFor(getGroupField());
|
groupLabel.setLabelFor(getGroupField());
|
||||||
GridPane.setHalignment(groupLabel, HPos.RIGHT);
|
GridPane.setHalignment(groupLabel, HPos.RIGHT);
|
||||||
GridPane.setConstraints(groupLabel, 0, ++row);
|
GridPane.setConstraints(groupLabel, 0, ++row);
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ public class AliasViewByIdentifierEditor extends VBox
|
|||||||
aliasColumn.setPrefWidth(200);
|
aliasColumn.setPrefWidth(200);
|
||||||
|
|
||||||
TableColumn<AliasAndIdentifier, String> groupColumn = new TableColumn<>();
|
TableColumn<AliasAndIdentifier, String> groupColumn = new TableColumn<>();
|
||||||
groupColumn.setText("Category");
|
groupColumn.setText("Group");
|
||||||
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
||||||
groupColumn.setPrefWidth(200);
|
groupColumn.setPrefWidth(200);
|
||||||
|
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ public class AliasViewByRecordingEditor extends VBox
|
|||||||
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name"));
|
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name"));
|
||||||
|
|
||||||
TableColumn groupColumn = new TableColumn();
|
TableColumn groupColumn = new TableColumn();
|
||||||
groupColumn.setText("Category");
|
groupColumn.setText("Group");
|
||||||
groupColumn.setPrefWidth(200);
|
groupColumn.setPrefWidth(200);
|
||||||
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
||||||
|
|
||||||
@@ -280,7 +280,7 @@ public class AliasViewByRecordingEditor extends VBox
|
|||||||
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name"));
|
nameColumn.setCellValueFactory(new PropertyValueFactory<Alias,String>("name"));
|
||||||
|
|
||||||
TableColumn groupColumn = new TableColumn();
|
TableColumn groupColumn = new TableColumn();
|
||||||
groupColumn.setText("Category");
|
groupColumn.setText("Group");
|
||||||
groupColumn.setPrefWidth(200);
|
groupColumn.setPrefWidth(200);
|
||||||
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
||||||
|
|
||||||
|
|||||||
@@ -694,8 +694,8 @@ public abstract class ChannelConfigurationEditor extends Editor<Channel>
|
|||||||
mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases");
|
mAutoAddTalkerAliasesCheckBox = new CheckBox("Auto-Add Talker Aliases");
|
||||||
mAutoAddTalkerAliasesCheckBox.setDisable(true);
|
mAutoAddTalkerAliasesCheckBox.setDisable(true);
|
||||||
mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " +
|
mAutoAddTalkerAliasesCheckBox.setTooltip(new Tooltip("Adds decoded talker aliases as radio aliases in " +
|
||||||
"the Talker Alias category. Only radio aliases in that category are automatically renamed; existing " +
|
"the Talker Alias group. Only radio aliases in that group are automatically renamed; existing " +
|
||||||
"radio aliases outside the category are left unchanged. Move an alias out of the Talker Alias category " +
|
"radio aliases outside the group are left unchanged. Move an alias out of the Talker Alias group " +
|
||||||
"to preserve a custom name. Applies when the channel is (re)started."));
|
"to preserve a custom name. Applies when the channel is (re)started."));
|
||||||
mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true));
|
mAutoAddTalkerAliasesCheckBox.setOnAction(event -> modifiedProperty().set(true));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ public class StreamAliasSelectionEditor extends VBox
|
|||||||
aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName"));
|
aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName"));
|
||||||
|
|
||||||
TableColumn groupColumn = new TableColumn();
|
TableColumn groupColumn = new TableColumn();
|
||||||
groupColumn.setText("Category");
|
groupColumn.setText("Group");
|
||||||
groupColumn.setPrefWidth(150);
|
groupColumn.setPrefWidth(150);
|
||||||
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
||||||
|
|
||||||
@@ -270,7 +270,7 @@ public class StreamAliasSelectionEditor extends VBox
|
|||||||
aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName"));
|
aliasListNameColumn.setCellValueFactory(new PropertyValueFactory<>("aliasListName"));
|
||||||
|
|
||||||
TableColumn groupColumn = new TableColumn();
|
TableColumn groupColumn = new TableColumn();
|
||||||
groupColumn.setText("Category");
|
groupColumn.setText("Group");
|
||||||
groupColumn.setPrefWidth(150);
|
groupColumn.setPrefWidth(150);
|
||||||
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
groupColumn.setCellValueFactory(new PropertyValueFactory<>("group"));
|
||||||
|
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ public class DMRSoftSyncDetectorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new DMRSoftSyncDetectorVector512();
|
return new DMRSoftSyncDetectorVector512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new DMRSoftSyncDetectorScalar();
|
return new DMRSoftSyncDetectorScalar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ public class NXDNSyncDetectorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new NXDNSoftSyncDetectorVector512();
|
return new NXDNSoftSyncDetectorVector512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new NXDNSoftSyncDetectorScalar();
|
return new NXDNSoftSyncDetectorScalar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ public class P25P1SoftSyncDetectorFactory
|
|||||||
case VECTOR_SIMD_512:
|
case VECTOR_SIMD_512:
|
||||||
return new P25P1SoftSyncDetectorVector512();
|
return new P25P1SoftSyncDetectorVector512();
|
||||||
case SCALAR:
|
case SCALAR:
|
||||||
case UNCALIBRATED:
|
|
||||||
default:
|
default:
|
||||||
return new P25P1SoftSyncDetectorScalar();
|
return new P25P1SoftSyncDetectorScalar();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,9 +76,11 @@ public class HistoryTableViewTest
|
|||||||
table.getSelectionModel().select(0);
|
table.getSelectionModel().select(0);
|
||||||
table.getSelectionModel().select(2);
|
table.getSelectionModel().select(2);
|
||||||
|
|
||||||
|
//The copy shortcut is Cmd-C (meta) on macOS and Ctrl-C elsewhere
|
||||||
|
boolean mac = System.getProperty("os.name", "").toLowerCase().startsWith("mac");
|
||||||
Clipboard.getSystemClipboard().clear();
|
Clipboard.getSystemClipboard().clear();
|
||||||
Event.fireEvent(table, new KeyEvent(KeyEvent.KEY_PRESSED, "", "", KeyCode.C, false,
|
Event.fireEvent(table, new KeyEvent(KeyEvent.KEY_PRESSED, "", "", KeyCode.C, false,
|
||||||
true, false, false));
|
!mac, false, mac));
|
||||||
copied.complete(Clipboard.getSystemClipboard().getString());
|
copied.complete(Clipboard.getSystemClipboard().getString());
|
||||||
}
|
}
|
||||||
catch(Throwable t)
|
catch(Throwable t)
|
||||||
|
|||||||
Reference in New Issue
Block a user