C2025-022-Remove-UCF-2 #606
Reference in New Issue
Block a user
No description provided.
Delete Branch "C2025-022-Remove-UCF-2"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
C2025-022 Remove UCF code from PROMS.
This update is removable of all UCF code and forms. You will not be looking for the UCF forms or interface. Access to the UCF forms were removed from the interface a while ago.
The object of testing is to verify that PROMS is working correctly without the UCF code.
Overall looks fairly good.
There are some places where there is commented out code (unless there is going to be a phase 3 to this where someone goes back and removes the commented out code) and also some files that are included in this that look like they are unrelated (like App.config, AssemblyInfo.cs, & VEPROMS_UI.csproj_bak_2 ). See individual comments.
Let me know if you have any questions.
@@ -158,3 +158,4 @@
<setting name="UpdateSettings" serializeAs="String">
<value>True</value>
</setting>
<setting name="cbShwRplWrdsColor" serializeAs="String">
Not sure why there are any changes to App.config
Changes to this do not appear to be connected to removing UCF.
still valid issue.
@@ -0,0 +1,16980 @@
using System.Reflection;
Not sure why this file was added?
still valid issue.
@@ -0,0 +1,655 @@
<?xml version="1.0" encoding="utf-8"?>
Not sure why this file was added?
@@ -724,3 +721,3 @@
isImported = true;
}
if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
//if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
Commented out code - should this be removed or is there a reason it needs kept?
still valid
@@ -745,3 +726,1 @@
}
}
}
//private void UpdateFormatForUCFInSet()
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1026,3 +1023,2 @@
}
private E_UCFImportOptions UCFImportDefaultFromSettings;
private E_UCFImportOptions UCFImportCase = E_UCFImportOptions.LoadOnlyImported;
//private E_UCFImportOptions UCFImportDefaultFromSettings;
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1143,102 +1123,102 @@ namespace VEPROMS
// various cases listed above:
if (existingFormat.ContainsKey(name))
Is there any code that is executed inside this if statement?
If no, should if statement be removed?
still valid
Will address in later changes
@@ -1145,3 +1125,2 @@
{
// if case 0 and this ucf already exists, ignore it:
if (UCFImportCase == E_UCFImportOptions.Ignore) continue;
//// if case 0 and this ucf already exists, ignore it:
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1205,3 +1185,2 @@
}
if (UCFImportCase == 0) // ignore it
{
//if (UCFImportCase == 0) // ignore it
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1218,3 +1189,1 @@
{
existingFormat.Add(name, rec.FormatID); // change to original name?
importedFormat.Add(rec.FormatID, name);
//}
Commented out code - should this be removed or is there a reason it needs kept?
@@ -355,3 +341,1 @@
}
}
}
//if (_FolderConfig.MyFolder.FormatID != _cmbxformatOriginal)
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1212,3 +1212,3 @@
this.cbUCFLForSetOnly.TabIndex = 5;
this.cbUCFLForSetOnly.Text = "Load For Set Only";
this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
//this.cbUCFLForSetOnly.CheckedChanged += new System.EventHandler(this.cbUCFLForSetOnly_CheckedChanged);
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1228,3 +1228,3 @@
this.cbUCFLUseAll.TabIndex = 4;
this.cbUCFLUseAll.Text = "Load Use All";
this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
//this.cbUCFLUseAll.CheckedChanged += new System.EventHandler(this.cbUCFLUseAll_CheckedChanged);
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1244,3 +1244,3 @@
this.cbUCFLOnlyImport.TabIndex = 3;
this.cbUCFLOnlyImport.Text = "Load Only Imported";
this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
//this.cbUCFLOnlyImport.CheckedChanged += new System.EventHandler(this.cbUCFLOnlyImport_CheckedChanged);
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1260,3 +1260,3 @@
this.cbUCFLNotUsed.TabIndex = 2;
this.cbUCFLNotUsed.Text = "Load Not Used";
this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
//this.cbUCFLNotUsed.CheckedChanged += new System.EventHandler(this.cbUCFLNotUsed_CheckedChanged);
Commented out code - should this be removed or is there a reason it needs kept?
@@ -1276,3 +1276,3 @@
this.cbUCFIgnore.TabIndex = 1;
this.cbUCFIgnore.Text = "Ignore";
this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
//this.cbUCFIgnore.CheckedChanged += new System.EventHandler(this.cbUCFIgnore_CheckedChanged);
Commented out code - should this be removed or is there a reason it needs kept?
@@ -93,3 +78,1 @@
cbUCFLForSetOnly.Checked = true;
break;
}
//switch (Settings.Default.UCFImportOpt) // see dlgExportImport for descripton of these options.
Commented out code - should this be removed or is there a reason it needs kept?
@@ -194,3 +194,3 @@
private bool ss_SeparateWindows;
private string ss_VisioPath;
private int ss_UCFImportOpt;
//private int ss_UCFImportOpt;
Commented out code - should this be removed or is there a reason it needs kept?
@@ -211,3 +211,3 @@
ss_SeparateWindows = Settings.Default.SeparateWindows;
ss_VisioPath = Settings.Default.VisioPath;
ss_UCFImportOpt = Settings.Default.UCFImportOpt;
//ss_UCFImportOpt = Settings.Default.UCFImportOpt;
Commented out code - should this be removed or is there a reason it needs kept?
@@ -228,3 +228,3 @@
Settings.Default.SeparateWindows = ss_SeparateWindows;
Settings.Default.VisioPath = ss_VisioPath;
Settings.Default.UCFImportOpt = ss_UCFImportOpt;
//Settings.Default.UCFImportOpt = ss_UCFImportOpt;
Commented out code - should this be removed or is there a reason it needs kept?
@@ -322,3 +318,1 @@
Settings.Default.UCFImportOpt = 0;
}
}
//private void cbUCFIgnore_CheckedChanged(object sender, EventArgs e)
Commented out code - should this be removed or is there a reason it needs kept?
@@ -221,3 +216,1 @@
get { return _CheckOffUCF; }
set { _CheckOffUCF = value; }
}
//private bool? _CheckOffUCF;
Commented out code - should this be removed or is there a reason it needs kept?
still valid
@@ -289,3 +275,1 @@
HLSSetpnt = 0x0800, // Do ReplaceWords in HighLevelStep SETPoiNTs
Trans = 0x1000, // Do ReplaceWords in TRANSITIONS
Setpoint = 0x2000, // Do ReplaceWords in SETPOINTS
//[Flags]
Commented out code - should this be removed or is there a reason it needs kept?
@@ -328,3 +322,1 @@
get { return (E_ReplaceFlagsUCF)_Flag; }
set { _Flag = value; }
}
//private E_ReplaceFlags _Flag;
Commented out code - should this be removed or is there a reason it needs kept?
@@ -342,3 +342,3 @@
}
private string _ReplaceWith;
[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
//[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
Commented out code - should this be removed or is there a reason it needs kept?
still valid
@@ -2179,3 +2179,3 @@
// if doing replace words for Page List items, the current item is not a step, use _DoReplWordInPageList flags this
if (_MyItemInfo.MyContent.Type < 20000 && !_DoReplWordInPageList) return Text; // for now only replace in steps.
FormatConfig.ReplaceStrData rsl = _MyFormat.PlantFormat.UCFandOrigReplaceStrData;
//FormatConfig.ReplaceStrData rsl = _MyFormat.PlantFormat.FormatConfig.UCFandReplaceStrData;
Commented out code - should this be removed or is there a reason it needs kept?
@@ -2197,3 +2198,2 @@
{
bool dopartial = (E_ReplaceFlags)(rs.Flag & FormatConfig.E_ReplaceFlagsUCF.Partials) == E_ReplaceFlags.Partials;
if (!dopartial) // F2021-093: Partials moved into their own method and done first
//bool dopartial = (E_ReplaceFlags)(rs.Flag & E_ReplaceFlags.CaseInsens) == E_ReplaceFlags.Partials; // save it may need to be changed back to this code.
Commented out code - should this be removed or is there a reason it needs kept?
still valid
@@ -6128,3 +6114,1 @@
}
return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[] to get ucf
}
//if (stpCoIndx > 1)
Commented out code - should this be removed or is there a reason it needs kept?
@@ -4464,3 +4462,1 @@
{
if (co.Index > 99) xloc_co += ((float)fc.PlantFormat.FormatData.CheckOffXOffAdj * 72);
}
//FormatConfig fc = PlantFormat.GetFormatConfig(formatInfo);
Commented out code - should this be removed or is there a reason it needs kept?
in addition to Matt's comments:
commented out code should be removed or an additional comment as to why this isn't being removed.
VEPROMS User Interface
AssemblyInof.cs this file should in the git ignore list
frmFolderProperties.cs - _cmbxFormatOriginal was added for UCF - this should be removed
VEPROMS.CSLA.library / Format
PlantFormat.cs around line 40 IgnoreUFC should either be removed, commented out
@@ -329,2 +288,2 @@
set { _Flag = value; }
}
//[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
Commented out code - should this be removed or is there a reason it needs kept?
still valid
looks OK. no additional comments.
Version 22.2509.9408 and sql fixes worked properly but the version number for the sql fixes was not updated.
Testing requirements were random testing, printing, etc. I also verified that replace words were in blue for beaver valley and barakah.