HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/PeripheralWidget Commit - r19:1cb664ab4bb3

New Peripheral view almost done.

jeandet -

r19:1cb664ab4bb3 tip default

parent child

Context file:

r19:1cb664ab4bb3

src/collapsableperipheralwidget.cpp +8 0

             #include "collapsableperipheralwidget.h"
             #include "ui_collapsableperipheralwidget.h"
             #include <QCursor>
             CollapsablePeripheralWidget::CollapsablePeripheralWidget(peripheralWidget *periph, QWidget *parent) :
                 QWidget(parent),
                 ui(new Ui::CollapsablePeripheralWidget)
             {
                 m_periph=0;
                 m_collapsed = true;
                 ui->setupUi(this);
                 tthidetmr.setSingleShot(true);
                 tthidetmr.setInterval(200);
                 connect(this->ui->collapseQpb,SIGNAL(clicked()),this,SLOT(collapse()));
                 connect(this->ui->periphName,SIGNAL(clicked()),this,SLOT(collapse()));
                 connect(this->ui->periphName,SIGNAL(enter()),this,SLOT(showTooltip()));
                 connect(this->ui->periphName,SIGNAL(leave()),&this->tthidetmr,SLOT(start()));
                 connect(&this->tthidetmr,SIGNAL(timeout()),this,SLOT(hideTooltip()));
                 setPeripheralWidget(periph);
             }
             CollapsablePeripheralWidget::~CollapsablePeripheralWidget()
             {
                 delete ui;
             }
             void CollapsablePeripheralWidget::setPeripheralWidget(peripheralWidget *periph)
             {
                 if(periph)
                 {
                     this->m_periph = periph;
                     this->ui->gridLayout->addWidget(periph,1,0,1,-1);
                     this->ui->periphName->setText(periph->name());
                     this->m_periph->setVisible(false);
                 }
             }
             peripheralWidget *CollapsablePeripheralWidget::getPeripheralWidget()
             {
                 return m_periph;
             }
             void CollapsablePeripheralWidget::changeEvent(QEvent *e)
             {
                 QWidget::changeEvent(e);
                 switch (e->type()) {
                 case QEvent::LanguageChange:
                     ui->retranslateUi(this);
                     break;
                 default:
                     break;
                 }
             }
+            void CollapsablePeripheralWidget::paintEvent(QPaintEvent *)
+            {
+                QStyleOption opt;
+                opt.init(this);
+                QPainter p(this);
+                style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+            }
             void CollapsablePeripheralWidget::collapse()
             {
                 this->m_periph->setVisible(m_collapsed);
                 if(this->m_collapsed)
                 {
                     this->ui->collapseQpb->setIcon(QIcon(":/img/Gnome-list-remove.svg"));
                 }
                 else
                 {
                     this->ui->collapseQpb->setIcon(QIcon(":/img/Gnome-list-add.svg"));
                 }
                 m_collapsed = !m_collapsed;
             }
             void CollapsablePeripheralWidget::setName(const QString &name)
             {
                 if(m_periph)
                 {
                     this->ui->periphName->setText(name);
                 }
             }
             void CollapsablePeripheralWidget::showTooltip()
             {
                 if(!m_periph->isVisible() && m_collapsed)
                 {
                     m_periph->show();
                 }
             }
             void CollapsablePeripheralWidget::hideTooltip()
             {
                 if(m_periph->isVisible() && m_collapsed)
                 {
                     QRect temprect = this->geometry();
                     temprect.moveTo(this->mapToGlobal(mapFromParent(QPoint(this->x(),this->y()))));
                     if(temprect.contains(QCursor::pos()))
                     {
                         this->tthidetmr.start();
                     }
                     else
                     {
                         m_periph->hide();
                     }
                 }
             }

src/collapsableperipheralwidget.h +1 -1

             #ifndef COLLAPSABLEPERIPHERALWIDGET_H
             #define COLLAPSABLEPERIPHERALWIDGET_H
             #include <QWidget>
             #include <peripheralwidget.h>
             #include <QTimer>
             namespace Ui {
             class CollapsablePeripheralWidget;
             }
             class QRegToolTipLabel : public QLabel
             {
                 Q_OBJECT
             public:
                 QRegToolTipLabel(QWidget * parent = 0, Qt::WindowFlags f = 0):QLabel(parent,f){}
                 QRegToolTipLabel(const QString & text, QWidget * parent = 0, Qt::WindowFlags f = 0):QLabel(text,parent,f){}
             signals:
                 void enter();
                 void leave();
                 void clicked();
             protected:
                 void enterEvent(QEvent* event){emit enter();QLabel::enterEvent(event);}
                 void leaveEvent(QEvent* event){emit leave();QLabel::leaveEvent(event);}
                 void mousePressEvent(QMouseEvent * event){emit clicked();QLabel::mousePressEvent(event);}
             };
             class CollapsablePeripheralWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit CollapsablePeripheralWidget(peripheralWidget* periph,QWidget *parent = 0);
                 ~CollapsablePeripheralWidget();
                 void setPeripheralWidget(peripheralWidget* periph);
                 peripheralWidget* getPeripheralWidget();
             protected:
                 void changeEvent(QEvent *e);
