Fix sort ordering

nyalldawson · nyalldawson · commit 8ea56a8e01e2 · 2023-03-24T13:15:11.000+10:00
diff --git a/src/app/devtools/qgsdevtoolsmodelnode.h b/src/app/devtools/qgsdevtoolsmodelnode.h
@@ -41,6 +41,7 @@ class QgsDevToolsModelNode
       RoleId, //!< Request ID role
       RoleElapsedTime, //!< Elapsed time
       RoleMaximumTime, //!< Maximum encountered elapsed time
+      RoleSort, //!< Sort order role
     };
 
     virtual ~QgsDevToolsModelNode();
diff --git a/src/app/devtools/querylogger/qgsappquerylogger.cpp b/src/app/devtools/querylogger/qgsappquerylogger.cpp
@@ -218,6 +218,7 @@ QVariant QgsAppQueryLogger::data( const QModelIndex &index, int role ) const
       {
         case Qt::DisplayRole:
         case QgsDevToolsModelNode::RoleElapsedTime:
+        case QgsDevToolsModelNode::RoleSort:
           return node->data( QgsDevToolsModelNode::RoleElapsedTime );
 
         case QgsDevToolsModelNode::RoleMaximumTime:
diff --git a/src/app/devtools/querylogger/qgsdatabasequeryloggernode.cpp b/src/app/devtools/querylogger/qgsdatabasequeryloggernode.cpp
@@ -91,6 +91,9 @@ QVariant QgsDatabaseQueryLoggerQueryGroup::data( int role ) const
       return QStringLiteral( "%1 %2" ).arg( QString::number( mQueryId ),
                                             mSql );
 
+    case QgsDevToolsModelNode::RoleSort:
+      return mQueryId;
+
     case Qt::ToolTipRole:
     {
       // Show no more than 255 characters
diff --git a/src/app/devtools/querylogger/qgsqueryloggerpanelwidget.cpp b/src/app/devtools/querylogger/qgsqueryloggerpanelwidget.cpp
@@ -45,6 +45,7 @@ QgsDatabaseQueryLoggerTreeView::QgsDatabaseQueryLoggerTreeView( QgsAppQueryLogge
   setFont( QFontDatabase::systemFont( QFontDatabase::FixedFont ) );
 
   mProxyModel = new QgsDatabaseQueryLoggerProxyModel( mLogger, this );
+  mProxyModel->setSortRole( QgsDevToolsModelNode::RoleSort );
   setModel( mProxyModel );
 
   connect( mProxyModel, &QAbstractItemModel::rowsInserted, this, [this]( const QModelIndex & parent, int first, int last )
@@ -169,6 +170,7 @@ QgsDatabaseQueryLoggerPanelWidget::QgsDatabaseQueryLoggerPanelWidget( QgsAppQuer
   mTreeView = new QgsDatabaseQueryLoggerTreeView( mLogger );
   mTreeView->setItemDelegateForColumn( 1, new QueryCostDelegate( QgsDevToolsModelNode::RoleElapsedTime, QgsDevToolsModelNode::RoleMaximumTime, mTreeView ) );
   mTreeView->setSortingEnabled( true );
+  mTreeView->sortByColumn( 0, Qt::SortOrder::AscendingOrder );
 
   verticalLayout->addWidget( mTreeView );
   mToolbar->setIconSize( QgsGuiUtils::iconSize( true ) );

Original file line number	Diff line number	Diff line change
`@@ -218,6 +218,7 @@ QVariant QgsAppQueryLogger::data( const QModelIndex &index, int role ) const`
`218`	`218`	`{`
`219`	`219`	`case Qt::DisplayRole:`
`220`	`220`	`case QgsDevToolsModelNode::RoleElapsedTime:`
	`221`	`+ case QgsDevToolsModelNode::RoleSort:`
`221`	`222`	`return node->data( QgsDevToolsModelNode::RoleElapsedTime );`
`222`	`223`
`223`	`224`	`case QgsDevToolsModelNode::RoleMaximumTime:`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,9 @@ QVariant QgsDatabaseQueryLoggerQueryGroup::data( int role ) const`
`91`	`91`	`return QStringLiteral( "%1 %2" ).arg( QString::number( mQueryId ),`
`92`	`92`	`mSql );`
`93`	`93`
	`94`	`+ case QgsDevToolsModelNode::RoleSort:`
	`95`	`+ return mQueryId;`
	`96`	`+`
`94`	`97`	`case Qt::ToolTipRole:`
`95`	`98`	`{`
`96`	`99`	`// Show no more than 255 characters`