Remove baseAddress field

allencch · Apr 15, 2018 · bfbbb0b · bfbbb0b
1 parent d95b176
commit bfbbb0b
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 38 deletions.
diff --git a/include/ui/MemEditor.hpp b/include/ui/MemEditor.hpp
@@ -23,14 +23,16 @@ class MemEditor : public QWidget {
 
   QPlainTextEdit* memArea;
   std::string memHex;
-  QLineEdit* baseAddress;
 
   void writeToProcessMemory(int position, char ch);
   void refresh();
   void updateAddresses();
 
+  void setBaseAddress(Address addr);
+  Address getBaseAddress();
+
 private slots:
-  void onBaseAddressEdited();
+  void onCurrAddressEdited();
   void onMemAreaCursorPositionChanged();
   void onRefreshButtonClicked();
 
@@ -39,6 +41,7 @@ private slots:
   MedUi* mainUi;
   QWidget* parent;
   QWidget* mainChild;
+  Address baseAddress;
 
   QLineEdit* currAddress;
   QLineEdit* valueLine;
@@ -59,6 +62,7 @@ private slots:
 
   string getHexString(int position);
   Address getAddressByCursorPosition(int position);
+  void setCursorPositionByAddress();
 
   static std::string memoryToHex(Byte* memory, size_t size);
   static std::string memoryToString(Byte* memory, size_t size, EncodingManager* encodingManager);

diff --git a/src/ui/MemEditor.cpp b/src/ui/MemEditor.cpp
@@ -20,6 +20,7 @@ MemEditor::MemEditor(MedUi* mainUi) : QWidget(NULL, Qt::SubWindow) {
   this->mainUi = mainUi;
   this->med = mainUi->med;
   rawMemory = NULL;
+  baseAddress = 0;
 
   QUiLoader loader;
   QFile file("./mem-editor.ui");
@@ -31,7 +32,6 @@ MemEditor::MemEditor(MedUi* mainUi) : QWidget(NULL, Qt::SubWindow) {
   this->setLayout(layout);
   this->resize(800, 500);
 
-  baseAddress = mainChild->findChild<QLineEdit*>("baseAddress");
   currAddress= mainChild->findChild<QLineEdit*>("currAddress");
   valueLine = mainChild->findChild<QLineEdit*>("value");
   memArea = mainChild->findChild<QPlainTextEdit*>("memArea");
@@ -59,10 +59,10 @@ MemEditor::~MemEditor() {
 }
 
 void MemEditor::setupSignals() {
-  QObject::connect(baseAddress,
+  QObject::connect(currAddress,
                    SIGNAL(editingFinished()),
                    this,
-                   SLOT(onBaseAddressEdited()));
+                   SLOT(onCurrAddressEdited()));
   QObject::connect(memArea,
                    SIGNAL(cursorPositionChanged()),
                    this,
@@ -74,8 +74,8 @@ void MemEditor::setupSignals() {
 }
 
 
-void MemEditor::onBaseAddressEdited() {
-  QString addr = baseAddress->text();
+void MemEditor::onCurrAddressEdited() {
+  QString addr = currAddress->text();
   if (addr.trimmed() == "") {
     return;
   }
@@ -86,32 +86,31 @@ void MemEditor::onBaseAddressEdited() {
   }
 
   try {
-    Address roundedAddr = addressRoundDown(hexToInt(addr.toStdString()));
-    baseAddress->setText(intToHex(roundedAddr).c_str());
-    loadMemory(roundedAddr);
-    loadAddresses(roundedAddr);
-
+    baseAddress = addressRoundDown(hexToInt(addr.toStdString()));
+    loadMemory(baseAddress);
+    loadAddresses(baseAddress);
+    currAddress->setText(addr);
+    setCursorPositionByAddress();
   } catch(MedException &ex) {
     cerr << ex.getMessage() << endl;
   }
 }
 
 void MemEditor::refresh() {
-  QString addr = baseAddress->text();
-  if (addr.trimmed() == "") {
+  if (!baseAddress) {
     return;
   }
-  Address roundedAddr = addressRoundDown(hexToInt(addr.toStdString()));
-  baseAddress->setText(intToHex(roundedAddr).c_str());
-  loadMemory(roundedAddr);
+  QString addr = currAddress->text();
+  loadMemory(baseAddress);
+  currAddress->setText(addr);
+  setCursorPositionByAddress();
 }
 
 void MemEditor::updateAddresses() {
-  QString addr = baseAddress->text();
-  if (addr.trimmed() == "") {
+  if (!baseAddress) {
     return;
   }
-  loadAddresses(hexToInt(addr.toStdString()));
+  loadAddresses(baseAddress);
 }
 
 void MemEditor::loadMemory(Address address, size_t size) {
@@ -172,13 +171,25 @@ void MemEditor::onMemAreaCursorPositionChanged() {
 }
 
 Address MemEditor::getAddressByCursorPosition(int position) {
-  QString addr = baseAddress->text();
-  if (addr.trimmed() == "") {
+  if (!baseAddress) {
     return 0;
   }
   int distance = position / 3;
-  Address base = hexToInt(addr.toStdString());
-  return base + distance;
+  return baseAddress + distance;
+}
+
+void MemEditor::setCursorPositionByAddress() {
+  QString addr = currAddress->text();
+  if (!baseAddress || addr.trimmed() == "") {
+    return;
+  }
+
+  int distance = hexToInt(addr.toStdString()) - baseAddress;
+  int position = distance * 3;
+
+  auto cursor = memArea->textCursor();
+  cursor.setPosition(position, QTextCursor::MoveAnchor);
+  memArea->setTextCursor(cursor);
 }
 
 void MemEditor::updateCurrAddress() {
@@ -228,3 +239,11 @@ string MemEditor::getHexString(int position) {
 void MemEditor::onRefreshButtonClicked() {
   refresh();
 }
+
+void MemEditor::setBaseAddress(Address addr) {
+  baseAddress = addr;
+}
+
+Address MemEditor::getBaseAddress() {
+  return baseAddress;
+}
diff --git a/src/ui/MemEditorEventListener.cpp b/src/ui/MemEditorEventListener.cpp
@@ -111,9 +111,7 @@ void MemEditorEventListener::moveCursorUpward() {
     return;
   }
 
-  Address base = hexToInt(memEditor->baseAddress->text().toStdString());
-  base -= 16;
-  memEditor->baseAddress->setText(intToHex(base).c_str());
+  memEditor->setBaseAddress(memEditor->getBaseAddress() - 16);
   memEditor->refresh();
   memEditor->updateAddresses();
   cursor.setPosition(position, QTextCursor::MoveAnchor);
@@ -127,9 +125,7 @@ void MemEditorEventListener::moveCursorDownward() {
     return;
   }
 
-  Address base = hexToInt(memEditor->baseAddress->text().toStdString());
-  base += 16;
-  memEditor->baseAddress->setText(intToHex(base).c_str());
+  memEditor->setBaseAddress(memEditor->getBaseAddress() + 16);
   memEditor->refresh();
   memEditor->updateAddresses();
   cursor.setPosition(position, QTextCursor::MoveAnchor);

diff --git a/ui/mem-editor.ui b/ui/mem-editor.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
+    <width>604</width>
     <height>500</height>
    </rect>
   </property>
@@ -18,13 +18,6 @@
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QLineEdit" name="baseAddress">
-         <property name="placeholderText">
-          <string>Base</string>
-         </property>
-        </widget>
-       </item>
        <item>
         <widget class="QLineEdit" name="currAddress">
          <property name="placeholderText">