+                void paintEvent(QPaintEvent *);
             public slots:
                 void collapse();
                 void setName(const QString& name);
                 void showTooltip();
                 void hideTooltip();
             signals:
                 void clicked(peripheralWidget* sender);
                 void upSig(peripheralWidget* sender,int cursorIndex);
                 void downSig(peripheralWidget* sender,int cursorIndex);
             private:
                 Ui::CollapsablePeripheralWidget *ui;
                 peripheralWidget* m_periph;
                 bool m_collapsed;
                 QTimer tthidetmr;
             };
             #endif // COLLAPSABLEPERIPHERALWIDGET_H

src/collapsableperipheralwidget.ui +6 -6

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>CollapsablePeripheralWidget</class>
              <widget class="QWidget" name="CollapsablePeripheralWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>845</width>
+                <width>833</width>
-                <height>249</height>
+                <height>192</height>
                </rect>
               </property>
               <property name="sizePolicy">
                <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <property name="styleSheet">
-               <string notr="true">QWidget#CollapsablePeripheralWidget {
+               <string notr="true"/>
-                border: 1px solid gray;
-                border-radius: 9px;
-            }</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
                <item row="0" column="2">
                 <widget class="QPushButton" name="collapseQpb">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
+                 <property name="focusPolicy">
+                  <enum>Qt::NoFocus</enum>
+                 </property>
                  <property name="text">
                   <string/>
                  </property>
                  <property name="icon">
                   <iconset resource="../ressources/peripheralwidget.qrc">
                    <normaloff>:/img/Gnome-list-add.svg</normaloff>
                    <normalon>:/img/Gnome-list-remove.svg</normalon>:/img/Gnome-list-add.svg</iconset>
                  </property>
                  <property name="flat">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item row="0" column="0">
                 <widget class="QRegToolTipLabel" name="periphName">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="text">
                   <string>PeriphName</string>
                  </property>
                 </widget>
                </item>
                <item row="0" column="1">
                 <spacer name="horizontalSpacer">
                  <property name="orientation">
                   <enum>Qt::Horizontal</enum>
                  </property>
                  <property name="sizeHint" stdset="0">
                   <size>
                    <width>40</width>
                    <height>20</height>
                   </size>
                  </property>
                 </spacer>
                </item>
               </layout>
              </widget>
              <customwidgets>
               <customwidget>
                <class>QRegToolTipLabel</class>
                <extends>QLabel</extends>
                <header location="global">collapsableperipheralwidget.h</header>
               </customwidget>
              </customwidgets>
              <resources>
               <include location="../ressources/peripheralwidget.qrc"/>
              </resources>
              <connections/>
             </ui>

src/socregsviewernew.cpp +15 -2

             #include "socregsviewernew.h"
             #include "ui_socregsviewernew.h"
             SocRegsViewerNew::SocRegsViewerNew(const QString &name,QWidget *parent) :
                 QWidget(parent),
                 ui(new Ui::SocRegsViewerNew)
             {
                 ui->setupUi(this);
                 this->ui->socName->setText(name);
             }
