Merge pull request #80 from mahartwig/fight_category_fix

Fight category fix

Author: fmuecke

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 For most recent changes see the project on github: [https://github.com/fmuecke/Ipponboard](https://github.com/fmuecke/Ipponboard)
 
+- (mod): updated single tournament weight and age classes
+- (mod): weight classes can now be any string and have to include kg to support the use of groups instead of weights for youth tournaments
+- (fix): categories are now saved correctly and not duplicated when aborting the CategoryManager
 - (new): added shortcuts to start single or team mode from splashscreen (1, 2)
 - (fix): fixed a crash when Team Edition was started with a TournamentMode with only one round
 - (mod): added and updated TournamentModes to current weight and age classes

base/FightCategoryManager.cpp

@@ -7,6 +7,7 @@
 #include <QObject>
 #include <QMessageBox>
 #include <QFile>
+#include <QDebug>
 
 #include "../util/path_helpers.h"
 #include "FightCategoryParser.h"
@@ -24,14 +25,14 @@ FightCategoryMgr::FightCategoryMgr()
 	: m_Categories()
 //---------------------------------------------------------
 {
-	load_categories();
+	LoadCategories();
 }
 
 //---------------------------------------------------------
 FightCategoryMgr::~FightCategoryMgr()
 //---------------------------------------------------------
 {
-	save_categories();
+	SaveCategories();
 }
 
 //---------------------------------------------------------
@@ -145,7 +146,7 @@ void FightCategoryMgr::RemoveCategory(QString const& name)
 }
 
 //---------------------------------------------------------
