mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 08:37:25 -05:00
#1977 P25 FQSUID handling improvements. P25 fully qualified radio/talkgroup identifiers we're being flagged as invalid when ISSI patch assigned a local address/ID of zero. Changes format of FQSUID and FQTGID to use a value of zero for the local alias when the call type is an ISSI patch and suppress display of the 0 alias value. If the identifier represents a roaming user, then the local address value is displayed with the FQSUID appended in parenthesis. (#1978)
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
@@ -21,12 +21,15 @@ package io.github.dsheirer.gui.viewer;
|
||||
|
||||
import io.github.dsheirer.identifier.Identifier;
|
||||
import io.github.dsheirer.identifier.IdentifierCollection;
|
||||
import javafx.beans.property.SimpleStringProperty;
|
||||
import javafx.beans.value.ObservableValue;
|
||||
import javafx.scene.control.TableColumn;
|
||||
import javafx.scene.control.TableView;
|
||||
import javafx.scene.control.cell.PropertyValueFactory;
|
||||
import javafx.scene.layout.GridPane;
|
||||
import javafx.scene.layout.Priority;
|
||||
import javafx.scene.layout.VBox;
|
||||
import javafx.util.Callback;
|
||||
|
||||
/**
|
||||
* JavaFX identifier collection viewer
|
||||
@@ -82,7 +85,19 @@ public class IdentifierCollectionViewer extends VBox
|
||||
valueColumn.setText("Value");
|
||||
valueColumn.setCellValueFactory(new PropertyValueFactory<>("value"));
|
||||
|
||||
mIdentifierTableView.getColumns().addAll(classColumn, formColumn, roleColumn, valueColumn);
|
||||
TableColumn textColumn = new TableColumn();
|
||||
textColumn.setPrefWidth(160);
|
||||
textColumn.setText("Text");
|
||||
textColumn.setCellValueFactory((Callback<TableColumn.CellDataFeatures<Identifier<?>, String>, ObservableValue>) param -> {
|
||||
if(param.getValue() != null)
|
||||
{
|
||||
return new SimpleStringProperty(param.getValue().toString());
|
||||
}
|
||||
|
||||
return null;
|
||||
});
|
||||
|
||||
mIdentifierTableView.getColumns().addAll(classColumn, formColumn, roleColumn, valueColumn, textColumn);
|
||||
}
|
||||
|
||||
return mIdentifierTableView;
|
||||
|
||||
Reference in New Issue
Block a user