+            SocRegsViewerNew::SocRegsViewerNew(QWidget *parent):
+                QWidget(parent),
+                ui(new Ui::SocRegsViewerNew)
+            {
+                ui->setupUi(this);
+                this->ui->socName->setText("No name");
+            }
             SocRegsViewerNew::~SocRegsViewerNew()
             {
                 delete ui;
             }
             peripheralWidget *SocRegsViewerNew::peripheral(int index)
             {
                 if(index>=0 && index<p_peripherals.count())
                 {
                     return p_peripherals.at(index);
                 }
                 return NULL;
             }
             void SocRegsViewerNew::addPeripheral(peripheralWidget *peripheral)
             {
                 if(peripheral!=NULL)
                 {
                     CollapsablePeripheralWidget* cperiph = new CollapsablePeripheralWidget(peripheral);
                     cperiph->setPeripheralWidget(peripheral);
                     p_peripherals.append(peripheral);
                     p_CPeripherals.append(cperiph);
                     this->ui->scrollAreaWidgetContents->layout()->addWidget(cperiph);
                     connect(cperiph,SIGNAL(clicked(peripheralWidget*)),this,SLOT(periphClicked(peripheralWidget*)));
                     connect(cperiph,SIGNAL(upSig(peripheralWidget*,int)),this,SLOT(periphUp(peripheralWidget*,int)));
                     connect(cperiph,SIGNAL(downSig(peripheralWidget*,int)),this,SLOT(periphDown(peripheralWidget*,int)));
                 }
             }
             void SocRegsViewerNew::periphClicked(peripheralWidget *sender)
             {
                 peripheralWidget * item;
                 if(sender!=NULL)
                 {
                     for(int i=0;i<p_peripherals.count();i++)
                     {
                         item = p_peripherals.at(i);
                         if(item!=sender)
                         {
                             item->leave();
                         }
                     }
                 }
             }
             void SocRegsViewerNew::periphUp(peripheralWidget *sender, int cursorIndex)
             {
                 int index,senderIndex;
                 if(sender!=NULL)
                 {
                     index =senderIndex= p_peripherals.indexOf(sender);
                     while(index!=-1 && index!=0)
                     {
                         if(p_peripherals.at(index-1)->count()>0)
                         {
                             p_peripherals.at(senderIndex)->leave();
                             p_peripherals.at(index-1)->enter(cursorIndex,false);
-            //                ensureWidgetVisible(p_peripherals.at(index-1));
+                            //                ensureWidgetVisible(p_peripherals.at(index-1));
                             break;
                         }
                         index--;
                     }
                 }
             }
             void SocRegsViewerNew::periphDown(peripheralWidget *sender, int cursorIndex)
             {
                 int index,senderIndex;
                 if(sender!=NULL)
                 {
                     index=senderIndex= p_peripherals.indexOf(sender);
                     while((index!=-1) && (index<(p_peripherals.count()-1)))
                     {
                         if(p_peripherals.at(index+1)->count()>0)
                         {
                             p_peripherals.at(senderIndex)->leave();
                             p_peripherals.at(index+1)->enter(cursorIndex);
-            //                ensureWidgetVisible(p_peripherals.at(index+1));
+                            //                ensureWidgetVisible(p_peripherals.at(index+1));
                             break;
                         }
                         index++;
                     }
                 }
             }
+            void SocRegsViewerNew::setSocName(const QString &name)
+            {
+                this->ui->socName->setText(name);
+            }
             void SocRegsViewerNew::changeEvent(QEvent *e)
             {
                 QWidget::changeEvent(e);
                 switch (e->type()) {
                 case QEvent::LanguageChange:
                     ui->retranslateUi(this);
                     break;
                 default:
                     break;
                 }
             }

src/socregsviewernew.h +2 0

             #ifndef SOCREGSVIEWERNEW_H
             #define SOCREGSVIEWERNEW_H
             #include <QWidget>
             #include <peripheralwidget.h>
             #include <collapsableperipheralwidget.h>
             namespace Ui {
             class SocRegsViewerNew;
             }
             class SocRegsViewerNew : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit SocRegsViewerNew(const QString &name, QWidget *parent = 0);
+                explicit SocRegsViewerNew(QWidget *parent = 0);
                 ~SocRegsViewerNew();
                 peripheralWidget *peripheral(int index);
             signals:
             public slots:
                 void addPeripheral(peripheralWidget* peripheral);
                 void periphClicked(peripheralWidget* sender);
                 void periphUp(peripheralWidget* sender,int cursorIndex);
                 void periphDown(peripheralWidget* sender,int cursorIndex);
+                void setSocName(const QString& name);
             protected:
                 void changeEvent(QEvent *e);
             private:
                 Ui::SocRegsViewerNew *ui;
                 QList<peripheralWidget*> p_peripherals;
                 QList<CollapsablePeripheralWidget*> p_CPeripherals;
             };
             #endif // SOCREGSVIEWERNEW_H

src/socregsviewernew.ui +2 -12

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>SocRegsViewerNew</class>
              <widget class="QWidget" name="SocRegsViewerNew">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>713</width>
                 <height>357</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QGridLayout" name="gridLayout">
-               <item row="0" column="1">
+               <item row="1" column="0" colspan="2">
-                <widget class="QComboBox" name="rootPluginCmbBx"/>
-               </item>
-               <item row="2" column="0" colspan="2">
                 <widget class="QScrollArea" name="PeriphList">
                  <property name="widgetResizable">
                   <bool>true</bool>
                  </property>
                  <widget class="QWidget" name="scrollAreaWidgetContents">
                   <property name="geometry">
                    <rect>
                     <x>0</x>
                     <y>0</y>
                     <width>693</width>
-                    <height>302</height>
+                    <height>337</height>
                    </rect>
                   </property>
                   <layout class="QVBoxLayout" name="verticalLayout">
                    <item>
                     <widget class="QLabel" name="socName">
                      <property name="text">
                       <string>SocName</string>
                      </property>
                      <property name="alignment">
                       <set>Qt::AlignCenter</set>
                      </property>
                     </widget>
                    </item>
                   </layout>
                  </widget>
                 </widget>
                </item>
-               <item row="0" column="0">
-                <widget class="QLabel" name="label">
-                 <property name="text">
-                  <string>Root Plugin</string>
-                 </property>
-                </widget>
-               </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

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