Skip to content

Added in place editing #5

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
afiglee wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added in place editing #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions example/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags):
QMainWindow(parent, flags)
{
QToolBar *ptb = addToolBar("File");
QToolBar *pFiletb = addToolBar("File");

QAction *pactOpen = ptb -> addAction("Open...");
QAction *pactOpen = pFiletb -> addAction("Open...");
pactOpen -> setShortcut(QKeySequence("Ctrl+O"));
connect(pactOpen, SIGNAL(triggered()), SLOT(slotOpen()));

Expand Down
29 changes: 28 additions & 1 deletion include/QHexView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,20 @@
#include <QAbstractScrollArea>
#include <QByteArray>
#include <QFile>
#include <QLineEdit>
#include <stdint.h>

class QHexView: public QAbstractScrollArea

{
enum Mode {READ_ONLY, EDIT};
public:
class DataStorage
{
public:
virtual ~DataStorage() {};
virtual QByteArray getData(std::size_t position, std::size_t length) = 0;
virtual void setByte(std::size_t position, uint8_t value) = 0;
virtual std::size_t size() = 0;
};

Expand All @@ -23,6 +27,7 @@ class QHexView: public QAbstractScrollArea
public:
DataStorageArray(const QByteArray &arr);
virtual QByteArray getData(std::size_t position, std::size_t length);
virtual void setByte(std::size_t position, uint8_t value);
virtual std::size_t size();
private:
QByteArray m_data;
Expand All @@ -33,12 +38,27 @@ class QHexView: public QAbstractScrollArea
public:
DataStorageFile(const QString &fileName);
virtual QByteArray getData(std::size_t position, std::size_t length);
virtual void setByte(std::size_t position, uint8_t value){}
virtual std::size_t size();
private:
QFile m_file;
};


class QHexCellEdit : public QLineEdit
{
public:
QHexCellEdit(QWidget *parent, uint8_t value);

uint8_t getValue() const {return m_value;};

protected:

void keyPressEvent(QKeyEvent *event);

private:
uint8_t m_value;
};

QHexView(QWidget *parent = 0);
~QHexView();
Expand All @@ -47,12 +67,15 @@ class QHexView: public QAbstractScrollArea
void setData(DataStorage *pData);
void clear();
void showFromOffset(std::size_t offset);

void releaseEditCell(bool newValue);
protected:
void paintEvent(QPaintEvent *event);
void keyPressEvent(QKeyEvent *event);
void mouseMoveEvent(QMouseEvent *event);
void mousePressEvent(QMouseEvent *event);
void mouseDoubleClickEvent(QMouseEvent *e);
void wheelEvent(QWheelEvent* event);
void scrollContentsBy(int dx, int dy);
private:
DataStorage *m_pdata;
std::size_t m_posAddr;
Expand All @@ -67,6 +90,9 @@ class QHexView: public QAbstractScrollArea
std::size_t m_selectInit;
std::size_t m_cursorPos;

Mode m_mode;
QHexCellEdit *m_edit;


QSize fullSize() const;
void resetSelection();
Expand All @@ -75,6 +101,7 @@ class QHexView: public QAbstractScrollArea
void ensureVisible();
void setCursorPos(int pos);
std::size_t cursorPos(const QPoint &position);
void setMode(bool readOnly);
};

#endif
156 changes: 151 additions & 5 deletions src/QHexView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

#include <stdexcept>



const int HEXCHARS_IN_LINE = 47;
const int GAP_ADR_HEX = 10;
const int GAP_HEX_ASCII = 16;
Expand All @@ -19,9 +21,10 @@ const int BYTES_PER_LINE = 16;

QHexView::QHexView(QWidget *parent):
QAbstractScrollArea(parent),
m_pdata(NULL)
m_pdata(NULL), m_mode(READ_ONLY),
m_edit(nullptr)
{
setFont(QFont("Courier", 10));
setFont(QFont("Courier", 10));

m_charWidth = fontMetrics().width(QLatin1Char('9'));
m_charHeight = fontMetrics().height();
Expand All @@ -40,6 +43,9 @@ QHexView::~QHexView()
{
if(m_pdata)
delete m_pdata;
if (m_edit) {
delete m_edit;
}
}

void QHexView::setData(QHexView::DataStorage *pData)
Expand Down Expand Up @@ -88,11 +94,12 @@ QSize QHexView::fullSize() const

void QHexView::paintEvent(QPaintEvent *event)
{

if(!m_pdata)
return;
QPainter painter(viewport());
QSize areaSize = viewport()->size();

QSize areaSize = viewport()->size();
QSize widgetSize = fullSize();
verticalScrollBar()->setPageStep(areaSize.height() / m_charHeight);
verticalScrollBar()->setRange(0, (widgetSize.height() - areaSize.height()) / m_charHeight + 1);
Expand Down Expand Up @@ -171,7 +178,7 @@ void QHexView::paintEvent(QPaintEvent *event)
painter.drawText(xPosAscii, yPos, QString(ch));
}

}
}

