Skip to content

Commit 650095f

Browse files
committed
getSignalInfo: include "_basetype" not "_type" in info
1 parent a79665a commit 650095f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/AbstractSignalTableInterface.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ end
6161
6262
Returns signal in form of a [`Var`](@ref) or a [`Par`](@ref)) where
6363
64-
- :values in Var() is replaced by :_type = typeof(signal[:values]), :_size = size( signal[:values] ) or
65-
- :value in Par() is replaced by :_type = typeof(signal[:value]), :_size = size( signal[:value] )
64+
- :values in Var() is replaced by :_basetype = basetype(signal[:values]), :_size = size( signal[:values] ) or
65+
- :value in Par() is replaced by :_basetype = basetype(signal[:value]), :_size = size( signal[:value] )
6666
6767
provided size(..) on the value is defined (otherwise :_size is not included)
6868
@@ -77,17 +77,17 @@ function getSignalInfo(signalTable, name::String)::SymbolDictType
7777
signal2 = copy(signal)
7878
delete!(signal2, :values)
7979
delete!(signal2, :value)
80-
_type = nothing
81-
_size = nothing
80+
_basetype = nothing
81+
_size = nothing
8282
type_available = false
8383
size_available = false
8484
if isVar(signal)
8585
if haskey(signal, :values)
8686
type_available = true
8787
try
88-
sig = signal[:values]
89-
_type = typeof(sig)
90-
_size = size(sig)
88+
sig = signal[:values]
89+
_basetype = basetype(sig)
90+
_size = size(sig)
9191
size_available = true
9292
catch
9393
size_available = false
@@ -97,17 +97,17 @@ function getSignalInfo(signalTable, name::String)::SymbolDictType
9797
if haskey(signal, :value)
9898
type_available = true
9999
try
100-
sig = signal[:value]
101-
_type = typeof(sig)
102-
_size = size(sig)
100+
sig = signal[:value]
101+
_basetype = basetype(sig)
102+
_size = size(sig)
103103
size_available = true
104104
catch
105105
size_available = false
106106
end
107107
end
108108
end
109109
if type_available
110-
signal2[:_type] = _type
110+
signal2[:_basetype] = _basetype
111111
end
112112
if size_available
113113
signal2[:_size] = _size

src/SignalTable.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ struct SignalTable <: AbstractDict{String,Any}
124124
error("SignalTable(\"$key\" => signal, ...): size(signal[:values],$i) = $(size(sig_values,i)) but must be $val (= length of independent signal)!")
125125
end
126126
end
127-
end
127+
end
128128
else
129129
# Needs not have :values, e.g. alias
130130
# error("SignalTable(\"$key\" => signal, ...) is a Var(..) and has no key :values which is required!")
@@ -137,7 +137,7 @@ struct SignalTable <: AbstractDict{String,Any}
137137
error("SignalTable(\"$key\" => Var(alias=\"$aliasName\"...): referenced signal does not exist.")
138138
end
139139
sigAlias = dict[aliasName]
140-
sig = merge(sigAlias,sig)
140+
sig = merge(sigAlias,sig)
141141
end
142142
else
143143
if haskey(sig, :alias)

src/SignalTableFunctions.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ getValueWithUnit(signalTable, name::String) = begin
8787
end
8888

8989

90-
const doNotShowAttributes = [:_class, :_type, :_size, :unit]
90+
const doNotShowAttributes = [:_class, :_basetype, :_size, :unit]
9191

9292

9393
"""
@@ -190,8 +190,8 @@ function showInfo(io::IO, signalTable;
190190
attr = String(take!(iostr))
191191
end
192192
independent = get(signal, :independent, false)
193-
println("$name: _type = ", get(signal, :_type, "notDefined"))
194-
valBaseType = haskey(signal, :_type) ? string( BaseType( get(signal, :_type, Missing) ) ) : ""
193+
#println("$name: _type = ", get(signal, :_type, "notDefined"))
194+
valBaseType = string( get(signal, :_basetype, "") )
195195
valSize = string( get(signal, :_size, "") )
196196
valUnit = get(signal, :unit, "")
197197
if typeof(valUnit) <: AbstractString

0 commit comments

Comments
 (0)