HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget Commit - r5:4e6b18a64911

Cleaned path to use as hg submodule of lppmon_sdk or any other project.

Jeandet Alexis -

r5:4e6b18a64911 default

parent child

Context file:

r5:4e6b18a64911

Collapse all files

PeripheralWidget.pri created 644 +9 0

@@ -0,0 +1,9
	1
	2	PERIPHERAL_WDGT_SOURCES =\
	3	src/peripheralwidget.cpp \
	4	src/registerwidget.cpp
	5
	6	PERIPHERAL_WDGT_HEADERS += \
	7	src/peripheralwidget.h \
	8	src/registerwidget.h
	9

PeripheralWidget.pro +12 -7

@@ -10,13 +10,18 greaterThan(QT_MAJOR_VERSION, 4): QT +=
10		10
11	TARGET = PeripheralWidget	11	TARGET = PeripheralWidget
12	TEMPLATE = app	12	TEMPLATE = app
		13	MOC_DIR = moc
		14	OBJECTS_DIR = obj
		15	DESTDIR = bin
13		16
		17	include(PeripheralWidget.pri)
		18
		19	INCLUDEPATH += src
14		20
15	SOURCES += main.cpp\	21	SOURCES += test/main.cpp \
16	mainwindow.cpp \	22	test/mainwindow.cpp \
17	peripheralwidget.cpp \	23	$$PERIPHERAL_WDGT_SOURCES
18	registerwidget.cpp
19		24
20	HEADERS += mainwindow.h \	25	HEADERS += test/mainwindow.h \
21	peripheralwidget.h \	26	$$PERIPHERAL_WDGT_HEADERS
22	registerwidget.h	27

src/peripheralwidget.cpp ~~peripheralwidget.cpp~~ renamed +33 -10

             #include "peripheralwidget.h"
-            peripheralWidget::peripheralWidget(const QString &name, QWidget *parent) :
+            peripheralWidget::peripheralWidget(const QString &name, qint32 baseAddress, QWidget *parent) :
                 QWidget(parent)
             {
                 p_name = name;
                 p_timer = new QTimer(this);
                 p_timer->setInterval(500);
-                for(int i=0;i<10;i++)
+                p_baseAddress = baseAddress;
+                p_header = p_name + QString(" @0x%1").arg((uint)p_baseAddress,8,16);
-                    registersWdgts.append(new registerWidget(QString("REG%1").arg(i),i*4));
-                    registersWdgts.at(i)->setValue((i<<24)+(i<<8)+i);
-                    connect(registersWdgts.at(i),SIGNAL(repaint()),this,SLOT(repaint()));
                 setAttribute(Qt::WA_AlwaysShowToolTips);
                 setMouseTracking(true);
                 setFocusPolicy(Qt::StrongFocus);
                 selectedReg = -1;
+                registersWdgts.clear();
                 connect(p_timer,SIGNAL(timeout()),this,SLOT(blinkCursor()));
                 setFont(QFont("Utopia", 14,QFont::Bold));
             }
                 repaint();
             }
