Skip to content

Commit

Permalink
Change version strings
Browse files Browse the repository at this point in the history 
To fix the previous commit
  • Loading branch information
@Arucard1983
Arucard1983 authored Jul 4, 2019
1 parent 578e2eb commit 105aadd
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/ERYAProfilingERYAProfilingMain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void ERYAProfilingERYAProfilingMain::OnCalculator( wxCommandEvent& event )

void ERYAProfilingERYAProfilingMain::OnHelpAbout( wxCommandEvent& event )
{
wxMessageBox(wxT("ERYA-Profiling Version 2.50\nBuilt with wxWidgets 3.0.4, with wxMathPlot 0.13 and Custom Simple Xlsx Library 0.1\nCompiling with GCC 6.3.0\n(c) 2018 LIBPHYS"), wxT("Welcome to ERYA Profiling"));
wxMessageBox(wxT("ERYA-Profiling Version 2.60\nBuilt with wxWidgets 3.0.4, with wxMathPlot 0.13 and Custom Simple Xlsx Library 0.1\nCompiling with GCC 6.3.0\n(c) 2018 LIBPHYS"), wxT("Welcome to ERYA Profiling"));
}

void ERYAProfilingERYAProfilingMain::OnNumberElementSpin( wxSpinEvent& event )
Expand Down Expand Up @@ -2445,7 +2445,7 @@ bool ERYAProfilingERYAProfilingMain::SaveSetupFile(wxString MainDirectory, wxStr
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("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down
14 changes: 7 additions & 7 deletions src/FileLibrary.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ bool ERYAProfilingSampleFile::ERYAProfilingSampleSave(ArrayElement choiceElement
wxXmlNode* fileversion = new wxXmlNode(database, wxXML_ELEMENT_NODE, "File_Details");
wxXmlNode* details = new wxXmlNode(fileversion, wxXML_ELEMENT_NODE, "Contents");
wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version");
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down Expand Up @@ -428,7 +428,7 @@ bool ERYAProfilingLayerFile::ERYAProfilingLayerSave(wxGrid* LayerTable, ElementD
wxXmlNode* fileversion = new wxXmlNode(layer, wxXML_ELEMENT_NODE, "File_Details");
wxXmlNode* details = new wxXmlNode(fileversion, wxXML_ELEMENT_NODE, "Contents");
wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version");
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down Expand Up @@ -759,7 +759,7 @@ bool ERYAProfilingRessonanceFile::ERYAProfilingRessonanceSave(wxTextCtrl* valueB
wxXmlNode* fileversion = new wxXmlNode(ressonance, wxXML_ELEMENT_NODE, "File_Details");
wxXmlNode* details = new wxXmlNode(fileversion, wxXML_ELEMENT_NODE, "Contents");
wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version");
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down Expand Up @@ -1204,7 +1204,7 @@ bool ERYAProfilingGlobalFile::ERYAProfilingGlobalSave(wxTextCtrl* valueBeamResol
wxXmlNode* fileversion = new wxXmlNode(global, wxXML_ELEMENT_NODE, "File_Details");
wxXmlNode* details = new wxXmlNode(fileversion, wxXML_ELEMENT_NODE, "Contents");
wxXmlNode* programversion = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Version");
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down Expand Up @@ -1626,7 +1626,7 @@ bool DatabaseFile::ERYAProfilingDatabaseFileSave()
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("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down Expand Up @@ -1879,7 +1879,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("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down Expand Up @@ -2610,7 +2610,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("2.50")));
programversion->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.60")));
wxXmlNode* programname = new wxXmlNode(details, wxXML_ELEMENT_NODE, "Program_Name");
programname->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("ERYA-Profiling")));
// Save the file
Expand Down
2 changes: 1 addition & 1 deletion src/R33Library.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,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 Profiling v2.50") );
file.AddLine( wxT("Name: ERYA Profiling v2.60") );
file.AddLine( wxT("Address1:") );
file.AddLine( wxT("SubFile:" ) );
file.AddLine( wxT("Serial Number:") );
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("2.50")));
version->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, wxT("2.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");
Expand Down

0 comments on commit 105aadd

Please sign in to comment.