Fixed bug with the random Difficulty selection. Started adding an About window.

Author: RBrNx

SokoGenerator.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.6.0, 2016-03-25T22:03:27. -->
+<!-- Written by QtCreator 3.6.0, 2016-03-29T13:16:12. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -526,14 +526,17 @@
      <value type="int">13</value>
      <value type="int">14</value>
     </valuelist>
-    <value type="int" key="PE.EnvironmentAspect.Base">-1</value>
+    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Arguments"></value>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.Executable"></value>
-    <value type="QString" key="ProjectExplorer.CustomExecutableRunConfiguration.WorkingDirectory">%{buildDir}</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Custom Executable</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SokoGenerator</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/Users/RBrNx/Documents/Qt Projects/SokoGenerator/SokoGenerator/SokoGenerator.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">SokoGenerator.pro</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
+    <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></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>

mainwindow.cpp

@@ -13,7 +13,7 @@ MainWindow::MainWindow(QWidget *parent):QMainWindow(parent),ui(new Ui::MainWindo
     ui->label_GenerationTime->setText("Current Generation Time: 00:00:00");
     ui->progressBar->setValue(0);
     ui->list_LevelSet->setContextMenuPolicy(Qt::CustomContextMenu);
-    ui->lineEdit_GeneratorSeed->setValidator(new QIntValidator(0,999999999,this));
+    ui->lineEdit_GeneratorSeed->setValidator(new QIntValidator(0,9999999999,this));
     ui->lineEdit_GeneratorSeed->setText(0000000000);
 
     connect(&Generator, SIGNAL(changeProgressBar(float)), this, SLOT(changeProgressBar(float)));
@@ -391,3 +391,15 @@ void MainWindow::on_lineEdit_GeneratorSeed_textEdited(const QString &arg1)
 {
     genSeed = arg1.toInt();
 }
+
+void MainWindow::on_actionAbout_SokoGenerator_triggered()
+{
+    QMessageBox::about(this, "About SokoGenrator", "<img src=':/tileset/textures/box_shipped.png' align = 'left'></img>"
+                                                   "<p>"
+                                                   "<h2>SokoGenerator 1.0</h2>"
+                                                   "<h4>Developed by Conor Watson</h4>"
+                                                   "<h4>Special Thanks to Pavel Klavik</h4>"
+                                                   "<h4>Written using C++ and QT</h4>"
+                                                   "<h4>MIT License SokoGenerator 2016</h4>"
+                                                   "</p>");
+}

mainwindow.h

@@ -85,6 +85,8 @@ private slots:
 
     void on_lineEdit_GeneratorSeed_textEdited(const QString &arg1);
 
+    void on_actionAbout_SokoGenerator_triggered();
+
 signals:
     void stopThread();
 };

mainwindow.ui

@@ -541,7 +541,6 @@
      <string>File</string>
     </property>
     <addaction name="actionNew"/>
-    <addaction name="actionOpen"/>
     <addaction name="separator"/>
     <addaction name="actionSave_As"/>
     <addaction name="actionClose"/>
@@ -561,11 +560,6 @@
     <string>New</string>
    </property>
   </action>
-  <action name="actionOpen">
-   <property name="text">
-    <string>Open</string>
-   </property>
-  </action>
   <action name="actionSave_As">
    <property name="text">
     <string>Save As</string>

sokogenerator.cpp

@@ -80,7 +80,11 @@ SokoGenerator::ull SokoGenerator::randomNumber(ull min, ull max, int divisor){
 
 void SokoGenerator::generateLevel(){
     generator.seed(chrono::steady_clock::now().time_since_epoch().count());
-    if(genSeed == 0){ genSeed = distribution(generator); }
+    if(genSeed == 0){
+        while(genSeed > 999999999 || genSeed == 0){
+            genSeed = distribution(generator);
+        }
+    }
     srand(genSeed);
     emit displayGenSeed();
     int _levels;
@@ -114,8 +118,7 @@ void SokoGenerator::generateLevel(int roomWidth, int roomHeight, int noOfBoxes,
         int _roomW, _roomH, _Boxes;
         QString _difficulty;
         if(noOfBoxes == 0){ _Boxes = randomNumber(3, 6); } else { _Boxes = noOfBoxes; }
-        if(difficulty == 0){ difficulty = randomNumber(1, 5); } else { difficulty = difficulty; }
-        _difficulty = difficulties[difficulty-1];
+        if(difficulty != 0){ difficulty = randomNumber(1, 5); _difficulty = difficulties[difficulty-1]; }
         if(roomWidth == 0){ _roomW = randomNumber(3, 15, 3); } else { _roomW = roomWidth; }
         if(roomHeight == 0){
             if(_roomW == 3){ _roomH = randomNumber(6, 15, 3); }
@@ -139,7 +142,7 @@ void SokoGenerator::generateLevel(int roomWidth, int roomHeight, int noOfBoxes,
                 newLevel.solution = cSolToString(sol);
                 diffAnalyser = new DifficultyAnalyser;
                 newLevel.difficulty = diffAnalyser->calculateDifficulty(newLevel);
-                if(newLevel.difficulty != _difficulty){ generationSuccessful = false; }
+                if(newLevel.difficulty != _difficulty && difficulty != 0){ generationSuccessful = false; }
                 delete diffAnalyser;
             }
             qDebug() << "Generation Successful: " << generationSuccessful;