Changeset - 601fe4ade58b
Parent rev.
Child rev.
[Not reviewed]
channelmanager
0 5 0
Hasan Yavuz ÖZDERYA - 9 years ago 2017-01-02 09:42:15
hy@ozderya.net
added button to reset channel info
5 files changed with 124 insertions and 21 deletions:
src/channelinfomodel.cpp
40
src/channelinfomodel.h
10
src/plotcontrolpanel.cpp
19
1
src/plotcontrolpanel.h
5
src/plotcontrolpanel.ui
50
20
0 comments (0 inline, 0 general)
src/channelinfomodel.cpp
➞
Show inline comments
 
@@ -203,24 +203,64 @@ void ChannelInfoModel::setNumOfChannels(
 
    _numOfChannels = number;
 

			




	
	
	
		
 
    if (isInserting)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        endInsertRows();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    else

			




	
	
	
		
 
    {

			




	
	
	
		
 
        endRemoveRows();

			




	
	
	
		
 
    }

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelInfoModel::resetInfos()

			




	
	
	
		
 
{

			




	
	
	
		
 
    beginResetModel();

			




	
	
	
		
 
    for (unsigned ci = 0; (int) ci < infos.length(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        infos[ci] = {QString("Channel %1").arg(ci+1), true, colors[ci % 8]};

			




	
	
	
		
 
    }

			




	
	
	
		
 
    endResetModel();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelInfoModel::resetNames()

			




	
	
	
		
 
{

			




	
	
	
		
 
    beginResetModel();

			




	
	
	
		
 
    for (unsigned ci = 0; (int) ci < infos.length(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        infos[ci].name = QString("Channel %1").arg(ci+1);

			




	
	
	
		
 
    }

			




	
	
	
		
 
    endResetModel();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelInfoModel::resetColors()

			




	
	
	
		
 
{

			




	
	
	
		
 
    beginResetModel();

			




	
	
	
		
 
    for (unsigned ci = 0; (int) ci < infos.length(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        infos[ci].color = colors[ci % 8];

			




	
	
	
		
 
    }

			




	
	
	
		
 
    endResetModel();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelInfoModel::resetVisibility()

			




	
	
	
		
 
{

			




	
	
	
		
 
    beginResetModel();

			




	
	
	
		
 
    for (unsigned ci = 0; (int) ci < infos.length(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        infos[ci].visibility = true;

			




	
	
	
		
 
    }

			




	
	
	
		
 
    endResetModel();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void ChannelInfoModel::saveSettings(QSettings* settings)

			




	
	
	
		
 
{

			




	
	
	
		
 
    settings->beginGroup(SettingGroup_Channels);

			




	
	
	
		
 
    settings->beginWriteArray(SG_Channels_Channel);

			




	
	
	
		
 

			




	
	
	
		
 
    // save all channel information regardless of current number of channels

			




	
	
	
		
 
    for (unsigned ci = 0; (int) ci < infos.length(); ci++)

			




	
	
	
		
 
    {

			




	
	
	
		
 
        settings->setArrayIndex(ci);

			




	
	
	
		
 
        settings->setValue(SG_Channels_Name, infos[ci].name);

			




	
	
	
		
 
        settings->setValue(SG_Channels_Color, infos[ci].color);

			




	
	
	
		
 
        settings->setValue(SG_Channels_Visible, infos[ci].visibility);

			




        

    


    
    

    

        

                

                    src/channelinfomodel.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -43,24 +43,34 @@ public:

			




	
	
	
		
 
    int           columnCount(const QModelIndex &parent = QModelIndex()) const;

			




	
	
	
		
 
    QVariant      data(const QModelIndex &index, int role = Qt::DisplayRole) const;

			




	
	
	
		
 
    bool          setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);

			




	
	
	
		
 
    Qt::ItemFlags flags(const QModelIndex &index) const;

			




	
	
	
		
 
    QVariant      headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;

			




	
	
	
		
 

			




	
	
	
		
 
    void setNumOfChannels(unsigned number);

			




	
	
	
		
 
    /// Stores all channel info into a `QSettings`

			




	
	
	
		
 
    void saveSettings(QSettings* settings);

			




	
	
	
		
 
    /// Loads all channel info from a `QSettings`.

			




	
	
	
		
 
    void loadSettings(QSettings* settings);

			




	
	
	
		
 

			




	
	
	
		
 
public slots:

			




	
	
	
		
 
    /// reset all channel info (names, color etc.)

			




	
	
	
		
 
    void resetInfos();

			




	
	
	
		
 
    /// reset all channel names

			




	
	
	
		
 
    void resetNames();

			




	
	
	
		
 
    /// reset all channel colors

			




	
	
	
		
 
    void resetColors();

			




	
	
	
		
 
    /// reset visibility

			




	
	
	
		
 
    void resetVisibility();

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    struct ChannelInfo

			




	
	
	
		
 
    {

			




	
	
	
		
 
        QString name;

			




	
	
	
		
 
        bool visibility;

			




	
	
	
		
 
        QColor color;

			




	
	
	
		
 
    };

			




	
	
	
		
 

			




	
	
	
		
 
    unsigned _numOfChannels;     ///< @note this is not necessarily the length of `infos`

			




	
	
	
		
 

			




	
	
	
		
 
    /**

			




	
	
	
		
 
     * Channel info is added here but never removed so that we can

			




        

    


    
    

    

        

                

                    src/plotcontrolpanel.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,25 +33,30 @@ const int NUMSAMPLES_CONFIRM_AT = 10000;

			




	
	
	
		
 

			




	
	
	
		
 
/// Used for scale range selection combobox

			




	
	
	
		
 
struct Range

			




	
	
	
		
 
{

			




	
	
	
		
 
    double rmin;

			




	
	
	
		
 
    double rmax;

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
Q_DECLARE_METATYPE(Range);

			




	
	
	
		
 

			




	
	
	
		
 
PlotControlPanel::PlotControlPanel(QWidget *parent) :

			




	
	
	
		
 
    QWidget(parent),

			




	
	
	
		
 
    ui(new Ui::PlotControlPanel)

			




	
	
	
		
 
    ui(new Ui::PlotControlPanel),

			




	
	
	
		
 
    resetAct(tr("Reset"), this),

			




	
	
	
		
 
    resetNamesAct(tr("Reset Names"), this),

			




	
	
	
		
 
    resetColorsAct(tr("Reset Colors"), this),

			




	
	
	
		
 
    showAllAct(tr("Show All"), this),

			




	
	
	
		
 
    resetMenu(tr("Reset Menu"), this)

			




	
	
	
		
 
{

			




	
	
	
		
 
    ui->setupUi(this);

			




	
	
	
		
 

			




	
	
	
		
 
    warnNumOfSamples = true;    // TODO: load from settings

			




	
	
	
		
 
    _numOfSamples = ui->spNumOfSamples->value();

			




	
	
	
		
 

			




	
	
	
		
 
    // set limits for axis limit boxes

			




	
	
	
		
 
    ui->spYmin->setRange((-1) * std::numeric_limits<double>::max(),

			




	
	
	
		
 
                         std::numeric_limits<double>::max());

			




	
	
	
		
 

			




	
	
	
		
 
    ui->spYmax->setRange((-1) * std::numeric_limits<double>::max(),

			




	
	
	
		
 
                         std::numeric_limits<double>::max());

			




	
	
		
 
@@ -89,24 +94,31 @@ PlotControlPanel::PlotControlPanel(QWidg

			




	
	
	
		
 
    ui->cbRangePresets->addItem("-1 to +1", QVariant::fromValue(Range{-1, +1}));

			




	
	
	
		
 
    ui->cbRangePresets->addItem("0 to +1", QVariant::fromValue(Range{0, +1}));

			




	
	
	
		
 
    ui->cbRangePresets->addItem("-100 to +100", QVariant::fromValue(Range{-100, +100}));

			




	
	
	
		
 
    ui->cbRangePresets->addItem("0 to +100", QVariant::fromValue(Range{0, +100}));

			




	
	
	
		
 

			




	
	
	
		
 
    QObject::connect(ui->cbRangePresets, SIGNAL(activated(int)),

			




	
	
	
		
 
                     this, SLOT(onRangeSelected()));

			




	
	
	
		
 

			




	
	
	
		
 
    // color selector starts disabled until a channel is selected

			




	
	
	
		
 
    ui->colorSelector->setColor(QColor(0,0,0,0));

			




	
	
	
		
 
    ui->colorSelector->setDisplayMode(color_widgets::ColorPreview::AllAlpha);

			




	
	
	
		
 
    ui->colorSelector->setDisabled(true);

			




	
	
	
		
 

			




	
	
	
		
 
    // reset button

			




	
	
	
		
 
    resetMenu.addAction(&resetNamesAct);

			




	
	
	
		
 
    resetMenu.addAction(&resetColorsAct);

			




	
	
	
		
 
    resetMenu.addAction(&showAllAct);

			




	
	
	
		
 
    resetAct.setMenu(&resetMenu);

			




	
	
	
		
 
    ui->tbReset->setDefaultAction(&resetAct);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
PlotControlPanel::~PlotControlPanel()

			




	
	
	
		
 
{

			




	
	
	
		
 
    delete ui;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
unsigned PlotControlPanel::numOfSamples()

			




	
	
	
		
 
{

			




	
	
	
		
 
    return ui->spNumOfSamples->value();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -266,24 +278,30 @@ void PlotControlPanel::setChannelInfoMod

			




	
	
	
		
 

			




	
	
	
		
 
                // no current selection

			




	
	
	
		
 
                if (!current.isValid()) return;

			




	
	
	
		
 

			




	
	
	
		
 
                auto mod = ui->tvChannelInfo->model();

			




	
	
	
		
 
                QColor color = mod->data(current, Qt::ForegroundRole).value<QColor>();

			




	
	
	
		
 

			




	
	
	
		
 
                // temporarily block signals because `setColor` emits `colorChanged`

			




	
	
	
		
 
                bool wasBlocked = ui->colorSelector->blockSignals(true);

			




	
	
	
		
 
                ui->colorSelector->setColor(color);

			




	
	
	
		
 
                ui->colorSelector->blockSignals(wasBlocked);

			




	
	
	
		
 
            });

			




	
	
	
		
 

			




	
	
	
		
 
    // reset actions

			




	
	
	
		
 
    connect(&resetAct, &QAction::triggered, model, &ChannelInfoModel::resetInfos);

			




	
	
	
		
 
    connect(&resetNamesAct, &QAction::triggered, model, &ChannelInfoModel::resetNames);

			




	
	
	
		
 
    connect(&resetColorsAct, &QAction::triggered, model, &ChannelInfoModel::resetColors);

			




	
	
	
		
 
    connect(&showAllAct, &QAction::triggered, model, &ChannelInfoModel::resetVisibility);

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
void PlotControlPanel::saveSettings(QSettings* settings)

			




	
	
	
		
 
{

			




	
	
	
		
 
    settings->beginGroup(SettingGroup_Plot);

			




	
	
	
		
 
    settings->setValue(SG_Plot_NumOfSamples, numOfSamples());

			




	
	
	
		
 
    settings->setValue(SG_Plot_AutoScale, autoScale());

			




	
	
	
		
 
    settings->setValue(SG_Plot_YMax, yMax());

			




	
	
	
		
 
    settings->setValue(SG_Plot_YMin, yMin());

			




	
	
	
		
 
    settings->endGroup();

			




	
	
	
		
 
}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    src/plotcontrolpanel.h
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -13,24 +13,26 @@

			




	
	
	
		
 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
  GNU General Public License for more details.

			




	
	
	
		
 

			




	
	
	
		
 
  You should have received a copy of the GNU General Public License

			




	
	
	
		
 
  along with serialplot.  If not, see <http://www.gnu.org/licenses/>.

			




	
	
	
		
 
*/

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef PLOTCONTROLPANEL_H

			




	
	
	
		
 
#define PLOTCONTROLPANEL_H

			




	
	
	
		
 

			




	
	
	
		
 
#include <QWidget>

			




	
	
	
		
 
#include <QSettings>

			




	
	
	
		
 
#include <QAction>

			




	
	
	
		
 
#include <QMenu>

			




	
	
	
		
 

			




	
	
	
		
 
#include "channelinfomodel.h"

			




	
	
	
		
 

			




	
	
	
		
 
namespace Ui {

			




	
	
	
		
 
class PlotControlPanel;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
class PlotControlPanel : public QWidget

			




	
	
	
		
 
{

			




	
	
	
		
 
    Q_OBJECT

			




	
	
	
		
 

			




	
	
	
		
 
public:

			




	
	
		
 
@@ -52,23 +54,26 @@ public:

			




	
	
	
		
 
signals:

			




	
	
	
		
 
    void numOfSamplesChanged(int value);

			




	
	
	
		
 
    void scaleChanged(bool autoScaled, double yMin = 0, double yMax = 1);

			




	
	
	
		
 

			




	
	
	
		
 
private:

			




	
	
	
		
 
    Ui::PlotControlPanel *ui;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Holds 'number of samples' after the confirmation

			




	
	
	
		
 
    unsigned _numOfSamples;

			




	
	
	
		
 
    /// User can disable this setting in the checkbox

			




	
	
	
		
 
    bool warnNumOfSamples;

			




	
	
	
		
 

			




	
	
	
		
 
    QAction resetAct, resetNamesAct, resetColorsAct, showAllAct;

			




	
	
	
		
 
    QMenu resetMenu;

			




	
	
	
		
 

			




	
	
	
		
 
    /// Show a confirmation dialog before setting #samples to a big value

			




	
	
	
		
 
    bool askNSConfirmation(int value);

			




	
	
	
		
 

			




	
	
	
		
 
private slots:

			




	
	
	
		
 
    void onNumOfSamples(int value);

			




	
	
	
		
 
    void onAutoScaleChecked(bool checked);

			




	
	
	
		
 
    void onYScaleChanged();

			




	
	
	
		
 
    void onRangeSelected();

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
#endif // PLOTCONTROLPANEL_H

			




        

    


    
    

    

        

                

                    src/plotcontrolpanel.ui
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -33,44 +33,74 @@

			




	
	
	
		
 
         <height>170</height>

			




	
	
	
		
 
        </size>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="selectionMode">

			




	
	
	
		
 
        <enum>QAbstractItemView::SingleSelection</enum>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="selectionBehavior">

			




	
	
	
		
 
        <enum>QAbstractItemView::SelectRows</enum>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
     <item>

			




	
	
	
		
 
      <widget class="color_widgets::ColorSelector" name="colorSelector" native="true">

			




	
	
	
		
 
       <property name="sizePolicy">

			




	
	
	
		
 
        <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

			




	
	
	
		
 
         <horstretch>0</horstretch>

			




	
	
	
		
 
         <verstretch>0</verstretch>

			




	
	
	
		
 
        </sizepolicy>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="minimumSize">

			




	
	
	
		
 
        <size>

			




	
	
	
		
 
         <width>20</width>

			




	
	
	
		
 
         <height>20</height>

			




	
	
	
		
 
        </size>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
       <property name="maximumSize">

			




	
	
	
		
 
        <size>

			




	
	
	
		
 
         <width>20</width>

			




	
	
	
		
 
         <height>20</height>

			




	
	
	
		
 
        </size>

			




	
	
	
		
 
       </property>

			




	
	
	
		
 
      </widget>

			




	
	
	
		
 
      <layout class="QHBoxLayout" name="horizontalLayout_2">

			




	
	
	
		
 
       <item>

			




	
	
	
		
 
        <widget class="color_widgets::ColorSelector" name="colorSelector" native="true">

			




	
	
	
		
 
         <property name="sizePolicy">

			




	
	
	
		
 
          <sizepolicy hsizetype="Maximum" vsizetype="Preferred">

			




	
	
	
		
 
           <horstretch>0</horstretch>

			




	
	
	
		
 
           <verstretch>0</verstretch>

			




	
	
	
		
 
          </sizepolicy>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="minimumSize">

			




	
	
	
		
 
          <size>

			




	
	
	
		
 
           <width>20</width>

			




	
	
	
		
 
           <height>20</height>

			




	
	
	
		
 
          </size>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="maximumSize">

			




	
	
	
		
 
          <size>

			




	
	
	
		
 
           <width>20</width>

			




	
	
	
		
 
           <height>20</height>

			




	
	
	
		
 
          </size>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item>

			




	
	
	
		
 
        <spacer name="horizontalSpacer">

			




	
	
	
		
 
         <property name="orientation">

			




	
	
	
		
 
          <enum>Qt::Horizontal</enum>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="sizeHint" stdset="0">

			




	
	
	
		
 
          <size>

			




	
	
	
		
 
           <width>1</width>

			




	
	
	
		
 
           <height>20</height>

			




	
	
	
		
 
          </size>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </spacer>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
       <item>

			




	
	
	
		
 
        <widget class="QToolButton" name="tbReset">

			




	
	
	
		
 
         <property name="text">

			




	
	
	
		
 
          <string>Reset</string>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="popupMode">

			




	
	
	
		
 
          <enum>QToolButton::MenuButtonPopup</enum>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
         <property name="arrowType">

			




	
	
	
		
 
          <enum>Qt::NoArrow</enum>

			




	
	
	
		
 
         </property>

			




	
	
	
		
 
        </widget>

			




	
	
	
		
 
       </item>

			




	
	
	
		
 
      </layout>

			




	
	
	
		
 
     </item>

			




	
	
	
		
 
    </layout>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <widget class="Line" name="line">

			




	
	
	
		
 
     <property name="orientation">

			




	
	
	
		
 
      <enum>Qt::Vertical</enum>

			




	
	
	
		
 
     </property>

			




	
	
	
		
 
    </widget>

			




	
	
	
		
 
   </item>

			




	
	
	
		
 
   <item>

			




	
	
	
		
 
    <layout class="QFormLayout" name="formLayout_2">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-13856
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support