if (hasFocus())
{
Expand Down Expand Up @@ -258,7 +265,22 @@ void QHexView::keyPressEvent(QKeyEvent *event)
/*****************************************************************************/
/* Select commands */
/*****************************************************************************/
if (event->matches(QKeySequence::SelectAll))
if (event->key() == Qt::Key_Return) {
if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
setMode(false);
}
if (event->matches(QKeySequence::Cancel))
{
if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
setMode(true);
}
if (event->matches(QKeySequence::SelectAll))
{
resetSelection(0);
if(m_pdata)
Expand Down Expand Up @@ -400,10 +422,42 @@ void QHexView::mousePressEvent(QMouseEvent * event)

setCursorPos(cPos);

if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
viewport() -> update();
}

void QHexView::mouseDoubleClickEvent(QMouseEvent *e)
{

QAbstractScrollArea::mouseDoubleClickEvent(e);
if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
setMode(false);

}

void QHexView::wheelEvent(QWheelEvent* event)
{
if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
QAbstractScrollArea::wheelEvent(event);
}

void QHexView::scrollContentsBy(int dx, int dy)
{
if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
QAbstractScrollArea::scrollContentsBy(dx, dy);
}
std::size_t QHexView::cursorPos(const QPoint &position)
{
int pos = -1;
Expand Down Expand Up @@ -474,6 +528,7 @@ void QHexView::setCursorPos(int position)
if(position > maxPos)
position = maxPos;

qInfo() << "Position " << position;
m_cursorPos = position;
}

Expand All @@ -492,6 +547,47 @@ void QHexView::ensureVisible()
verticalScrollBar() -> setValue(cursorY - areaSize.height() / m_charHeight + 1);
}

void QHexView::setMode(bool readOnly)
{
int x = (m_cursorPos/2)%BYTES_PER_LINE;
int y = (m_cursorPos/2)/BYTES_PER_LINE;
QByteArray ar = m_pdata->getData(m_cursorPos/2, 1);
QString val = QString::number(((int) ar.at(0) & 0xF0) >> 4, 16);
val += QString::number(((int) ar.at(0) & 0xF), 16);
if (readOnly) {
m_mode = READ_ONLY;
if (m_edit) {
delete m_edit;
m_edit = nullptr;
}
} else {
m_mode = EDIT;
if (!m_edit) {
m_edit = new QHexCellEdit(this, (uint8_t) ar.at(0));
m_edit->resize(m_charWidth*2 + 2, m_charHeight);
m_edit->move((GAP_ADR_HEX+1+x*3)*m_charWidth + 4, (y*m_charHeight) + 5);
m_edit->setAlignment(Qt::AlignHCenter);
m_edit->setText(val);
m_edit->setFocus();

m_edit->setCursorPosition(0);
m_edit->selectAll();
m_edit->show();
}
}
}

void QHexView::releaseEditCell(bool newValue)
{
if (m_edit) {
if (newValue) {
m_pdata->setByte(m_cursorPos/2, m_edit->getValue());
}
delete m_edit;
m_edit = nullptr;
setFocus();
}
}


QHexView::DataStorageArray::DataStorageArray(const QByteArray &arr)
Expand All @@ -510,6 +606,13 @@ std::size_t QHexView::DataStorageArray::size()
return m_data.count();
}

void QHexView::DataStorageArray::setByte(std::size_t position, uint8_t value)
{
if (position < m_data.size()) {
m_data.replace(position, 1, QByteArray(1, value));
qInfo() << "Updated value";
}
}

QHexView::DataStorageFile::DataStorageFile(const QString &fileName): m_file(fileName)
{
Expand All @@ -529,3 +632,46 @@ std::size_t QHexView::DataStorageFile::size()
{
return m_file.size();
}


QHexView::QHexCellEdit::QHexCellEdit(QWidget *parent, uint8_t value)
:QLineEdit(parent), m_value(value)
{
setMaxLength(2);
}


void QHexView::QHexCellEdit::keyPressEvent(QKeyEvent *event)
{
if (event->matches(QKeySequence::Cancel)) {
dynamic_cast<QHexView*>(parentWidget())->releaseEditCell(false);
} else {
switch (event->key()) {
case Qt::Key_0:
case Qt::Key_1:
case Qt::Key_2:
case Qt::Key_3:
case Qt::Key_4:
case Qt::Key_5:
case Qt::Key_6:
case Qt::Key_7:
case Qt::Key_8:
case Qt::Key_9:
case Qt::Key_A:
case Qt::Key_B:
case Qt::Key_C:
case Qt::Key_D:
case Qt::Key_E:
case Qt::Key_F:
case Qt::Key_Left:
case Qt::Key_Right:
QLineEdit::keyPressEvent(event);
break;
case Qt::Key_Return:
bool valid;
m_value = text().toLong(&valid,16);
dynamic_cast<QHexView*>(parentWidget())->releaseEditCell(true);
}
}
}