Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
adb198a
Added ability to copy TextView via CMD+C
ScraperMan2002 May 16, 2025
79d6d7c
Remove TestAddCode. That was just to help me understand how everythin…
ScraperMan2002 May 16, 2025
a7dcb5e
Get rid of useless line [item setTarget: nil]; to simplify the code.
ScraperMan2002 May 16, 2025
1aea868
Added ability to "select all" for the text in Properties.
ScraperMan2002 May 17, 2025
a52ca4c
Merge branch 'ares-emulator:master' into CMDA
ScraperMan2002 May 17, 2025
d6314dc
Merge pull request #1 from ScraperMan2002/CMDA
ScraperMan2002 May 17, 2025
8bdaf1d
Moved all the Menu Item initailizations from Window to Application. W…
ScraperMan2002 May 17, 2025
991daae
Merge remote-tracking branch 'refs/remotes/PrivateAres/master'
ScraperMan2002 May 17, 2025
485df6a
Merge branch 'ares-emulator:master' into master
ScraperMan2002 May 17, 2025
6760d27
-Put constructMenu into autoreleasepool to get rid of leaked data
ScraperMan2002 May 17, 2025
df76401
Remove tracked .DS_Store and update .gitignore
ScraperMan2002 May 17, 2025
ed79e37
Remove reamining tracked .DS_Stores
ScraperMan2002 May 17, 2025
211c1b0
Merge branch 'ares-emulator:master' into master
ScraperMan2002 May 19, 2025
13bf81d
Merge branch 'ares-emulator:master' into master
ScraperMan2002 May 25, 2025
cceb52c
Change the window size of the Configuration window so that on MacOS t…
ScraperMan2002 May 25, 2025
36e0e72
Added ability for Memory Editor to switch memory value format between…
ScraperMan2002 May 26, 2025
5adf5d3
Merge branch 'ares-emulator:master' into master
ScraperMan2002 May 26, 2025
0d370ea
Added ability to switch between binary, octal, and hexidecimal in Win…
ScraperMan2002 May 27, 2025
8753f2a
Added ability for HexData to switch between Binary, Octal, and Hexade…
ScraperMan2002 May 27, 2025
1177c19
Added setBase() so the program can compile correctly.
ScraperMan2002 May 27, 2025
93469e5
Fixed further bugs with not using state().base and with to_string not…
ScraperMan2002 May 27, 2025
da4c507
Got rid of using std::invalid_argument. Might as well just simply "th…
ScraperMan2002 May 27, 2025
433da54
Major Edits to hex-edit on MacOS:
ScraperMan2002 May 29, 2025
c7fad92
Merge pull request #2 from ScraperMan2002/hexedit-edit-branch-with-si…
ScraperMan2002 May 29, 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
Prev Previous commit
Next Next commit
Added ability for HexData to switch between Binary, Octal, and Hexade…
…cimal in QT and GTK, fixed Windows implementation bug.
  • Loading branch information
ScraperMan2002 committed May 27, 2025
commit 8753f2a8bd26d67df127274d42f3d9cd930a7a52
14 changes: 13 additions & 1 deletion hiro/gtk/widget/hex-edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,19 @@ auto pHexEdit::update() -> void {
for(auto column : range(state().columns)) {
if(address < state().length) {
u8 data = self().doRead(address++);
hexdata.append(hex(data, 2L));
switch (state().length) {
case 2:
hexdata.append(binary(data, 2L));
break;
case 8:
hexdata.append(octal(data, 2L));
break;
case 16:
hexdata.append(hex(data, 2L));
break;
default:
throw std::invalid_argument("Invalid state().length value: " + std::to_string(state().length));
}
hexdata.append(" ");
ansidata.append(data >= 0x20 && data <= 0x7e ? (char)data : '.');
} else {
Expand Down
1 change: 1 addition & 0 deletions hiro/gtk/widget/hex-edit.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ struct pHexEdit : pWidget {

auto focused() const -> bool override;
auto setAddress(u32 address) -> void;
auto setBase(u16 base) -> void;
auto setBackgroundColor(Color color) -> void;
auto setColumns(u32 columns) -> void;
auto setForegroundColor(Color color) -> void;
Expand Down
14 changes: 13 additions & 1 deletion hiro/qt/widget/hex-edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,19 @@ auto pHexEdit::update() -> void {
for(u32 column = 0; column < state().columns; column++) {
if(address < state().length) {
u8 data = self().doRead(address++);
hexdata.append(hex(data, 2L));
switch (state().length) {
case 2:
hexdata.append(binary(data, 2L));
break;
case 8:
hexdata.append(octal(data, 2L));
break;
case 16:
hexdata.append(hex(data, 2L));
break;
default:
throw std::invalid_argument("Invalid state().length value: " + std::to_string(state().length));
}
hexdata.append(" ");
ansidata.append(data >= 0x20 && data <= 0x7e ? (char)data : '.');
} else {
Expand Down
1 change: 1 addition & 0 deletions hiro/qt/widget/hex-edit.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ struct pHexEdit : pWidget {
Declare(HexEdit, Widget)

auto setAddress(u32 address) -> void;
auto setBase(u16 base) -> void;
auto setBackgroundColor(Color color) -> void;
auto setColumns(u32 columns) -> void;
auto setForegroundColor(Color color) -> void;
Expand Down
5 changes: 4 additions & 1 deletion hiro/windows/widget/hex-edit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,15 @@ auto pHexEdit::update() -> void {
switch (state().length) {
case 2:
hexdata.append(binary(data, 2L));
break;
case 8:
hexdata.append(octal(data, 2L));
break;
case 16:
hexdata.append(hex(data, 2L));
break;
default:
throw std::invalid_argument("Invalid state().length value: state().length is neither 2, 8, nor 16.");
throw std::invalid_argument("Invalid state().length value: " + std::to_string(state().length));
}
hexdata.append(" ");
ansidata.append(data >= 0x20 && data <= 0x7e ? (char)data : '.');
Expand Down
Loading