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