Skip to content

Commit

Permalink
Updating Version
Browse files Browse the repository at this point in the history
  • Loading branch information
Nosferatu Arucard committed Jul 3, 2019
1 parent a374eca commit 2c5852b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions src/ERYAPIXEMainFrame.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -1265,7 +1265,7 @@ bool ERYAPIXEMainFrame::StartUpProgram()
// Some Default Values
for(int k=0; k<choiceElement.GetCount(); k++)
{
if(OpenDatabase.RebuildElementGammaMenu(choiceElement.Item(k), choiceGP.Item(k), 0))
if(OpenDatabase.ResetElementGammaMenu(choiceElement.Item(k), choiceGP.Item(k)))
{
choiceElement.Item(k)->SetSelection(0);
choiceGP.Item(k)->SetSelection(0);
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/FileLibrary.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/R33Library.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:") );
Expand Down Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/XlsxLibrary.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit 2c5852b

Please sign in to comment.