C2024-008 -Created a PROMS executable use .Net version 4.8.1

B2020-106 - Fixed insert of new symbols.
This commit is contained in:
2024-04-16 14:16:40 -04:00
parent 4a3ca1c074
commit 1bdfb7d1e3
48 changed files with 155 additions and 128 deletions

View File

@@ -3716,17 +3716,17 @@ namespace Volian.Controls.Library
/// Grid will be saved to an Excel file.
/// </summary>
/// <param name="initDir"></param>
public void ExportToExcel(string initDir)
{
SaveFileDialog sfd = new SaveFileDialog();
sfd.DefaultExt = ".xls";
sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
//sfd.InitialDirectory = @"C:\Development\SampleTableData";
sfd.InitialDirectory = initDir;
sfd.Title = "Save Excel File";
sfd.ShowDialog();
this.SaveExcel(sfd.FileName);
}
//public void ExportToExcel(string initDir)
//{
// SaveFileDialog sfd = new SaveFileDialog();
// sfd.DefaultExt = ".xls";
// sfd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.* ";
// //sfd.InitialDirectory = @"C:\Development\SampleTableData";
// sfd.InitialDirectory = initDir;
// sfd.Title = "Save Excel File";
// sfd.ShowDialog();
// this.SaveExcel(sfd.FileName);
//}
/// <summary>
/// Prompts user with Open File dialog.
@@ -3761,25 +3761,25 @@ namespace Volian.Controls.Library
/// </summary>
/// <param name="initDir"></param>
/// <returns></returns>
public string ImportExcel(string initDir)
{
string rtn = "";
//VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
OpenFileDialog ofd = new OpenFileDialog();
ofd.DefaultExt = ".xls";
ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
//ofd.InitialDirectory = @"C:\Development\SampleTableData";
ofd.InitialDirectory = initDir;
ofd.Multiselect = false;
ofd.Title = "Select Excel File";
ofd.ShowDialog();
this.Clear();
this.MergedRanges.Clear();
this.LoadExcel(ofd.FileName);
this.AdjustGridControlSize();
rtn = ofd.SafeFileName;
return rtn;
}
//public string ImportExcel(string initDir)
//{
// string rtn = "";
// //VlnFlexGrid grd = rbtDefaultTable.Checked ? vlnFlexGrid2 : vlnFlexGrid3; //GetActiveGrid();
// OpenFileDialog ofd = new OpenFileDialog();
// ofd.DefaultExt = ".xls";
// ofd.Filter = "Excel files (*.xls)|*.xls|All files (*.*)|*.*";
// //ofd.InitialDirectory = @"C:\Development\SampleTableData";
// ofd.InitialDirectory = initDir;
// ofd.Multiselect = false;
// ofd.Title = "Select Excel File";
// ofd.ShowDialog();
// this.Clear();
// this.MergedRanges.Clear();
// this.LoadExcel(ofd.FileName);
// this.AdjustGridControlSize();
// rtn = ofd.SafeFileName;
// return rtn;
//}
public static List<string> ROTableUpdate(object sender, ROFstInfoROTableUpdateEventArgs args)
{
string xml = null;