-void FightCategoryMgr::load_categories()
+void FightCategoryMgr::LoadCategories()
 //---------------------------------------------------------
 {
 	auto configFile {fm::GetSettingsFilePath(str_configFileName)};
@@ -155,22 +156,26 @@ void FightCategoryMgr::load_categories()
 	{
 		if (QFile::exists(configFile))
 		{
+			qInfo() << "Reading categories from config:" << configFile;
 			m_Categories = FightCategoryParser::ParseIniFile(configFile);
 		}
 		else
 		{
 			if (!QFile::exists(legacyFile))
 			{
+				qInfo() << "Loading default categories";
 				load_default_categories();
 			}
 			else
 			{
+				qInfo() << "Reading categories from legacy config:" << legacyFile;
 				m_Categories = FightCategoryParser::ParseJsonFile(legacyFile);
 			}
 		}
 	}
 	catch (std::exception const& e)
 	{
+		qWarning() << "Error loading categories, restoring defaults";
         QMessageBox::critical(nullptr,
 							  QString(QObject::tr("Error")),
 							  QString(QObject::tr("Unable to load fight categories:\n%1\n\nRestoring defaults.").arg(
@@ -181,9 +186,10 @@ void FightCategoryMgr::load_categories()
 }
 
 //---------------------------------------------------------
-void FightCategoryMgr::save_categories()
+void FightCategoryMgr::SaveCategories()
 //---------------------------------------------------------
 {
+	qInfo() << "Saving categories to:" << str_configFileName;
 	auto filePath {fm::GetSettingsFilePath(str_configFileName)};
 	FightCategoryParser::ToIniFile(filePath, m_Categories);
 }
@@ -240,74 +246,62 @@ void FightCategoryMgr::load_default_categories()
 	m_Categories.clear();
 
 	FightCategory t("M");
-	t.SetWeights("-60;-66;-73;-81;-90;-100;+100");
+	t.SetWeights("-60kg;-66kg;-73kg;-81kg;-90kg;-100kg;+100kg");
 	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(3 * 60);
-	AddCategory(t);
-
-	t = FightCategory("MU20");
-	t.SetWeights("-55;-60;-66;-73;-81;-90;-100;+100");
-	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
-	t = FightCategory("MU19");
-	t.SetWeights("-55;-60;-66;-73;-81;-90;-100;+100");
+	t = FightCategory("MU21");
+	t.SetWeights("-60kg;-66kg;-73kg;-81kg;-90kg;-100kg;+100kg");
 	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
-	t = FightCategory("MU17");
-	t.SetWeights("-43;-46;-50;-55;-60;-66;-73;-81;-90;+90");
+	t = FightCategory("MU18");
+	t.SetWeights("-46kg;-50kg;-55kg;-60kg;-66kg;-73kg;-81kg;-90kg;+90kg");
 	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
-	t = FightCategory("MU16");
-	t.SetWeights("-40;-43;-46;-50;-55;-60;-66;-73;-81;+81");
-	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t = FightCategory("MU15");
+	t.SetWeights("-34kg;-37kg;-40kg;-43kg;-46kg;-50kg;-55kg;-60kg;-66kg;+66kg");
+	t.SetRoundTime(3 * 60);
+	t.SetGoldenScoreTime(3 * 60);
 	AddCategory(t);
 
-	t = FightCategory("MU14");
-	t.SetWeights("-31;-34;-37;-40;-43;-46;-50;-55;-60;+60");
+	t = FightCategory("MU13");
+	t.SetWeights("-28kg;-31kg;-34kg;-37kg;-40kg;-43kg;-46kg;-50kg;-55kg;+55kg");
 	t.SetRoundTime(3 * 60);
-	t.SetGoldenScoreTime(90);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
 	t = FightCategory("F");
-	t.SetWeights("-48;-52;-57;-63;-70;-78;+78");
+	t.SetWeights("-48kg;-52kg;-57kg;-63kg;-70kg;-78kg;+78kg");
 	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(3 * 60);
-	AddCategory(t);
-
-	t = FightCategory("FU20");
-	t.SetWeights("-44;-48;-52;-57;-63;-70;-78;+78");
-	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
-	t = FightCategory("FU19");
-	t.SetWeights("-44;-48;-52;-57;-63;-70;-78;+78");
+	t = FightCategory("FU21");
+	t.SetWeights("-48kg;-52kg;-57kg;-63kg;-70kg;-78kg;+78kg");
 	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
-	t = FightCategory("FU17");
-	t.SetWeights("-40;-44;-48;-52;-57;-63;-70;-78;+78");
+	t = FightCategory("FU18");
+	t.SetWeights("-40kg;-44kg;-48kg;-52kg;-57kg;-63kg;-70kg;-78kg;+78kg");
 	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 
-	t = FightCategory("FU16");
-	t.SetWeights("-40;-44;-48;-52;-57;-63;-70;+70");
-	t.SetRoundTime(4 * 60);
-	t.SetGoldenScoreTime(2 * 60);
+	t = FightCategory("FU15");
+	t.SetWeights("-33kg;-36kg;-40kg;-44kg;-48kg;-52kg;-57kg;-63kg;+63kg");
+	t.SetRoundTime(3 * 60);
+	t.SetGoldenScoreTime(3 * 60);
 	AddCategory(t);
 
-	t = FightCategory("FU14");
-	t.SetWeights("-30;-33;-36;-40;-44;-48;-52;-57;-63;+63");
+	t = FightCategory("FU13");
+	t.SetWeights("-27kg;-30kg;-33kg;-36kg;-40kg;-44kg;-48kg;-52kg;-57kg;+57kg");
 	t.SetRoundTime(3 * 60);
-	t.SetGoldenScoreTime(90);
+	t.SetGoldenScoreTime(0);
 	AddCategory(t);
 }

base/FightCategoryManager.h

@@ -31,6 +31,9 @@ class FightCategoryMgr
 
 	typedef std::shared_ptr<FightCategoryMgr> Ptr;
 
+	void LoadCategories();
+	void SaveCategories();
+
 	bool GetCategory(int index, FightCategory& t) const;
 	bool GetCategory(QString const& name, FightCategory& t) const;
 
@@ -47,8 +50,6 @@ class FightCategoryMgr
 	std::string ConvertCategoriesToString_WITH_GUI_ERROR();
 
 private:
-	void load_categories();
-	void save_categories();
 	void load_default_categories();
 
 	FightCategoryList m_Categories;

base/FightCategoryManagerDlg.cpp

@@ -29,8 +29,6 @@ FightCategoryManagerDlg::FightCategoryManagerDlg(
 
 	Q_ASSERT(m_pClassMgr);
 
-	m_originalClasses = m_pClassMgr->ConvertCategoriesToString_WITH_GUI_ERROR();
-
 	load_values();
 }
 
@@ -87,6 +85,10 @@ void FightCategoryManagerDlg::on_pushButton_add_pressed()
 	if (ok)
 	{
 		m_pClassMgr->AddCategory(name);
+		Ipponboard::FightCategory cat;
+		m_pClassMgr->GetCategory(name, cat);
+		cat.SetGoldenScoreTime(0);
+		cat.SetRoundTime(240);
 
 		// update combobox
 		QStringList contents;
@@ -98,9 +100,9 @@ void FightCategoryManagerDlg::on_pushButton_add_pressed()
 			new QTreeWidgetItem(contents, QTreeWidgetItem::UserType);
 		pItem->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable);
 		ui->treeWidget_classes->addTopLevelItem(pItem);
-		pItem->setText(eColumn_Time, "...");
-		pItem->setText(eColumn_GS, "...");
-		pItem->setText(eColumn_Weights, "...");
+		pItem->setText(eColumn_Time, cat.GetRoundTimeStr());
+		pItem->setText(eColumn_GS, cat.GetGoldenScoreTimeStr());
+		pItem->setText(eColumn_Weights, "");
 	}
 }
 
@@ -126,24 +128,6 @@ void FightCategoryManagerDlg::load_values()
 	}
 }
 
