mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-13 07:14:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved Memory Viewer

Browse Source
This commit is contained in:
DH 2013-11-23 07:38:19 +02:00
parent 5e1a958ee6
commit cbe4ab253c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rpcs3/Gui/MemoryViewer.cpp
View File

@ -55,6 +55,11 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
s_tools_img_size.Add(new wxStaticText(this, wxID_ANY, " x ")); s_tools_img_size.Add(new wxStaticText(this, wxID_ANY, " x "));
s_tools_img_size.Add(sc_img_size_y); s_tools_img_size.Add(sc_img_size_y);
sc_img_size_x->SetMax(8192);
sc_img_size_y->SetMax(8192);
sc_img_size_x->SetMin(1);
sc_img_size_y->SetMin(1);
wxStaticBoxSizer& s_tools_img_mode = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Mode"); wxStaticBoxSizer& s_tools_img_mode = *new wxStaticBoxSizer(wxHORIZONTAL, this, "Mode");
cbox_img_mode = new wxComboBox(this, wxID_ANY); cbox_img_mode = new wxComboBox(this, wxID_ANY);
cbox_img_mode->Append("RGB"); cbox_img_mode->Append("RGB");
@ -169,10 +174,7 @@ void MemoryViewerPanel::OnChangeToolsBytes(wxCommandEvent& event)
void MemoryViewerPanel::OnScrollMemory(wxMouseEvent& event) void MemoryViewerPanel::OnScrollMemory(wxMouseEvent& event)
{ {
if (event.GetWheelRotation() < 0) m_addr -= (event.ControlDown() ? m_rowcount : 1) * m_colcount * (event.GetWheelRotation() / event.GetWheelDelta());
m_addr += m_colcount;
else
m_addr -= m_colcount;
t_addr->SetValue(wxString::Format("%08x", m_addr)); t_addr->SetValue(wxString::Format("%08x", m_addr));
ShowMemory(); ShowMemory();
@ -190,7 +192,6 @@ void MemoryViewerPanel::ShowMemory()
t_mem_addr_str += wxString::Format("%08x ", addr); t_mem_addr_str += wxString::Format("%08x ", addr);
} }
for(u32 addr = m_addr; addr != m_addr + m_rowcount * m_colcount; addr++) for(u32 addr = m_addr; addr != m_addr + m_rowcount * m_colcount; addr++)
{ {
if (Memory.IsGoodAddr(addr)) if (Memory.IsGoodAddr(addr))
@ -198,18 +199,18 @@ void MemoryViewerPanel::ShowMemory()
const u8 rmem = Memory.Read8(addr); const u8 rmem = Memory.Read8(addr);
t_mem_hex_str += wxString::Format("%02x ", rmem); t_mem_hex_str += wxString::Format("%02x ", rmem);
const wxString c_rmem = wxString::Format("%c", rmem); const wxString c_rmem = wxString::Format("%c", rmem);
t_mem_ascii_str += c_rmem.IsEmpty() ? "." : c_rmem;; t_mem_ascii_str += c_rmem.IsEmpty() ? "." : c_rmem;
} }
else else
{ {
t_mem_hex_str += "?? "; t_mem_hex_str += "?? ";
t_mem_ascii_str += "?"; t_mem_ascii_str += "?";
} }
t_mem_addr->SetValue(t_mem_addr_str);
t_mem_hex->SetValue(t_mem_hex_str);
t_mem_ascii->SetValue(t_mem_ascii_str);
} }
t_mem_addr->SetValue(t_mem_addr_str);
t_mem_hex->SetValue(t_mem_hex_str);
t_mem_ascii->SetValue(t_mem_ascii_str);
} }
void MemoryViewerPanel::Next (wxCommandEvent& WXUNUSED(event)) { m_addr += m_colcount; ShowMemory(); } void MemoryViewerPanel::Next (wxCommandEvent& WXUNUSED(event)) { m_addr += m_colcount; ShowMemory(); }