Skip to content

CSSTUDIO-3605 Always use the type "long" when converting to hexadecimal notation #3674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abrahamwolk wants to merge 3 commits into
base: master
Choose a base branch
from
Open

CSSTUDIO-3605 Always use the type "long" when converting to hexadecimal notation #3674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a190d29
CSSTUDIO-3605 Always use the type "long" when converting to hexadecim…
abrahamwolk Dec 12, 2025
fb37c8c
CSSTUDIO-3605 Bugfix: Avoid sign extension when converting numbers to…
abrahamwolk Dec 15, 2025
82cebbd
CSSTUDIO-3605 Add test cases.
abrahamwolk Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions core/ui/src/main/java/org/phoebus/ui/vtype/FormatOptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
import java.util.logging.Logger;

import org.epics.util.array.ListNumber;
import org.epics.util.number.UByte;
import org.epics.util.number.UInteger;
import org.epics.util.number.ULong;
import org.epics.util.number.UShort;
import org.epics.vtype.Display;
import org.epics.vtype.DisplayProvider;
import org.epics.vtype.VBoolean;
Expand Down Expand Up @@ -219,10 +223,32 @@ private static String formatNumber(final Number value, final Display display,
if (option == FormatOption.HEX)
{
final StringBuilder buf = new StringBuilder();
if (precision <= 8)
buf.append(Integer.toHexString(value.intValue()).toUpperCase());
else
buf.append(Long.toHexString(value.longValue()).toUpperCase());
long longValue;
if (value instanceof Byte valueByte) {
longValue = Byte.toUnsignedLong(valueByte);
} else if (value instanceof Short valueShort) {
longValue = Short.toUnsignedLong(valueShort);
} else if (value instanceof Integer valueInt) {
longValue = Integer.toUnsignedLong(valueInt);
} else if (value instanceof Long valueLong) {
longValue = valueLong;
} else if (value instanceof Float valueFloat) {
longValue = valueFloat.longValue();
} else if (value instanceof Double valueDouble) {
longValue = valueDouble.longValue();
} else if (value instanceof UByte valueUByte) {
longValue = valueUByte.longValue();
} else if (value instanceof UShort valueUShort) {
longValue = valueUShort.longValue();
} else if (value instanceof UInteger valueUInteger) {
longValue = valueUInteger.longValue();
} else if (value instanceof ULong valueULong) {
longValue = valueULong.longValue();
} else {
longValue = value.longValue();
}
String hexString = Long.toHexString(longValue);
buf.append(hexString.toUpperCase());
for (int i=buf.length(); i<precision; ++i)
buf.insert(0, '0');
buf.insert(0, "0x");
Expand Down
260 changes: 247 additions & 13 deletions core/ui/src/test/java/org/phoebus/ui/vtype/FormatOptionHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,22 @@
import org.epics.vtype.Display;
import org.epics.vtype.EnumDisplay;
import org.epics.vtype.Time;
import org.epics.vtype.VByte;
import org.epics.vtype.VDouble;
import org.epics.vtype.VEnum;
import org.epics.vtype.VFloat;
import org.epics.vtype.VInt;
import org.epics.vtype.VIntArray;
import org.epics.vtype.VLong;
import org.epics.vtype.VNumberArray;
import org.epics.vtype.VShort;
import org.epics.vtype.VString;
import org.epics.vtype.VStringArray;
import org.epics.vtype.VType;
import org.epics.vtype.VUByte;
import org.epics.vtype.VUInt;
import org.epics.vtype.VULong;
import org.epics.vtype.VUShort;
import org.junit.jupiter.api.Test;

import java.text.DecimalFormat;
Expand Down Expand Up @@ -167,19 +175,245 @@ public void testEngineering()
@Test
public void testHexFormat()
{
VType number = VDouble.of(65535.0, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x0000FFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x000000000000FFFF V"));
{
VType number = VDouble.of(65535.0, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x0000FFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x000000000000FFFF V"));
}

{
// Test with VDouble representing 0xFFFFFFFF
VType number = VDouble.of(4294967295.0, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000FFFFFFFF V"));
}

{
// Test with VFloat representing 0xFFFF
VType number = VFloat.of(65535.0, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x0000FFFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x000000000000FFFF V"));
}

{
// Test with VInt representing 0x00
VType number = VInt.of(0x00, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0x0000 V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000 V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x0000000000000000 V"));
}

{
// Test with VByte representing 0xFF
VType number = VByte.of(0xFF, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 2, true);
System.out.println(text);
assertThat(text, equalTo("0xFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0x00FF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x000000FF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000000000FF V"));
}

{
// Test with VByte representing 0xFF
VType number = VUByte.of(0xFF, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 2, true);
System.out.println(text);
assertThat(text, equalTo("0xFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0x00FF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x000000FF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000000000FF V"));
}

{
// Test with VShort representing 0xFFAA
VType number = VShort.of(0xFFAA, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 2, true);
System.out.println(text);
assertThat(text, equalTo("0xFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x0000FFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x000000000000FFAA V"));
}

{
// Test with VUShort representing 0xFFAA
VType number = VUShort.of(0xFFAA, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 2, true);
System.out.println(text);
assertThat(text, equalTo("0xFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x0000FFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x000000000000FFAA V"));
}

{
// Test with VInt representing 0xFF
VType number = VInt.of(0xFF, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 2, true);
System.out.println(text);
assertThat(text, equalTo("0xFF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0x00FF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0x000000FF V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000000000FF V"));
}

{
// Test with VInt representing 0xFFFFFFAA
VType number = VInt.of(0xFFFFFFAA, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000FFFFFFAA V"));
}

{
// Test with VUInt representing 0xFFFFFFAA
VType number = VUInt.of(0xFFFFFFAA, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0x00000000FFFFFFAA V"));
}

{
// Test with VLong representing 0xFFFFFFAA
VType number = VLong.of(0xFFFFFFFFFFFFFFAAL, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFFFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFFFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFFFFFFFFAA V"));
}

{
// Test with VULong representing 0xFFFFFFAA
VType number = VULong.of(0xFFFFFFFFFFFFFFAAL, Alarm.none(), Time.now(), display);

String text = FormatOptionHandler.format(number, FormatOption.HEX, 4, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFFFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 8, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFFFFFFFFAA V"));

text = FormatOptionHandler.format(number, FormatOption.HEX, 16, true);
System.out.println(text);
assertThat(text, equalTo("0xFFFFFFFFFFFFFFAA V"));
}
}

@Test
Expand Down