-//---------------------------------------------------------
-void FightCategoryManagerDlg::on_buttonBox_accepted()
-//---------------------------------------------------------
-{
-	// do not restore old values
-	//TODO: ? accept();
-}
-
-//---------------------------------------------------------
-void FightCategoryManagerDlg::on_buttonBox_rejected()
-//---------------------------------------------------------
-{
-	// restore old values
-	//TODO: ? reject();
-
-	m_pClassMgr->CategoriesFromString(m_originalClasses);
-}
-
 //---------------------------------------------------------
 void FightCategoryManagerDlg::on_pushButton_remove_pressed()
 //---------------------------------------------------------
@@ -167,7 +151,7 @@ void FightCategoryManagerDlg::on_treeWidget_classes_itemChanged(
 //---------------------------------------------------------
 {
 	bool matches(false);
-
+	
 	FightCategory cat(pItem->text(eColumn_Name));
 	cat.SetRoundTime(pItem->text(eColumn_Time));
 	cat.SetGoldenScoreTime(pItem->text(eColumn_GS));
@@ -232,8 +216,8 @@ void FightCategoryManagerDlg::on_treeWidget_classes_itemChanged(
 	}
 	else if (column == eColumn_Weights)
 	{
-		QRegExp regex("([-+]{0,1}[0-9]{1,3}[;])*[-+]{0,1}[0-9]{1,3}");
-		matches = regex.exactMatch(pItem->text(eColumn_Weights));
+		//no regex check to enable creating custom groups instead of weight classes
+		matches = true;
 	}
 
 	QBrush brush(pItem->foreground(column));

base/FightCategoryManagerDlg.h

@@ -35,13 +35,10 @@ class FightCategoryManagerDlg : public QDialog
 
 	Ui::FightCategoryManagerDlg* ui;
 	Ipponboard::FightCategoryMgr::Ptr m_pClassMgr;
-	std::string m_originalClasses;
 	//Ipponboard::WeightClass m_currentClass;
 
 private slots:
 	void on_treeWidget_classes_itemChanged(QTreeWidgetItem* item, int column);
-	void on_buttonBox_rejected();
-	void on_buttonBox_accepted();
 	void on_pushButton_remove_pressed();
 	void on_pushButton_add_pressed();
 };

base/FightCategoryManagerDlg.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>587</width>
-    <height>405</height>
+    <height>420</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
   <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0,0">
    <item>
     <widget class="QTreeWidget" name="treeWidget_classes">
      <property name="mouseTracking">
@@ -90,6 +90,32 @@
      </column>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="font">
+      <font>
+       <family>Segoe UI</family>
+       <pointsize>9</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>0:00 Golden Score Time means Golden Score has no end (or there is no Golden Score at all)</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="font">
+      <font>
+       <family>Segoe UI</family>
+       <pointsize>9</pointsize>
+      </font>
+     </property>
+     <property name="text">
+      <string>Input weight classes/groups seperated by &quot;;&quot;</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">

base/MainWindow.cpp

@@ -70,10 +70,15 @@ void MainWindow::Init()
 
 void MainWindow::on_actionManageCategories_triggered()
 {
+	//save categories before editing
+	m_pCategoryManager->SaveCategories();
+
 	FightCategoryManagerDlg dlg(m_pCategoryManager, this);
 
 	if (QDialog::Accepted == dlg.exec())
 	{
+		m_pCategoryManager->SaveCategories();
+
 		QString currentClass =
 			m_pUi->comboBox_weight_class->currentText();
 
@@ -97,6 +102,11 @@ void MainWindow::on_actionManageCategories_triggered()
 		m_pUi->comboBox_weight_class->setCurrentIndex(index);
 		on_comboBox_weight_class_currentIndexChanged(currentClass);
 	}
+	else
+	{
+		//load old categories to discard changes
+		m_pCategoryManager->LoadCategories();
+	}
 }
 
 void MainWindow::on_actionManageFighters_triggered()