HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget Commit - r7:cfbbc6302d85

Sync

Jeandet Alexis -

r7:cfbbc6302d85 default

parent child

Context file:

r7:cfbbc6302d85

Collapse all files

src/peripheralwidget.cpp +11 -1

             void peripheralWidget::mouseMoveEvent(QMouseEvent *event)
             {
+                bool match=false;
+                for(int i=0; i<registersWdgts.count();i++)
+                {
+                    if(registersWdgts.at(i)->contains(event->pos()))
+                    {
+                        match = true;
+                        QToolTip::showText(event->globalPos(),registersWdgts.at(i)->bitFieldDesc(registersWdgts.at(i)->cursorIndex(event->pos().x())),(QWidget*)this);
+                    }
+                }
+                if(!match)QToolTip::hideText();
             }
             void peripheralWidget::mouseReleaseEvent(QMouseEvent *event)
                         case Qt::Key_R:
                             qint32 value;
                             value = emit readRegSig(registersWdgts.at(selectedReg)->address());
+                            registersWdgts.at(selectedReg)->setValue(value);
                             break;
                         default:
                             break;

src/peripheralwidget.h +10 -2

             #include <QList>
             #include <QTimer>
             #include "registerwidget.h"
+            /*
+             * TODO ADD an outdated marker
+             * Show outdated registers with a different color for example
+            */
             class peripheralWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit peripheralWidget(const QString& name,qint32 baseAddress, QWidget *parent = 0);
+                registerWidget* registerAt(int index)
+                {
+                    if(index>=0 && index<registersWdgts.count())
+                        return registersWdgts.at(index);
+                    return NULL;
+                }
             signals:
                 void writeRegSig(qint32 address,qint32 value);
                 qint32 readRegSig(qint32 address);

src/registerwidget.cpp +6 -4

             void registerWidget::set(int index)
             {
+                if(!this->p_fieldsEl->readonly(index))
+                {
                     p_value |= 1<<index;
                     this->p_fieldsEl->setValue(QString("%1").arg((uint)p_value,32,2).replace(" ","0"));
                     emit this->repaint();
                 }
+            }
             void registerWidget::updateBoundingRect()
             {
             bitfieldsElement::bitfieldsElement(const QString &value, QFont font, int xMargin, int yMargin)
                 :regWidgetElement(value,font,xMargin,yMargin)
             {
-                this->attributesLUT.append(new bitFieldAttribute(true,"desc1"));
+                this->attributesLUT.append(new bitFieldAttribute(false,"UNSUSED"));
-                this->attributesLUT.append(new bitFieldAttribute(false,"desc2"));
                 for(int i=0;i<32;i++)
                 {
-                    attributesIndex[i] = i&1;
+                    attributesIndex[i] = 0;
                 }
                 updateBoundingRect();
                 p_blinkTextBgColor = QColor(Qt::black);
                     {
                         if(p_cursorBlinkEnable == false || (31-p_cursorIndex) != ((i*4)+l))
                         {
-                            if(attributesLUT[attributesIndex[(i*4)+l]]->rw==false)
+                            if(attributesLUT[attributesIndex[31-((i*4)+l)]]->rw==false)
                             {
                                 painter->fillRect(xpos-1,0,p_dx,p_boundingRec.height(),Qt::lightGray);
                             }

src/registerwidget.h +35 0

@@ -79,6 +79,25 public:
79	uint cursorIndex();	79	uint cursorIndex();
80	uint cursorIndex(int xPos);	80	uint cursorIndex(int xPos);
81	void setFont(QFont font);	81	void setFont(QFont font);
		82	int addAttribute(const QString& description,bool rw)
		83	{
		84	attributesLUT.append(new bitFieldAttribute(rw,description));
		85	return attributesLUT.count()-1;
		86	}
		87	int setAttribute(int bitIndex,int attributeIndex)
		88	{
		89	attributesIndex[bitIndex]=attributeIndex;
		90	}
		91	QString description(int bitIndex)
		92	{
		93	return attributesLUT.at(attributesIndex[bitIndex])->description;
		94	}
		95	bool readonly(int bitIndex)
		96	{
		97	if(bitIndex>=0 && bitIndex<32)
		98	return !attributesLUT.at(attributesIndex[bitIndex])->rw;
		99	return false;
		100	}
82	private:	101	private:
83	int attributesIndex[32];	102	int attributesIndex[32];
84	uint p_cursorIndex;	103	uint p_cursorIndex;
@@ -103,6 +122,22 public:
103	uint cursorIndex(int xPos);	122	uint cursorIndex(int xPos);
104	qint32 address();	123	qint32 address();
105	qint32 value();	124	qint32 value();
		125	void setBitFieldAttribute(uint startIndex,uint stopIndex,const QString& description,bool rw)
		126	{
		127	if(startIndex<=stopIndex && stopIndex<32)
		128	{
		129	int index= p_fieldsEl->addAttribute(description,rw );
		130	for(uint i=startIndex;i<=stopIndex;i++)
		131	{
		132	p_fieldsEl->setAttribute(i,index);
		133	}
		134	}
		135	}
		136	QString bitFieldDesc(int bitIndex)
		137	{
		138	return p_fieldsEl->description(bitIndex);
		139	}
		140
106	signals:	141	signals:
107	void cursorUp(int pos);	142	void cursorUp(int pos);
108	void cursorDown(int pos);	143	void cursorDown(int pos);

src/socregsviewer.h +2 0

             #include <QtWidgets>
             #include "peripheralwidget.h"
             class socRegsViewer : public QScrollArea
             {
                 Q_OBJECT

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