Loading GUI/GUI.pro.user +7 −7 Changes for GUI/GUI.pro.user: 7 added lines, 7 removed lines. Original line number Diff line number Diff line <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> <!-- Written by QtCreator 4.5.0, 2018-02-14T11:08:34. --> <!-- Written by QtCreator 4.5.0, 2018-02-14T11:21:07. --> <qtcreator> <data> <variable>EnvironmentId</variable> <value type="QByteArray">{02a7caed-4b6b-495d-8fef-b11555302a3f}</value> <value type="QByteArray">{da6987d4-31c4-4f3d-a60d-58ce3b5634b9}</value> </data> <data> <variable>ProjectExplorer.Project.ActiveTarget</variable> Loading Loading @@ -66,7 +66,7 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/kael/Projet/Statistiques/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Debug</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> Loading Loading @@ -126,7 +126,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/kael/Projet/Statistiques/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> Loading Loading @@ -186,7 +186,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Profile</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/kael/Projet/Statistiques/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Profile</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> Loading Loading @@ -304,13 +304,13 @@ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GUI</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/jorand/Documents/Projet_3A/Statistiques/GUI/GUI.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/kael/Projet/Statistiques/Statistiques/GUI/GUI.pro</value> <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GUI.pro</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Debug</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> Loading GUI/GUI.pro.user.02a7cae −271 File deleted. Show changes GUI/mainwindow.cpp +4 −7 Changes for GUI/mainwindow.cpp: 4 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -54,10 +54,6 @@ void MainWindow::startGame() { stats = new Statsgen(); stats->setFilename(ui->fileLine->text()); ui->AnalyzedLabel->setText(""); ui->securityLabel->setText(""); ui->resultLabel->setText(""); if(ui->withcountButton->isChecked()) { stats->setWithcount(true); Loading Loading @@ -172,15 +168,14 @@ void MainWindow::startGame() { ui->maxAdvancedCheckBox->setDisabled(true); ui->maxSimpleCheckBox->setDisabled(true); delete layoutCharset; delete layoutLength; WorkerThread *workerThread = new WorkerThread(stats); connect(workerThread, SIGNAL(resultReady()), this, SLOT(handleResults())); connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater())); workerThread->start(); waitBox.setText("Analysis in progress"); waitBox.exec(); } Loading @@ -199,8 +194,10 @@ void MainWindow::disableWithCount() void MainWindow::handleResults() { waitBox.close(); waitBox.close(); ui->charsetWidget->setHidden(false); ui->lengthWidget->show(); ui->ThreadlineEdit->setDisabled(false); ui->topLineEdit->setDisabled(false); ui->SimplelineEdit->setDisabled(false); Loading GUI/mainwindow.h +1 Changes for GUI/mainwindow.h: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -47,6 +47,7 @@ private: QMessageBox waitBox; QVBoxLayout * layoutCharset; QVBoxLayout * layoutLength; int firstTime=1; }; Loading Loading
GUI/GUI.pro.user +7 −7 Changes for GUI/GUI.pro.user: 7 added lines, 7 removed lines. Original line number Diff line number Diff line <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> <!-- Written by QtCreator 4.5.0, 2018-02-14T11:08:34. --> <!-- Written by QtCreator 4.5.0, 2018-02-14T11:21:07. --> <qtcreator> <data> <variable>EnvironmentId</variable> <value type="QByteArray">{02a7caed-4b6b-495d-8fef-b11555302a3f}</value> <value type="QByteArray">{da6987d4-31c4-4f3d-a60d-58ce3b5634b9}</value> </data> <data> <variable>ProjectExplorer.Project.ActiveTarget</variable> Loading Loading @@ -66,7 +66,7 @@ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Debug</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/kael/Projet/Statistiques/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Debug</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> Loading Loading @@ -126,7 +126,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1"> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Release</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/kael/Projet/Statistiques/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Release</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> Loading Loading @@ -186,7 +186,7 @@ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value> </valuemap> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2"> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Profile</value> <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">/home/kael/Projet/Statistiques/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Profile</value> <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0"> <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value> Loading Loading @@ -304,13 +304,13 @@ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">GUI</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/jorand/Documents/Projet_3A/Statistiques/GUI/GUI.pro</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/kael/Projet/Statistiques/Statistiques/GUI/GUI.pro</value> <value type="bool" key="QmakeProjectManager.QmakeRunConfiguration.UseLibrarySearchPath">true</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">GUI.pro</value> <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/home/jorand/Documents/Projet_3A/Statistiques/build-GUI-Desktop_Qt_5_9_4_GCC_64bit-Debug</value> <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default"></value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> Loading
GUI/mainwindow.cpp +4 −7 Changes for GUI/mainwindow.cpp: 4 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -54,10 +54,6 @@ void MainWindow::startGame() { stats = new Statsgen(); stats->setFilename(ui->fileLine->text()); ui->AnalyzedLabel->setText(""); ui->securityLabel->setText(""); ui->resultLabel->setText(""); if(ui->withcountButton->isChecked()) { stats->setWithcount(true); Loading Loading @@ -172,15 +168,14 @@ void MainWindow::startGame() { ui->maxAdvancedCheckBox->setDisabled(true); ui->maxSimpleCheckBox->setDisabled(true); delete layoutCharset; delete layoutLength; WorkerThread *workerThread = new WorkerThread(stats); connect(workerThread, SIGNAL(resultReady()), this, SLOT(handleResults())); connect(workerThread, SIGNAL(finished()), workerThread, SLOT(deleteLater())); workerThread->start(); waitBox.setText("Analysis in progress"); waitBox.exec(); } Loading @@ -199,8 +194,10 @@ void MainWindow::disableWithCount() void MainWindow::handleResults() { waitBox.close(); waitBox.close(); ui->charsetWidget->setHidden(false); ui->lengthWidget->show(); ui->ThreadlineEdit->setDisabled(false); ui->topLineEdit->setDisabled(false); ui->SimplelineEdit->setDisabled(false); Loading
GUI/mainwindow.h +1 Changes for GUI/mainwindow.h: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -47,6 +47,7 @@ private: QMessageBox waitBox; QVBoxLayout * layoutCharset; QVBoxLayout * layoutLength; int firstTime=1; }; Loading