diff --git a/README.md b/README.md index 17c17548..0e314c54 100644 --- a/README.md +++ b/README.md @@ -79,7 +79,8 @@ Asali has been tested on Ubuntu 16.04 LTS, Ubuntu 18.04 LTS, Windows 10, Windows ##### 2.1.1 Pre-requisites installation The Linux based external libraries can be installed by typing these commands: `sudo apt-get update` -`sudo apt-get install git g++ gfortran python scons libboost-dev cython python-dev python-numpy python-numpy-dev python-setuptools cython python3 python3-dev python3-setuptools python3-numpy` +`sudo apt-get install scons git python3-ruamel.yaml python3-yaml g++ gfortran python libboost-dev cython python-dev python-numpy python-numpy-dev python-setuptools python3 python3-dev python3-setuptools python3-numpy cython3` +`sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 1` ##### 2.1.2 How to install Gtkmm libraries [Gtkmm](https://www.gtkmm.org/en/) can be downloaded with the following command: diff --git a/Ubuntu/images/BatchLogo.png b/Ubuntu/images/BatchLogo.png new file mode 100644 index 00000000..c7163d0c Binary files /dev/null and b/Ubuntu/images/BatchLogo.png differ diff --git a/Ubuntu/images/BatchLogo.tiff b/Ubuntu/images/BatchLogo.tiff deleted file mode 100644 index 31f57b6e..00000000 Binary files a/Ubuntu/images/BatchLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/BigLogo.png b/Ubuntu/images/BigLogo.png new file mode 100644 index 00000000..9c5daca6 Binary files /dev/null and b/Ubuntu/images/BigLogo.png differ diff --git a/Ubuntu/images/BigLogo.tiff b/Ubuntu/images/BigLogo.tiff deleted file mode 100644 index 7c3525cd..00000000 Binary files a/Ubuntu/images/BigLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/CstrLogo.png b/Ubuntu/images/CstrLogo.png new file mode 100644 index 00000000..389c00e8 Binary files /dev/null and b/Ubuntu/images/CstrLogo.png differ diff --git a/Ubuntu/images/CstrLogo.tiff b/Ubuntu/images/CstrLogo.tiff deleted file mode 100644 index 0118f158..00000000 Binary files a/Ubuntu/images/CstrLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/Het1DLogo.png b/Ubuntu/images/Het1DLogo.png new file mode 100644 index 00000000..890e6853 Binary files /dev/null and b/Ubuntu/images/Het1DLogo.png differ diff --git a/Ubuntu/images/Het1DLogo.tiff b/Ubuntu/images/Het1DLogo.tiff deleted file mode 100644 index 12510182..00000000 Binary files a/Ubuntu/images/Het1DLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/Icon.png b/Ubuntu/images/Icon.png new file mode 100644 index 00000000..85cfecd0 Binary files /dev/null and b/Ubuntu/images/Icon.png differ diff --git a/Ubuntu/images/Icon.tiff b/Ubuntu/images/Icon.tiff deleted file mode 100644 index a9219c81..00000000 Binary files a/Ubuntu/images/Icon.tiff and /dev/null differ diff --git a/Ubuntu/images/KineticLogo.png b/Ubuntu/images/KineticLogo.png new file mode 100644 index 00000000..bca2341b Binary files /dev/null and b/Ubuntu/images/KineticLogo.png differ diff --git a/Ubuntu/images/KineticLogo.tiff b/Ubuntu/images/KineticLogo.tiff deleted file mode 100644 index 8ed8a30c..00000000 Binary files a/Ubuntu/images/KineticLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/KineticSchemeLogo.png b/Ubuntu/images/KineticSchemeLogo.png new file mode 100644 index 00000000..2aec07fa Binary files /dev/null and b/Ubuntu/images/KineticSchemeLogo.png differ diff --git a/Ubuntu/images/KineticSchemeLogo.tiff b/Ubuntu/images/KineticSchemeLogo.tiff deleted file mode 100644 index b9835113..00000000 Binary files a/Ubuntu/images/KineticSchemeLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/Logo.png b/Ubuntu/images/Logo.png deleted file mode 100644 index 0d0183e9..00000000 Binary files a/Ubuntu/images/Logo.png and /dev/null differ diff --git a/Ubuntu/images/PelletLogo.png b/Ubuntu/images/PelletLogo.png new file mode 100644 index 00000000..b34d5ec6 Binary files /dev/null and b/Ubuntu/images/PelletLogo.png differ diff --git a/Ubuntu/images/PelletLogo.tiff b/Ubuntu/images/PelletLogo.tiff deleted file mode 100644 index 7492b5f8..00000000 Binary files a/Ubuntu/images/PelletLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/Ph1DLogo.png b/Ubuntu/images/Ph1DLogo.png new file mode 100644 index 00000000..7dde0489 Binary files /dev/null and b/Ubuntu/images/Ph1DLogo.png differ diff --git a/Ubuntu/images/Ph1DLogo.tiff b/Ubuntu/images/Ph1DLogo.tiff deleted file mode 100644 index ccf237d4..00000000 Binary files a/Ubuntu/images/Ph1DLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/PressureLogo.png b/Ubuntu/images/PressureLogo.png new file mode 100644 index 00000000..4bec4359 Binary files /dev/null and b/Ubuntu/images/PressureLogo.png differ diff --git a/Ubuntu/images/PressureLogo.tiff b/Ubuntu/images/PressureLogo.tiff deleted file mode 100644 index a0d99568..00000000 Binary files a/Ubuntu/images/PressureLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/Reaction.png b/Ubuntu/images/Reaction.png new file mode 100644 index 00000000..7a6c1ddf Binary files /dev/null and b/Ubuntu/images/Reaction.png differ diff --git a/Ubuntu/images/Reaction.tiff b/Ubuntu/images/Reaction.tiff deleted file mode 100644 index ea3bab5d..00000000 Binary files a/Ubuntu/images/Reaction.tiff and /dev/null differ diff --git a/Ubuntu/images/ReactorsEquations.png b/Ubuntu/images/ReactorsEquations.png new file mode 100644 index 00000000..8d17154d Binary files /dev/null and b/Ubuntu/images/ReactorsEquations.png differ diff --git a/Ubuntu/images/ReactorsEquations.tiff b/Ubuntu/images/ReactorsEquations.tiff deleted file mode 100644 index d4c6bffb..00000000 Binary files a/Ubuntu/images/ReactorsEquations.tiff and /dev/null differ diff --git a/Ubuntu/images/RegressionExponential.png b/Ubuntu/images/RegressionExponential.png new file mode 100644 index 00000000..44b22de0 Binary files /dev/null and b/Ubuntu/images/RegressionExponential.png differ diff --git a/Ubuntu/images/RegressionExponential.tiff b/Ubuntu/images/RegressionExponential.tiff deleted file mode 100644 index 648db8ad..00000000 Binary files a/Ubuntu/images/RegressionExponential.tiff and /dev/null differ diff --git a/Ubuntu/images/RegressionLinear.png b/Ubuntu/images/RegressionLinear.png new file mode 100644 index 00000000..8c69f52a Binary files /dev/null and b/Ubuntu/images/RegressionLinear.png differ diff --git a/Ubuntu/images/RegressionLinear.tiff b/Ubuntu/images/RegressionLinear.tiff deleted file mode 100644 index 14647f09..00000000 Binary files a/Ubuntu/images/RegressionLinear.tiff and /dev/null differ diff --git a/Ubuntu/images/RegressionLogo.png b/Ubuntu/images/RegressionLogo.png new file mode 100644 index 00000000..7d17aa05 Binary files /dev/null and b/Ubuntu/images/RegressionLogo.png differ diff --git a/Ubuntu/images/RegressionLogo.tiff b/Ubuntu/images/RegressionLogo.tiff deleted file mode 100644 index 7fa7c1ba..00000000 Binary files a/Ubuntu/images/RegressionLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/SmallLogo.png b/Ubuntu/images/SmallLogo.png new file mode 100644 index 00000000..8fe526e7 Binary files /dev/null and b/Ubuntu/images/SmallLogo.png differ diff --git a/Ubuntu/images/SmallLogo.tiff b/Ubuntu/images/SmallLogo.tiff deleted file mode 100644 index c8f623db..00000000 Binary files a/Ubuntu/images/SmallLogo.tiff and /dev/null differ diff --git a/Ubuntu/images/names.png b/Ubuntu/images/names.png new file mode 100644 index 00000000..4e9c8363 Binary files /dev/null and b/Ubuntu/images/names.png differ diff --git a/Ubuntu/images/names.tiff b/Ubuntu/images/names.tiff deleted file mode 100644 index 65fab45a..00000000 Binary files a/Ubuntu/images/names.tiff and /dev/null differ diff --git a/Ubuntu/src/Asali.C b/Ubuntu/src/Asali.C index 54198c66..968592d7 100644 --- a/Ubuntu/src/Asali.C +++ b/Ubuntu/src/Asali.C @@ -82,11 +82,11 @@ namespace ASALI "\nor select the default one (database/data.xml)" "\n\nLoading might take several minutes, depending" "\non your system performances."), - bigLogo_("images/BigLogo.tiff"), - smallLogo1_("images/SmallLogo.tiff"), - smallLogo2_("images/SmallLogo.tiff"), - smallLogo3_("images/SmallLogo.tiff"), - smallLogo4_("images/SmallLogo.tiff") + bigLogo_("images/BigLogo.png"), + smallLogo1_("images/SmallLogo.png"), + smallLogo2_("images/SmallLogo.png"), + smallLogo3_("images/SmallLogo.png"), + smallLogo4_("images/SmallLogo.png") { #include "shared/Beer.H" #include "shared/BeerShort.H" @@ -96,7 +96,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(grid_); diff --git a/Ubuntu/src/asaliCatalystProperties.C b/Ubuntu/src/asaliCatalystProperties.C index c43c4fca..77e41dc2 100644 --- a/Ubuntu/src/asaliCatalystProperties.C +++ b/Ubuntu/src/asaliCatalystProperties.C @@ -41,7 +41,7 @@ namespace ASALI { asaliCatalystProperties::asaliCatalystProperties() - : het1dLogo_("images/Het1DLogo.tiff"), + : het1dLogo_("images/Het1DLogo.png"), mainBox_(Gtk::ORIENTATION_VERTICAL), rhoLabel_("Density"), condLabel_("Thermal conductivity"), @@ -53,7 +53,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: catalyst input"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid mainBox_.set_halign(Gtk::ALIGN_START); diff --git a/Ubuntu/src/asaliKineticMaker.C b/Ubuntu/src/asaliKineticMaker.C index 1f5ca173..3bdbfc17 100644 --- a/Ubuntu/src/asaliKineticMaker.C +++ b/Ubuntu/src/asaliKineticMaker.C @@ -68,11 +68,11 @@ namespace ASALI typeLabel1_("Type"), recapSpeciesLabel_("Species"), recapReactionLabel_("Reactions"), - logo1_("images/KineticSchemeLogo.tiff"), - logo2_("images/KineticSchemeLogo.tiff"), - logo3_("images/KineticSchemeLogo.tiff"), - logo4_("images/KineticSchemeLogo.tiff"), - logo5_("images/KineticSchemeLogo.tiff"), + logo1_("images/KineticSchemeLogo.png"), + logo2_("images/KineticSchemeLogo.png"), + logo3_("images/KineticSchemeLogo.png"), + logo4_("images/KineticSchemeLogo.png"), + logo5_("images/KineticSchemeLogo.png"), NR_(0), NC_(0), restart_(true) @@ -96,7 +96,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Kinetic scheme"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(reactionNumberBox_); diff --git a/Ubuntu/src/asaliPlot.C b/Ubuntu/src/asaliPlot.C index 23688ffe..f58cf960 100644 --- a/Ubuntu/src/asaliPlot.C +++ b/Ubuntu/src/asaliPlot.C @@ -54,7 +54,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: plotting"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid diff --git a/Ubuntu/src/asaliProperties.C b/Ubuntu/src/asaliProperties.C index 30c22b38..1b7417a6 100644 --- a/Ubuntu/src/asaliProperties.C +++ b/Ubuntu/src/asaliProperties.C @@ -41,10 +41,10 @@ namespace ASALI { asaliProperties::asaliProperties() - : batchLogo_("images/BatchLogo.tiff"), - ph1dLogo_("images/Ph1DLogo.tiff"), - het1dLogo_("images/Het1DLogo.tiff"), - pelletLogo_("images/PelletLogo.tiff"), + : batchLogo_("images/BatchLogo.png"), + ph1dLogo_("images/Ph1DLogo.png"), + het1dLogo_("images/Het1DLogo.png"), + pelletLogo_("images/PelletLogo.png"), mainBox_(Gtk::ORIENTATION_VERTICAL), nameLabel_("Name"), mwLabel_("Molecular weight"), @@ -62,7 +62,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: properties input"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid mainBox_.set_halign(Gtk::ALIGN_START); diff --git a/Ubuntu/src/batchReactor.C b/Ubuntu/src/batchReactor.C index 1ce054d0..fbaf1833 100644 --- a/Ubuntu/src/batchReactor.C +++ b/Ubuntu/src/batchReactor.C @@ -58,8 +58,8 @@ namespace ASALI timeLabel_("Integration time"), saveLabel_("Save solution every"), energyLabel_("Energy"), - logo1_("images/BatchLogo.tiff"), - logo2_("images/BatchLogo.tiff"), + logo1_("images/BatchLogo.png"), + logo2_("images/BatchLogo.png"), plotButtonBool_(false) { @@ -70,7 +70,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Batch reactor"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(mainBox_); diff --git a/Ubuntu/src/catalyticPellet.C b/Ubuntu/src/catalyticPellet.C index 0428319b..14a6de8b 100644 --- a/Ubuntu/src/catalyticPellet.C +++ b/Ubuntu/src/catalyticPellet.C @@ -63,8 +63,8 @@ namespace ASALI pelletTypeLabel_("Pellet shape"), modelTypeLabel_("Diffusion model"), poreLabel_("Pore diameter"), - logo1_("images/PelletLogo.tiff"), - logo2_("images/PelletLogo.tiff"), + logo1_("images/PelletLogo.png"), + logo2_("images/PelletLogo.png"), pelletType_("none"), modelType_("none"), modelBool_(false), @@ -79,7 +79,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Catalytic pellets"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(mainBox_); diff --git a/Ubuntu/src/catalyticReactors.C b/Ubuntu/src/catalyticReactors.C index 5eb167f3..2e4599c5 100644 --- a/Ubuntu/src/catalyticReactors.C +++ b/Ubuntu/src/catalyticReactors.C @@ -89,7 +89,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Catalytic reactors"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); } //Species input menu diff --git a/Ubuntu/src/chemkinConverter.C b/Ubuntu/src/chemkinConverter.C index 97e91ce6..3efd9431 100644 --- a/Ubuntu/src/chemkinConverter.C +++ b/Ubuntu/src/chemkinConverter.C @@ -45,7 +45,7 @@ namespace ASALI output_("Convert"), help_("Help"), exit_("Exit"), - logo_("images/SmallLogo.tiff") + logo_("images/SmallLogo.png") { #include "shared/Beer.H" @@ -57,7 +57,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: CHEMKIN converter"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Adding logo diff --git a/Ubuntu/src/cstrReactor.C b/Ubuntu/src/cstrReactor.C index a758fc97..4cc179f1 100644 --- a/Ubuntu/src/cstrReactor.C +++ b/Ubuntu/src/cstrReactor.C @@ -59,8 +59,8 @@ namespace ASALI timeLabel_("Integration time"), saveLabel_("Save solution every"), energyLabel_("Energy"), - logo1_("images/CstrLogo.tiff"), - logo2_("images/CstrLogo.tiff"), + logo1_("images/CstrLogo.png"), + logo2_("images/CstrLogo.png"), plotButtonBool_(false) { @@ -71,7 +71,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: CST reactor"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(mainBox_); diff --git a/Ubuntu/src/equilibriumCalculator.C b/Ubuntu/src/equilibriumCalculator.C index 1cd269f8..fe0ec7c8 100644 --- a/Ubuntu/src/equilibriumCalculator.C +++ b/Ubuntu/src/equilibriumCalculator.C @@ -60,7 +60,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Equilibrium calculator"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); this->input(); } diff --git a/Ubuntu/src/het1dReactor.C b/Ubuntu/src/het1dReactor.C index 6e5108f5..534d187a 100644 --- a/Ubuntu/src/het1dReactor.C +++ b/Ubuntu/src/het1dReactor.C @@ -72,8 +72,8 @@ namespace ASALI honeyCombCPSILabel_("CPSI"), honeyCombWallThicknessLabel_("Wall thickness"), honeyCombDuctLabel_("Duct section"), - logo1_("images/Het1DLogo.tiff"), - logo2_("images/Het1DLogo.tiff"), + logo1_("images/Het1DLogo.png"), + logo2_("images/Het1DLogo.png"), reactorType_("none"), tubularBool_(false), honeyCombBool_(false), @@ -88,7 +88,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: 1D HET reactor"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(mainBox_); diff --git a/Ubuntu/src/ph1dReactor.C b/Ubuntu/src/ph1dReactor.C index 55d5af9d..75ff535b 100644 --- a/Ubuntu/src/ph1dReactor.C +++ b/Ubuntu/src/ph1dReactor.C @@ -62,8 +62,8 @@ namespace ASALI pointsLabel_("Number of points"), inertLabel_("Inert specie"), resolutionLabel_("Resolution type"), - logo1_("images/Ph1DLogo.png"), - logo2_("images/Ph1DLogo.png"), + logo1_("images/Ph1DLogo.tiff"), + logo2_("images/Ph1DLogo.tiff"), plotButtonBool_(false) { diff --git a/Ubuntu/src/pressureDrops.C b/Ubuntu/src/pressureDrops.C index 8b9f89e1..68d9b8ea 100644 --- a/Ubuntu/src/pressureDrops.C +++ b/Ubuntu/src/pressureDrops.C @@ -61,8 +61,8 @@ namespace ASALI honeyCombWallThicknessLabel_("Wall thickness"), tubularDpLabel_("Bird R. B. et al. (1960)"), honeyCombDpLabel_("Bird R. B. et al. (1960)"), - logo1_("images/PressureLogo.tiff"), - logo2_("images/PressureLogo.tiff"), + logo1_("images/PressureLogo.png"), + logo2_("images/PressureLogo.png"), reactorType_("none"), tubularBool_(false), honeyCombBool_(false), @@ -98,7 +98,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Pressure drops"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); doneButton_.set_label("Next"); this->input(); } diff --git a/Ubuntu/src/runBar.C b/Ubuntu/src/runBar.C index 33f5086f..ef00b558 100644 --- a/Ubuntu/src/runBar.C +++ b/Ubuntu/src/runBar.C @@ -48,7 +48,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); this->add(mainBox_); mainBox_.set_spacing(10); mainBox_.pack_start(solvingLabel_,Gtk::PACK_SHRINK); diff --git a/Ubuntu/src/speciesPopup.C b/Ubuntu/src/speciesPopup.C index b90a4d2e..063ff278 100644 --- a/Ubuntu/src/speciesPopup.C +++ b/Ubuntu/src/speciesPopup.C @@ -49,7 +49,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: species names"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); this->add(mainBox_); mainBox_.pack_start(scrolledWindow_); scrolledWindow_.add(speciesImage_); diff --git a/Ubuntu/src/thermoTransportProperties.C b/Ubuntu/src/thermoTransportProperties.C index d60da9ad..eda388e9 100644 --- a/Ubuntu/src/thermoTransportProperties.C +++ b/Ubuntu/src/thermoTransportProperties.C @@ -69,7 +69,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Thermodynamic and transport properties"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); this->input(); } diff --git a/Ubuntu/src/transportProperties.C b/Ubuntu/src/transportProperties.C index 657185d0..947298a6 100644 --- a/Ubuntu/src/transportProperties.C +++ b/Ubuntu/src/transportProperties.C @@ -71,7 +71,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Transport properties"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); //Add background grid this->add(inputGrid_); diff --git a/Ubuntu/src/vacuumProperties.C b/Ubuntu/src/vacuumProperties.C index 0ec86c0b..fdbce622 100644 --- a/Ubuntu/src/vacuumProperties.C +++ b/Ubuntu/src/vacuumProperties.C @@ -74,7 +74,7 @@ namespace ASALI this->set_border_width(15); this->set_title("ASALI: Vacuum properties"); this->set_position(Gtk::WIN_POS_CENTER_ALWAYS); - this->set_icon_from_file("images/Icon.tiff"); + this->set_icon_from_file("images/Icon.png"); this->add(grid_); diff --git a/Windows/Asali-setup.exe b/Windows/Asali-setup.exe new file mode 100644 index 00000000..5e839c1a Binary files /dev/null and b/Windows/Asali-setup.exe differ