From 2c5852be123a602d6d12927512310fe587b531ab Mon Sep 17 00:00:00 2001 From: Nosferatu Arucard Date: Wed, 3 Jul 2019 17:09:24 +0100 Subject: [PATCH] Updating Version --- src/ERYAPIXEMainFrame.cpp | 6 +++--- src/FileLibrary.cpp | 8 ++++---- src/R33Library.cpp | 6 +++--- src/XlsxLibrary.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ERYAPIXEMainFrame.cpp b/src/ERYAPIXEMainFrame.cpp index 0c56f78..5c5dc21 100644 --- a/src/ERYAPIXEMainFrame.cpp +++ b/src/ERYAPIXEMainFrame.cpp @@ -535,7 +535,7 @@ void ERYAPIXEMainFrame::OnDatabaseSetup( wxCommandEvent& event ) void ERYAPIXEMainFrame::OnHelpAbout( wxCommandEvent& event ) { - wxMessageBox(wxT("Current Build Version 4.30\nBuilt with wxWidgets 3.0.4, with wxMathPlot 0.13\nand Custom Simple Xlsx File Library\n(c) 2019 LIBPHYS"), wxT("Welcome to ERYA")); + wxMessageBox(wxT("Current Build Version 4.40\nBuilt with wxWidgets 3.0.4, with wxMathPlot 0.13\nand Custom Simple Xlsx File Library\n(c) 2019 LIBPHYS"), wxT("Welcome to ERYA")); } void ERYAPIXEMainFrame::OnElement( wxCommandEvent& event ) @@ -1265,7 +1265,7 @@ bool ERYAPIXEMainFrame::StartUpProgram() // Some Default Values for(int k=0; kSetSelection(0); choiceGP.Item(k)->SetSelection(0); @@ -1558,7 +1558,7 @@ bool ERYAPIXEMainFrame::SaveSetupFile(wxString MainDirectory, wxString MainDetec wxXmlNode* programdatetime = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Date_File_Creation"); programdatetime->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, ActualTime)); wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version"); - programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.30"))); + programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.40"))); wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name"); programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Bulk"))); // Save the file diff --git a/src/FileLibrary.cpp b/src/FileLibrary.cpp index 1d0ada8..5c85b50 100644 --- a/src/FileLibrary.cpp +++ b/src/FileLibrary.cpp @@ -498,7 +498,7 @@ bool ERYAPIXEFile::ERYAPIXEFileSave(wxTextCtrl* MinimumEnergy, wxTextCtrl* Maxim wxXmlNode* programdatetime = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Date_File_Creation"); programdatetime->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, ActualTime)); wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version"); - programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.30"))); + programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.40"))); wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name"); programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Bulk"))); // Save the file @@ -928,7 +928,7 @@ bool DatabaseFile::ERYAPIXEDatabaseFileSave() wxXmlNode* programdatetime = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Date_File_Creation"); programdatetime->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, ActualTime)); wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version"); - programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.30"))); + programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.40"))); wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name"); programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Bulk"))); // Save the file @@ -1190,7 +1190,7 @@ bool DetectorFile::DetectorFileSave() wxXmlNode* programdatetime = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Date_File_Creation"); programdatetime->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, ActualTime)); wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version"); - programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.30"))); + programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.40"))); wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name"); programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Bulk"))); // Save the file @@ -1806,7 +1806,7 @@ bool ZieglerFile::ZieglerFileSave() wxXmlNode* programdatetime = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Date_File_Creation"); programdatetime->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, ActualTime)); wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version"); - programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.30"))); + programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.40"))); wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name"); programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Bulk"))); // Save the file diff --git a/src/R33Library.cpp b/src/R33Library.cpp index 8383a21..d92c84b 100644 --- a/src/R33Library.cpp +++ b/src/R33Library.cpp @@ -210,7 +210,7 @@ bool R33File::IBANDLFileSave(wxGrid *tableDataEditor, wxTextCtrl* textEditElemen file.AddLine( wxEmptyString); file.AddLine( wxT("Version: R33") ); file.AddLine( wxT("Source: ERYA") ); - file.AddLine( wxT("Name: ERYA v4.30") ); + file.AddLine( wxT("Name: ERYA v4.40") ); file.AddLine( wxT("Address1:") ); file.AddLine( wxT("SubFile:" ) ); file.AddLine( wxT("Serial Number:") ); @@ -995,7 +995,7 @@ ElementDatabaseArray LabViewElements::GetElementsFromLabView() LabViewElementName = TestNewName; } // And store the data to the Database class - ElementDatabase StoreNewElement(LabViewElementName, ActualGammaPeak, ActualElementNumber, ActualAbundance, ActualAtomic, ActualIsotopic, ImportElementEnergy, ImportElementEnergyError, ImportElementSigma, ImportElementSigmaError, wxEmptyString); + ElementDatabase StoreNewElement(LabViewElementName, ActualGammaPeak, ActualElementNumber, ActualAbundance, ActualAtomic, ActualIsotopic, ImportElementEnergy, ImportElementEnergyError, ImportElementSigma, ImportElementSigmaError, wxT("Element ") + LabViewElementName + wxT(" (") + ActualGammaPeak + wxT(") exported from legacy LabView.")); ElementRecords.Add(StoreNewElement); } } @@ -1042,7 +1042,7 @@ ElementDatabaseArray LabViewElements::GetElementsFromLabView() LabViewElementName = TestNewName; } // And store the data to the Database class - ElementDatabase StoreNewElement(LabViewElementName, ActualGammaPeak, ActualElementNumber, ActualAbundance, ActualAtomic, ActualIsotopic, ImportElementEnergy, ImportElementEnergyError, ImportElementSigma, ImportElementSigmaError, wxEmptyString); + ElementDatabase StoreNewElement(LabViewElementName, ActualGammaPeak, ActualElementNumber, ActualAbundance, ActualAtomic, ActualIsotopic, ImportElementEnergy, ImportElementEnergyError, ImportElementSigma, ImportElementSigmaError, wxT("Element ") + LabViewElementName + wxT(" (") + ActualGammaPeak + wxT(") exported from legacy LabView.")); ElementRecords.Add(StoreNewElement); } // Clean temporary vectors diff --git a/src/XlsxLibrary.cpp b/src/XlsxLibrary.cpp index 44acfb3..0feb975 100644 --- a/src/XlsxLibrary.cpp +++ b/src/XlsxLibrary.cpp @@ -603,7 +603,7 @@ wxString XlsxFile::GetXlsxApp() app->AddAttribute(wxT("xmlns"),wxT("http://schemas.openxmlformats.org/officeDocument/2006/extended-properties")); app->AddAttribute(wxT("xmlns:vt"),wxT("http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes")); wxXmlNode* version = new wxXmlNode(app, wxXML_ELEMENT_NODE, "AppVersion"); - version->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.30"))); + version->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.40"))); wxXmlNode* links = new wxXmlNode(app, wxXML_ELEMENT_NODE, "HyperlinksChanged"); links->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("false"))); wxXmlNode* doc = new wxXmlNode(app, wxXML_ELEMENT_NODE, "SharedDoc");