HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget Commit - r9:97731c51318c

improved register GUI....

jeandet -

r9:97731c51318c default

parent child

Context file:

r9:97731c51318c

Collapse all files

src/peripheralwidget.cpp +20 -7

             void peripheralWidget::mouseMoveEvent(QMouseEvent *event)
             {
                 bool match=false;
-                for(int i=0; i<registersWdgts.count();i++)
+                if(event->buttons()==Qt::LeftButton)
                 {
-                    if(registersWdgts.at(i)->contains(event->pos()))
+                    for(int i=0; i<registersWdgts.count();i++)
                     {
-                        match = true;
+                        if(registersWdgts.at(i)->contains(event->pos()))
-                        QToolTip::showText(event->globalPos(),registersWdgts.at(i)->bitFieldDesc(registersWdgts.at(i)->cursorIndex(event->pos().x())),(QWidget*)this);
+                            registersWdgts.at(i)->updateSelection(registersWdgts.at(i)->cursorIndex(event->pos().x()));
+                        }
                     }
                 }
-                if(!match)QToolTip::hideText();
+                else
+                {
+                    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)
             {
                 if(selectedReg!=-1 && selectedReg >0)
                 {
+                    registersWdgts.at(selectedReg-1)->enter(registersWdgts.at(selectedReg)->cursorIndex());
                     registersWdgts.at(selectedReg)->leave();
                     selectedReg-=1;
-                    registersWdgts.at(selectedReg)->enter(registersWdgts.at(selectedReg+1)->cursorIndex());
                     repaint();
                 }
             }
             {
                 if(selectedReg!=-1 && selectedReg <(registersWdgts.count()-1))
                 {
+                    registersWdgts.at(selectedReg+1)->enter(registersWdgts.at(selectedReg)->cursorIndex());
                     registersWdgts.at(selectedReg)->leave();
                     selectedReg+=1;
-                    registersWdgts.at(selectedReg)->enter(registersWdgts.at(selectedReg-1)->cursorIndex());
                     repaint();
                 }
             }

src/peripheralwidget.h +1 0

                 QList<registerWidget*> registersWdgts;
                 int selectedReg;
                 QTimer* p_timer;
             };
             #endif // PERIPHERALWIDGET_H

src/registerwidget.cpp +89 -10

                 p_fieldsEl = new bitfieldsElement(QString("%1").arg((uint)p_value,32,2).replace(" ","0"),QFont("Utopia", 12),4,4);
                 p_nameEl = new regWidgetElement(name,QFont("Utopia", 12,QFont::Bold),4,4);
                 p_xMargins = 4;
-                p_yMargins = 4;
+                p_yMargins = 6;
                 updateBoundingRect();
             }
                 {
                     return p_fieldsEl->cursorIndex(xPos-p_addressEl->boundingRect().width());
                 }
+                return 0;
+            }
+            void registerWidget::updateSelection(int index)
+            {
+                p_fieldsEl->updateSelection(index);
+                emit this->repaint();
             }
             qint32 registerWidget::address()
                 {
                     attributesIndex[i] = 0;
                 }
-                updateBoundingRect();
+                p_startSelectionIndex = -1;
+                p_stopSelectionIndex = -1;
+                p_cursorIndex = -1;
+                p_dx=QFontMetrics(p_font).width("0")+4;
                 p_blinkTextBgColor = QColor(Qt::black);
                 p_blinkTextColor = QColor(Qt::white);
                 p_cursorBlinkEnable = false;
-                p_dx=QFontMetrics(p_font).width("0")+2;
+                updateBoundingRect();
             }
             QPoint bitfieldsElement::paint(QPainter *painter)
                 painter->fillRect(4,4,p_boundingRec.width(),p_boundingRec.height(),Qt::darkGray);
                 painter->fillRect(0,0,p_boundingRec.width(),p_boundingRec.height(),Qt::white);
                 painter->setFont(p_font);
