From 50490d9f7c494bf09d86a267f343b72d262750ae Mon Sep 17 00:00:00 2001 From: fmckenna Date: Tue, 24 Sep 2024 21:28:20 -0700 Subject: [PATCH] fmk - deleting files that seem to have been duplicated and then modified elsewhere for compilation on windows --- EVENTS/GeoClawOpenFOAM/projectsettings.cpp | 105 ------------- EVENTS/GeoClawOpenFOAM/projectsettings.h | 38 ----- EVENTS/GeoClawOpenFOAM/projectsettings.ui | 163 --------------------- 3 files changed, 306 deletions(-) delete mode 100644 EVENTS/GeoClawOpenFOAM/projectsettings.cpp delete mode 100644 EVENTS/GeoClawOpenFOAM/projectsettings.h delete mode 100644 EVENTS/GeoClawOpenFOAM/projectsettings.ui diff --git a/EVENTS/GeoClawOpenFOAM/projectsettings.cpp b/EVENTS/GeoClawOpenFOAM/projectsettings.cpp deleted file mode 100644 index 0150b10d..00000000 --- a/EVENTS/GeoClawOpenFOAM/projectsettings.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "projectsettings.h" -#include "ui_projectsettings.h" -#include - -//********************************************************************************* -// Project settings -//********************************************************************************* -projectsettings::projectsettings(int type, QWidget *parent) : - QFrame(parent), - ui(new Ui::projectsettings) -{ - ui->setupUi(this); - - // Initialize to show / hide elements - hideshowelems(type); -} - -//********************************************************************************* -// Delete project settings -//********************************************************************************* -projectsettings::~projectsettings() -{ - delete ui; -} - -//********************************************************************************* -// Refresh data -//********************************************************************************* -void projectsettings::refreshData(int type) -{ - // Initialize to show / hide elements - hideshowelems(type); -} - -//********************************************************************************* -// Reset data -//********************************************************************************* -void projectsettings::resetData() -{ - //ui->Led_PName->clear(); - //ui->Ted_PDesc->clear(); - ui->CmB_SimType->setCurrentIndex(0); - ui->CmB_TurbModel->setCurrentIndex(0); -} - -//********************************************************************************* -// Show - hide elements -//********************************************************************************* -void projectsettings::hideshowelems(int type) -{ - (void) type; -} - -//********************************************************************************* -// Get data from project settings for JSON file output -//********************************************************************************* -bool projectsettings::getData(QMap & map, int type) -{ - bool hasData=false; - (void) type; - - //map.insert("ProjectName",ui->Led_PName->text()); - //map.insert("ProjectDescription",ui->Ted_PDesc->toPlainText()); - map.insert("SimulationType",QString::number(ui->CmB_SimType->currentIndex())); - map.insert("TurbulenceModel",QString::number(ui->CmB_TurbModel->currentIndex())); - - hasData = true; - - return hasData; -} - -//********************************************************************************* -// Read data from JSON file -//********************************************************************************* -bool projectsettings::putData(QJsonObject &jsonObject, int stype) -{ - - // Reset the data - resetData(); - -// // Project name -// if(jsonObject.contains("ProjectName")) -// { -// ui->Led_PName->setText(jsonObject["ProjectName"].toString()); -// } - -// // Project description -// if(jsonObject.contains("ProjectDescription")) -// { -// ui->Ted_PDesc->document()->setPlainText(jsonObject["ProjectDescription"].toString()); -// } - - // Simulation type - ui->CmB_SimType->setCurrentIndex(stype); - - - // Turbulence model - if(jsonObject.contains("TurbulenceModel")) - { - ui->CmB_TurbModel->setCurrentIndex(jsonObject["TurbulenceModel"].toString().toInt()); - } - - // Return true - return true; -} diff --git a/EVENTS/GeoClawOpenFOAM/projectsettings.h b/EVENTS/GeoClawOpenFOAM/projectsettings.h deleted file mode 100644 index a25d269d..00000000 --- a/EVENTS/GeoClawOpenFOAM/projectsettings.h +++ /dev/null @@ -1,38 +0,0 @@ -#ifndef PROJECTSETTINGS_H -#define PROJECTSETTINGS_H - -#include -#include -#include -#include -#include -#include - -#include "hydroerror.h" - -namespace Ui { -class projectsettings; -} - -class projectsettings : public QFrame -{ - Q_OBJECT - -public: - explicit projectsettings(int, QWidget *parent = nullptr); - ~projectsettings(); - bool getData(QMap&,int); - bool putData(QJsonObject &,int); - void refreshData(int); - void resetData(); - -private slots: - -private: - void hideshowelems(int); - Ui::projectsettings *ui; - QUrl workdirUrl; // Defaulty workdirectory - Hydroerror error; -}; - -#endif // PROJECTSETTINGS_H diff --git a/EVENTS/GeoClawOpenFOAM/projectsettings.ui b/EVENTS/GeoClawOpenFOAM/projectsettings.ui deleted file mode 100644 index cdf9e5cd..00000000 --- a/EVENTS/GeoClawOpenFOAM/projectsettings.ui +++ /dev/null @@ -1,163 +0,0 @@ - - - projectsettings - - - - 0 - 0 - 332 - 793 - - - - Frame - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 14 - - - - <html><head/><body><p><span style=" font-weight:600;">EVENT SETTINGS</span></p></body></html> - - - Qt::AlignCenter - - - - - - - - 12 - true - - - - <html><head/><body><p>Simulation type</p></body></html> - - - - - - - true - - - - 12 - - - - Choose the type of simulation to be done - - - 10000 - - - false - - - - Choose simulation type - - - - - CFD to resolve SW (Using SW results) - - - - - CFD using bathymetry data - - - - - CFD using STL file - - - - - CFD using Wave Flume Digital Twin - - - - - - - - - 12 - true - - - - <html><head/><body><p>Turbulence model</p></body></html> - - - - - - - - 12 - - - - Choose the turbulence model to be used - - - 10000 - - - - Laminar - - - - - k-Epsilon - - - - - k-Omega SST - - - - - - - - Qt::Vertical - - - - 20 - 201 - - - - - - - - -