Sync all private code changes

Prepare a new version with all changes on code made privately.
Arucard1983 · Feb 5, 2020 · c1af6dd · c1af6dd
1 parent cd33ce6
commit c1af6dd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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.50\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.60\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 )
@@ -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.50")));
+     programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.60")));
     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
@@ -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.50")));
+     programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.60")));
     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.50")));
+     programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.60")));
     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.50")));
+     programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.60")));
     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.50")));
+     programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.60")));
     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
@@ -214,7 +214,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.50") );
+ file.AddLine( wxT("Name: ERYA v4.60") );
  file.AddLine( wxT("Address1:") );
  file.AddLine( wxT("SubFile:" ) );
  file.AddLine( wxT("Serial Number:") );

diff --git 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.50")));
+ version->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("4.60")));
  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");