Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix Sorting by Lifecycle, startup time #307 #463

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix Sorting by Lifecycle, startup time #307 #463

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
933bfca
Your descriptive commit message
eaj40 May 2, 2024
9d8e203
ISSUE_307
eaj40 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/mainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ extern "C" {
#include "sortfilterproxymodel.h"
#include "qdltoptmanager.h"

#define ISSUE_307

//

MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
Expand Down Expand Up @@ -1982,6 +1985,18 @@ void MainWindow::reloadLogFileFinishDefaultFilter()
void MainWindow::reloadLogFile(bool update, bool multithreaded)
{
qint64 fileerrors = 0;
#ifdef DEBUG
qDebug() << "reloadLogFile";
for(int num=0;num<openFileNames.size();num++)
{
qDebug() << "openFileNames" << openFileNames[num];
//bool back = qfile.open(openFileNames[num],num!=0);
// if ( false == back )
//{
//qDebug() << "ERROR opening file (s)" << openFileNames[num] << __FILE__ << __LINE__;
//}
}
#endif
/* check if in logging only mode, then do not create index */
tableModel->setLoggingOnlyMode(settings->loggingOnlyMode);
tableModel->modelChanged();
Expand Down Expand Up @@ -2065,6 +2080,9 @@ void MainWindow::reloadLogFile(bool update, bool multithreaded)
// open qfile
if( false == update)
{
#ifdef DEBUG
qDebug() << "#ifdef ISSUE_307";
#endif
for(int num=0;num<openFileNames.size();num++)
{
bool back = qfile.open(openFileNames[num],num!=0);
Expand Down Expand Up @@ -3649,6 +3667,10 @@ void MainWindow::checkConnectionState()
{
// green
this->ui->actionConnectAll->setIcon(QIcon(":/toolbar/png/network-transmit-receive_connected.png"));
#ifdef DEBUG
// qDebug() << "green";
// on_applyConfig_clicked();
#endif
}
else
{
Expand Down Expand Up @@ -5688,6 +5710,9 @@ void MainWindow::on_filterWidget_itemSelectionChanged()

void MainWindow::on_configWidget_itemSelectionChanged()
{
#ifdef DEBUG
qDebug() << "--->on_configWidget_itemSelectionChanged";
#endif
/* get selected ECU from configuration */
EcuItem* ecuitem = 0;
ApplicationItem* appitem = 0;
Expand Down Expand Up @@ -5722,6 +5747,9 @@ void MainWindow::on_configWidget_itemSelectionChanged()
ui->action_menuConfig_Expand_All_ECUs->setEnabled(ecuitem && !appitem );
ui->action_menuConfig_Collapse_All_ECUs->setEnabled(ecuitem && !appitem );

#ifdef DEBUG
qDebug() << "<---on_configWidget_itemSelectionChanged";
#endif
}

void MainWindow::on_pluginWidget_pluginPriorityChanged(const QString name, int prio)
Expand Down Expand Up @@ -6046,6 +6074,12 @@ void MainWindow::stateChangedIP(QAbstractSocket::SocketState socketState)
pluginManager.stateChanged(num,QDltConnection::QDltConnectionConnecting,ecuitem->getHostname());
break;
case QAbstractSocket::ConnectedState:
#ifdef ISSUE_307
#ifdef DEBUG
qDebug() << "online";
#endif
on_applyConfig_clicked();
#endif
pluginManager.stateChanged(num,QDltConnection::QDltConnectionOnline,ecuitem->getHostname());
break;
case QAbstractSocket::ClosingState:
Expand Down Expand Up @@ -7993,11 +8027,17 @@ void MainWindow::syncCheckBoxesAndMenu()

void MainWindow::on_applyConfig_clicked()
{
#ifdef DEBUG
qDebug() << "--->on_applyConfig_clicked";
#endif
syncCheckBoxesAndMenu();
applyConfigEnabled(false);
filterUpdate();
reloadLogFile(true);
triggerPluginsAutoload();
#ifdef DEBUG
qDebug() << "<---on_applyConfig_clicked";
#endif
}

void MainWindow::clearSelection()
Expand Down