+                int lastAttributeIndex = attributesIndex[31];
                 int xpos=p_xMargins;
                 for(int i=0;i<(32/4);i++)
                 {
                     {
                         if(p_cursorBlinkEnable == false || (31-p_cursorIndex) != ((i*4)+l))
                         {
-                            if(attributesLUT[attributesIndex[31-((i*4)+l)]]->rw==false)
+                            if(p_startSelectionIndex!=-1 && p_stopSelectionIndex!=-1 && p_startSelectionIndex <=31-((i*4)+l) && p_stopSelectionIndex >=31-((i*4)+l))
                             {
-                                painter->fillRect(xpos-1,0,p_dx,p_boundingRec.height(),Qt::lightGray);
+                                QPen svg = painter->pen();
+                                painter->setPen(p_blinkTextColor);
+                                painter->fillRect(xpos-1,0,p_dx,p_boundingRec.height(),Qt::blue);
+                                painter->drawText(xpos,QFontMetrics(p_font).ascent()+p_yMargins,p_valueStr.at((i*4)+l));
+                                painter->setPen(svg);
                             }
                             else
                             {
-                                painter->fillRect(xpos-1,0,p_dx,p_boundingRec.height(),Qt::white);
+                                if(attributesLUT[attributesIndex[31-((i*4)+l)]]->rw==false)
+                                {
+                                    painter->fillRect(xpos-1,0,p_dx,p_boundingRec.height(),Qt::lightGray);
+                                }
+                                else
+                                {
+                                    painter->fillRect(xpos-1,0,p_dx,p_boundingRec.height(),Qt::white);
+                                }
+                                painter->drawText(xpos,QFontMetrics(p_font).ascent()+p_yMargins,p_valueStr.at((i*4)+l));
                             }
-                            painter->drawText(xpos,QFontMetrics(p_font).ascent()+p_yMargins,p_valueStr.at((i*4)+l));
                         }
                         else
                         {
                             painter->drawText(xpos,QFontMetrics(p_font).ascent()+p_yMargins,p_valueStr.at((i*4)+l));
                             painter->setPen(svg);
                         }
+                        if(lastAttributeIndex!=attributesIndex[31-((i*4)+l)])
+                            painter->drawLine(xpos-(p_xMargins/2),0,xpos-(p_xMargins/2),p_boundingRec.height());
+                        lastAttributeIndex=attributesIndex[31-((i*4)+l)];
                         xpos+=p_dx;
                     }
                     if(i==3)
-                        painter->drawLine(xpos+(p_xMargins/2),p_boundingRec.height()-6,xpos+(p_xMargins/2),p_boundingRec.height()+6);
+                        painter->drawLine(xpos+(p_xMargins/2),p_boundingRec.height()-6,xpos+(p_xMargins/2),p_boundingRec.height()+12);
                     else if(i<7)
-                        painter->drawLine(xpos+(p_xMargins/2),p_boundingRec.height()-2,xpos+(p_xMargins/2),p_boundingRec.height()+2);
+                        painter->drawLine(xpos+(p_xMargins/2),p_boundingRec.height()-6,xpos+(p_xMargins/2),p_boundingRec.height()+6);
                     xpos+=p_xMargins;
                 }
                 painter->drawRect(0,0,p_boundingRec.width(),p_boundingRec.height());
             void bitfieldsElement::updateBoundingRect()
             {
                 p_boundingRec.setHeight(QFontMetrics(p_font).boundingRect(p_valueStr).height()+(p_yMargins*2));
-                int width = (((4*(QFontMetrics(p_font).width("0") + 2)) + p_xMargins) * 8) + (p_xMargins);
+                int width = (((4*(p_dx)) + p_xMargins) * 8) + (p_xMargins);
                 p_boundingRec.setWidth(width);
             }
                 {
                     p_cursorIndex = 31;
                 }
+                p_startSelectionIndex = p_cursorIndex;
+                p_stopSelectionIndex = p_cursorIndex;
             }
                 {
                     p_cursorIndex = 0;
                 }
+                p_startSelectionIndex = p_cursorIndex;
+                p_stopSelectionIndex = p_cursorIndex;
             }
             void bitfieldsElement::enter(int index)
             {
                 p_cursorIndex = index;
                 p_cursorBlinkEnable = true;
+                p_startSelectionIndex = -1;
+                p_stopSelectionIndex = -1;
             }
             void bitfieldsElement::leave()
             {
                 p_cursorBlinkEnable = false;
+                p_cursorIndex = -1;
+                p_startSelectionIndex = -1;
+                p_stopSelectionIndex = -1;
             }
             uint bitfieldsElement::cursorIndex()
                 p_dx=QFontMetrics(p_font).width("0")+2;
                 updateBoundingRect();
             }
+            void bitfieldsElement::updateSelection(int index)
+            {
+                if(p_cursorIndex!=-1)
+                {
+                    if(p_startSelectionIndex!=-1 && p_stopSelectionIndex!= -1)
+                    {
+                        if(index>=p_stopSelectionIndex)
+                        {
+                            p_stopSelectionIndex = index;
+                            p_cursorIndex = index;
+                        }
+                        else
+                        {
+                            p_startSelectionIndex = index;
+                            p_cursorIndex = index;
+                        }
+                    }
+                    else
+                    {
+                        if(index>p_cursorIndex)
+                        {
+                            p_startSelectionIndex = p_cursorIndex;
+                            p_stopSelectionIndex = index;
+                        }
+                        else
+                        {
+                            p_startSelectionIndex = index;
+                            p_stopSelectionIndex = p_cursorIndex;
+                        }
+                    }
+                }
+            }

src/registerwidget.h +5 0

                 uint cursorIndex();
                 uint cursorIndex(int xPos);
                 void setFont(QFont font);
+                void updateSelection(int index);
                 int addAttribute(const QString& description,bool rw)
                 {
                     attributesLUT.append(new bitFieldAttribute(rw,description));
             private:
                 int attributesIndex[32];
                 uint p_cursorIndex;
+                uint p_startSelectionIndex;
+                uint p_stopSelectionIndex;
                 bool p_cursorBlinkEnable;
                 int p_dx;
                 QList<bitFieldAttribute*> attributesLUT;
                 QRect boundingRect();
                 uint cursorIndex();
                 uint cursorIndex(int xPos);
+                void updateSelection(int index);
                 qint32 address();
                 qint32 value();
                 void setBitFieldAttribute(uint startIndex,uint stopIndex,const QString& description,bool rw)

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