+            void peripheralWidget::addRegister(const QString &name, qint32 address)
+            {
+                /*TODO  Should regs by address*/
+                registersWdgts.append(new registerWidget(name,address));
+                connect(registersWdgts.last(),SIGNAL(repaint()),this,SLOT(repaint()));
+            }
             void peripheralWidget::mousePressEvent(QMouseEvent *event)
             {
                 p_timer->stop();
                 if(selectedReg!=-1)
+                {
                     registersWdgts.at(selectedReg)->leave();
+                    selectedReg = -1;
+                }
                 for(int i=0; i<registersWdgts.count();i++)
                 {
                     if(registersWdgts.at(i)->contains(event->pos()))
                         case Qt::Key_Down:
                             registersWdgts.at(selectedReg)->clear(registersWdgts.at(selectedReg)->cursorIndex());
                             break;
+                        case Qt::Key_W:
+                            emit writeRegSig(registersWdgts.at(selectedReg)->address(),registersWdgts.at(selectedReg)->value());
+                            break;
+                        case Qt::Key_R:
+                            qint32 value;
+                            value = emit readRegSig(registersWdgts.at(selectedReg)->address());
+                            break;
                         default:
                             break;
                         }
             void peripheralWidget::paintEvent(QPaintEvent *event)
             {
                 Q_UNUSED(event)
                 QPainter painter(this);
                 QPoint offset=QPoint(0,0);
-                int nameWidth = fontMetrics().width(p_name);
+                int nameWidth = fontMetrics().width(p_header);
-                painter.drawText((this->minimumWidth()/2)-nameWidth,4,fontMetrics().width(p_name),fontMetrics().height()+4,Qt::AlignCenter,p_name);
+                if(registersWdgts.count()==0)
+                {
+                    setMinimumSize(2*nameWidth+10,fontMetrics().height()+10);
+                }
+                painter.drawText((this->minimumWidth()/2)-nameWidth,4,fontMetrics().width(p_header),fontMetrics().height()+4,Qt::AlignCenter,p_header);
                 offset+=QPoint(0,fontMetrics().height()+8);
                 for(int i=0;i<registersWdgts.count();i++)
                 {
                     offset = registersWdgts.at(i)->paint(&painter,offset);
                 }
-                setMinimumSize(registersWdgts.first()->boundingRect().width(),offset.y());
+                if(registersWdgts.count()>0)
+                {
+                    setMinimumSize(registersWdgts.first()->boundingRect().width(),offset.y());
+                }
                 updateGeometry();
             }
             void peripheralWidget::up()

src/peripheralwidget.h ~~peripheralwidget.h~~ renamed +6 -2

             {
                 Q_OBJECT
             public:
-                explicit peripheralWidget(const QString& name, QWidget *parent = 0);
+                explicit peripheralWidget(const QString& name,qint32 baseAddress, QWidget *parent = 0);
             signals:
+                void writeRegSig(qint32 address,qint32 value);
+                qint32 readRegSig(qint32 address);
             public slots:
                 void blinkCursor();
+                void addRegister(const QString& name,qint32 address);
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void up();
                 void down();
                 QString p_name;
+                QString p_header;
+                qint32 p_baseAddress;
                 QList<registerWidget*> registersWdgts;
                 int selectedReg;
                 QTimer* p_timer;

src/registerwidget.cpp ~~registerwidget.cpp~~ renamed +10 0

@@ -59,6 +59,16 uint registerWidget::cursorIndex(int xPo
59	}	59	}
60	}	60	}
61		61
		62	qint32 registerWidget::address()
		63	{
		64	return p_address;
		65	}
		66
		67	qint32 registerWidget::value()
		68	{
		69	return p_value;
		70	}
		71
62	void registerWidget::setValue(qint32 value)	72	void registerWidget::setValue(qint32 value)
63	{	73	{
64	this->p_value = value;	74	this->p_value = value;

src/registerwidget.h ~~registerwidget.h~~ renamed +2 0

                 QRect boundingRect();
                 uint cursorIndex();
                 uint cursorIndex(int xPos);
+                qint32 address();
+                qint32 value();
             signals:
                 void cursorUp(int pos);
                 void cursorDown(int pos);

test/main.cpp ~~main.cpp~~ renamed 0 0

NO CONTENT: file renamed from main.cpp to test/main.cpp

test/mainwindow.cpp ~~mainwindow.cpp~~ renamed +5 -1

             MainWindow::MainWindow(QWidget *parent)
                 : QMainWindow(parent)
             {
-                this->setCentralWidget(new peripheralWidget("UART1",this));
+                qint32 baseAddress = 0x8000100;
+                testWidget  = new peripheralWidget("UART1",baseAddress,this);
+                for(int i=0;i<10;i++)
+                    testWidget->addRegister(QString("REG%1").arg((uint)i),baseAddress+(i*4));
+                this->setCentralWidget(testWidget);
             }
             MainWindow::~MainWindow()

test/mainwindow.h ~~mainwindow.h~~ renamed +2 0

             public:
                 MainWindow(QWidget *parent = 0);
                 ~MainWindow();
+                peripheralWidget* testWidget;
             };
             #endif // MAINWINDOW_H

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages