From 8211b172579aac12a07afbddd5bed12e3b1cd83b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 15 Apr 2018 13:56:43 +0200
Subject: Change presets

---
 qtmips_gui/NewDialog.ui  |  8 ++++----
 qtmips_gui/newdialog.cpp | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'qtmips_gui')

diff --git a/qtmips_gui/NewDialog.ui b/qtmips_gui/NewDialog.ui
index 3c1eaba..135ac83 100644
--- a/qtmips_gui/NewDialog.ui
+++ b/qtmips_gui/NewDialog.ui
@@ -50,16 +50,16 @@
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="preset_pipelined_bare">
+           <widget class="QRadioButton" name="preset_no_pipeline_cache">
             <property name="text">
-             <string>Pipelined without hazard unit and without cache</string>
+             <string>No pipeline with cache</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QRadioButton" name="preset_pipelined_hazard">
+           <widget class="QRadioButton" name="preset_pipelined_bare">
             <property name="text">
-             <string>Pipelined with hazard unit and without cache</string>
+             <string>Pipelined without hazard unit and without cache</string>
             </property>
            </widget>
           </item>
diff --git a/qtmips_gui/newdialog.cpp b/qtmips_gui/newdialog.cpp
index ee957cb..565d353 100644
--- a/qtmips_gui/newdialog.cpp
+++ b/qtmips_gui/newdialog.cpp
@@ -21,8 +21,8 @@ NewDialog::NewDialog(QWidget *parent, QSettings *settings) : QDialog(parent) {
     connect(ui->pushButton_cancel, SIGNAL(clicked(bool)), this, SLOT(cancel()));
     connect(ui->pushButton_browse, SIGNAL(clicked(bool)), this, SLOT(browse_elf()));
     connect(ui->preset_no_pipeline, SIGNAL(toggled(bool)), this, SLOT(set_preset()));
+    connect(ui->preset_no_pipeline_cache, SIGNAL(toggled(bool)), this, SLOT(set_preset()));
     connect(ui->preset_pipelined_bare, SIGNAL(toggled(bool)), this, SLOT(set_preset()));
-    connect(ui->preset_pipelined_hazard, SIGNAL(toggled(bool)), this, SLOT(set_preset()));
     connect(ui->preset_pipelined, SIGNAL(toggled(bool)), this, SLOT(set_preset()));
 
     connect(ui->pipelined, SIGNAL(clicked(bool)), this, SLOT(pipelined_change(bool)));
@@ -159,12 +159,12 @@ unsigned NewDialog::preset_number() {
     enum machine::ConfigPresets preset;
     if (ui->preset_no_pipeline->isChecked())
         preset = machine::CP_SINGLE;
+    else if (ui->preset_no_pipeline_cache->isChecked())
+        preset = machine::CP_SINGLE_CACHE;
     else if (ui->preset_pipelined_bare->isChecked())
         preset = machine::CP_PIPE_NO_HAZARD;
-    else if (ui->preset_pipelined_hazard->isChecked())
-        preset = machine::CP_PIPE_NO_CACHE;
     else if (ui->preset_pipelined->isChecked())
-        preset = machine::CP_PIPE_CACHE;
+        preset = machine::CP_PIPE;
     else
         return 0;
     return (unsigned)preset + 1;
@@ -188,13 +188,13 @@ void NewDialog::load_settings() {
         case machine::CP_SINGLE:
             ui->preset_no_pipeline->setChecked(true);
             break;
+        case machine::CP_SINGLE_CACHE:
+            ui->preset_no_pipeline_cache->setChecked(true);
+            break;
         case machine::CP_PIPE_NO_HAZARD:
             ui->preset_pipelined_bare->setChecked(true);
             break;
-        case machine::CP_PIPE_NO_CACHE:
-            ui->preset_pipelined_hazard->setChecked(true);
-            break;
-        case machine::CP_PIPE_CACHE:
+        case machine::CP_PIPE:
             ui->preset_pipelined->setChecked(true);
             break;
         }
-- 
cgit v1.2.3