Skip to content

Commit

Permalink
visualizer: Replaced @enum("light", "dark") with documentation.
Browse files Browse the repository at this point in the history
Omnetpp now checks the value against the values found in @enum, and these parameters
allow for arbitrary color names, so the enumeration was wrong.
  • Loading branch information
levy committed May 8, 2024
1 parent e3f999c commit 2c3e299
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/inet/visualizer/base/Ieee80211VisualizerBase.ned
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ simple Ieee80211VisualizerBase extends VisualizerBase
double maxPower @unit(dBm) = default(-50dBm); // maximum expeceted signal power

string icons = default("misc/signal_power_0 misc/signal_power_1 misc/signal_power_2 misc/signal_power_3"); // wireless network visualization icon for different signal powers
string iconColor @enum("light", "dark") = default("dark"); // wireless network icon color is a list of colors, a set of dark colors by default
string iconColor = default("dark"); // wireless network icon color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
string labelFont = default("<default>"); // label font, automatic by default
string labelColor = default("black"); // label color, black by default
string placementHint = default("top"); // annotation placement hint, space separated list of any, top, bottom, left, right, topLeft, topCenter, topRight, etc.
Expand Down
2 changes: 1 addition & 1 deletion src/inet/visualizer/base/MediumVisualizerBase.ned
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ simple MediumVisualizerBase extends VisualizerBase
object packetFilter @mutable = default("*"); // which packets are considered, matches all packets by default

bool displaySignals = default(false); // display signals propagating through the medium, disabled by default
string signalColor @enum("light", "dark") = default("dark"); // signal color is a list of colors, a set of dark colors by default
string signalColor = default("dark"); // signal color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
double signalPropagationAnimationSpeed @mutable = default(nan); // animation speed while the very beginning or end of a signal is propagating on the medium, value must be in the range (0, +inf) or NaN, the latter means automatic setting
double signalPropagationAnimationTime @unit(s) = default(1s); // signal propagation animation duration when signalPropagationAnimationSpeed is unspecified
double signalPropagationAdditionalTime @unit(s) = default(0s); // additional simulation time to animate signal propagation after leaving last receiver
Expand Down
6 changes: 3 additions & 3 deletions src/inet/visualizer/base/MobilityVisualizerBase.ned
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ simple MobilityVisualizerBase extends VisualizerBase
bool displayPositions = default(false); // display a circle indicating the current position, disabled by default
double positionCircleRadius = default(4); // radius of the circle
double positionCircleLineWidth = default(1); // line width of the circle
string positionCircleLineColor @enum("light", "dark") = default("dark"); // position circle line color is a list of colors, a set of dark colors by default
string positionCircleFillColor @enum("light", "dark") = default("dark"); // position circle fill color is a list of colors, a set of dark colors by default
string positionCircleLineColor = default("dark"); // position circle line color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
string positionCircleFillColor = default("dark"); // position circle fill color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default

bool displayOrientations = default(false); // display a pie indicating the current orientation, disabled by default
double orientationPieRadius = default(32); // radius of the pie
Expand All @@ -47,7 +47,7 @@ simple MobilityVisualizerBase extends VisualizerBase
double velocityLineWidth = default(1); // velocity line width

bool displayMovementTrails = default(false); // display a line along the recent path of mobilities, disabled by default
string movementTrailLineColor @enum("light", "dark") = default("dark"); // movement trail line color is a list of colors, a set of dark colors by default
string movementTrailLineColor = default("dark"); // movement trail line color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
string movementTrailLineStyle = default("solid"); // movement trail line style (solid, dashed, dotted)
double movementTrailLineWidth = default(1); // movement trail line width
int trailLength = default(100); // number of sections in the trail
Expand Down
2 changes: 1 addition & 1 deletion src/inet/visualizer/base/PathVisualizerBase.ned
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ simple PathVisualizerBase extends VisualizerBase
string nodeFilter @mutable = default("*"); // which nodes are considered, matches all nodes by default
object packetFilter @mutable = default("*"); // which packets are considered, matches all packets by default

string lineColor @enum("light", "dark") = default("dark"); // route color is a list of colors, a set of dark colors by default
string lineColor = default("dark"); // route color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
string lineStyle = default("solid"); // route line style (solid, dashed, dotted)
double lineWidth = default(3); // route line width
bool lineSmooth = default(false); // when true polylines are displayed as curves
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ simple TransportConnectionVisualizerBase extends VisualizerBase
string destinationPortFilter @mutable = default("*"); // which destination ports are considered to display connections, matches all ports by default

string icon = default("misc/marker_s"); // transport connection visualization icon
string iconColor @enum("light", "dark") = default("dark"); // transport connection icon color is a list of colors, a set of dark colors by default
string iconColor = default("dark"); // transport connection icon color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
string labelFont = default("<default>"); // label font, automatic by default
string labelColor = default("black"); // label color, black by default
string placementHint = default("top"); // annotation placement hint, space separated list of any, top, bottom, left, right, topLeft, topCenter, topRight, etc.
Expand Down
2 changes: 1 addition & 1 deletion src/inet/visualizer/base/TreeVisualizerBase.ned
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ simple TreeVisualizerBase extends VisualizerBase
parameters:
bool displayTrees = default(false); // display a set of polyline arrows for trees, disabled by default

string lineColor @enum("light", "dark") = default("dark"); // line color is a list of colors, a set of dark colors by default
string lineColor = default("dark"); // line color is a list of colors or a color group name (e.g. dark, light), a set of dark colors by default
string lineStyle = default("solid"); // line style (solid, dashed, dotted)
double lineWidth = default(3); // line width
bool lineSmooth = default(false); // when true polylines are displayed as curves
Expand Down

0 comments on commit 2c3e299

Please sign in to comment.