GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r340:fc12ad933c3b

Fixes refresh problem in Variable widget

Alexandre Leroux -

r340:fc12ad933c3b

parent child

Context file:

r340:fc12ad933c3b

Collapse all files

core/include/Variable/VariableModel.h +8 0

              #include <QAbstractTableModel>
              #include <QLoggingCategory>
+             #include <Common/MetaTypes.h>
              #include <Common/spimpl.h>
              Q_DECLARE_LOGGING_CATEGORY(LOG_VariableModel)
              private:
                  class VariableModelPrivate;
                  spimpl::unique_impl_ptr<VariableModelPrivate> impl;
+             private slots:
+                 /// Slot called when data of a variable has been updated
+                 void onVariableUpdated() noexcept;
              };
+             // Registers QVector<int> metatype so it can be used in VariableModel::dataChanged() signal
+             SCIQLOP_REGISTER_META_TYPE(QVECTOR_INT_REGISTRY, QVector<int>)
              #endif // SCIQLOP_VARIABLEMODEL_H

core/src/Variable/VariableModel.cpp +19 0

                                                             QStringLiteral("mission"), dateTime);
                  impl->m_Variables.push_back(variable);
+                 connect(variable.get(), &Variable::updated, this, &VariableModel::onVariableUpdated);
                  endInsertRows();
                  return QVariant{};
              }
+             void VariableModel::onVariableUpdated() noexcept
+             {
+                 // Finds variable that has been updated in the model
+                 if (auto updatedVariable = dynamic_cast<Variable *>(sender())) {
+                     auto begin = std::cbegin(impl->m_Variables);
+                     auto end = std::cend(impl->m_Variables);
+                     auto it = std::find_if(begin, end, [updatedVariable](const auto &variable) {
            


        

    

      

  

      
          

              

                    
                        
                        note
                    

              
          
          
              
  

  
    
  
  

  

    
        perrinel
    
  

          

          
              Fri, 07 Jul 2017 11:52:17
          


          

              
                
              

          

                    
                    

            
              
              

                
                    Comment #1724
                    
                

                      
                      
                        Edit
                      
                      
                        Delete
                      
              
            

            |
                 
                 

          
      
      
          Add a comment to spicify that you assume order on variable in the m_Variables is the same that it is in the VariableInspector table view
+                         return variable.get() == updatedVariable;
+                     });
+                     if (it != end) {
+                         auto updateVariableIndex = std::distance(begin, it);
+                         emit dataChanged(createIndex(updateVariableIndex, 0),
+                                          createIndex(updateVariableIndex, columnCount() - 1));
+                     }
+                 }
+             }

gui/include/Variable/VariableInspectorWidget.h +2 0

              private slots:
                  /// Slot called when right clicking on an variable in the table (displays a menu)
                  void onTableMenuRequested(const QPoint &pos) noexcept;
+                 /// Refreshes instantly the variable view
+                 void refresh() noexcept;
              };
              #endif // SCIQLOP_VARIABLEINSPECTORWIDGET_H

gui/src/Variable/VariableInspectorWidget.cpp +13 -1

                  //    auto sortFilterModel = new QSortFilterProxyModel{this};
                  //    sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
-                 ui->tableView->setModel(sqpApp->variableController().variableModel());
+                 auto variableModel = sqpApp->variableController().variableModel();
+                 ui->tableView->setModel(variableModel);
+                 // Adds extra signal/slot between view and model, so the view can be updated instantly when
+                 // there is a change of data in the model
+                 connect(variableModel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), this,
+                         SLOT(refresh()));
                  ui->tableView->setSelectionModel(sqpApp->variableController().variableSelectionModel());
                  // Fixes column sizes
                      tableMenu.exec(mapToGlobal(pos));
                  }
              }
+             void VariableInspectorWidget::refresh() noexcept
+             {
+                 ui->tableView->viewport()->update();
+             }

General Comments 0

Write
Preview

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

	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