C2025-022-Remove-UCF-2 #606

Merged
mschill merged 14 commits from C2025-022-Remove-UCF-2 into Development 2025-09-04 06:55:26 -04:00
Owner

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.

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.
plarsen added 8 commits 2025-09-03 09:00:49 -04:00
plarsen self-assigned this 2025-09-03 09:05:02 -04:00
djankowski was assigned by plarsen 2025-09-03 09:05:02 -04:00
jjenko was assigned by plarsen 2025-09-03 09:05:03 -04:00
mvickers was assigned by plarsen 2025-09-03 09:05:03 -04:00
plarsen requested review from jjenko 2025-09-03 09:05:09 -04:00
plarsen added 1 commit 2025-09-03 09:36:46 -04:00
plarsen added 1 commit 2025-09-03 09:56:12 -04:00
plarsen requested review from mschill 2025-09-03 09:57:03 -04:00
mschill requested changes 2025-09-03 10:15:17 -04:00
mschill left a comment
Owner

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.

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">
Owner

Not sure why there are any changes to App.config

Changes to this do not appear to be connected to removing UCF.

Not sure why there are any changes to App.config Changes to this do not appear to be connected to removing UCF.
Owner

still valid issue.

still valid issue.
mschill marked this conversation as resolved
@@ -0,0 +1,16980 @@
using System.Reflection;
Owner

Not sure why this file was added?

Not sure why this file was added?
Owner

still valid issue.

still valid issue.
mschill marked this conversation as resolved
@@ -0,0 +1,655 @@
<?xml version="1.0" encoding="utf-8"?>
Owner

Not sure why this file was added?

Not sure why this file was added?
mschill marked this conversation as resolved
@@ -724,3 +721,3 @@
isImported = true;
}
if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
//if (isImported && UCFImportCase == E_UCFImportOptions.LoadForSetOnly) UpdateFormatForUCFInSet();
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
Owner

still valid

still valid
mschill marked this conversation as resolved
@@ -745,3 +726,1 @@
}
}
}
//private void UpdateFormatForUCFInSet()
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -1026,3 +1023,2 @@
}
private E_UCFImportOptions UCFImportDefaultFromSettings;
private E_UCFImportOptions UCFImportCase = E_UCFImportOptions.LoadOnlyImported;
//private E_UCFImportOptions UCFImportDefaultFromSettings;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -1143,102 +1123,102 @@ namespace VEPROMS
// various cases listed above:
if (existingFormat.ContainsKey(name))
Owner

Is there any code that is executed inside this if statement?

If no, should if statement be removed?

Is there any code that is executed inside this if statement? If no, should if statement be removed?
Owner

still valid

still valid
Owner

Will address in later changes

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:
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -1205,3 +1185,2 @@
}
if (UCFImportCase == 0) // ignore it
{
//if (UCFImportCase == 0) // ignore it
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -1218,3 +1189,1 @@
{
existingFormat.Add(name, rec.FormatID); // change to original name?
importedFormat.Add(rec.FormatID, name);
//}
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -355,3 +341,1 @@
}
}
}
//if (_FolderConfig.MyFolder.FormatID != _cmbxformatOriginal)
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -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);
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -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);
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -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);
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -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);
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -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);
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -93,3 +78,1 @@
cbUCFLForSetOnly.Checked = true;
break;
}
//switch (Settings.Default.UCFImportOpt) // see dlgExportImport for descripton of these options.
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -194,3 +194,3 @@
private bool ss_SeparateWindows;
private string ss_VisioPath;
private int ss_UCFImportOpt;
//private int ss_UCFImportOpt;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -211,3 +211,3 @@
ss_SeparateWindows = Settings.Default.SeparateWindows;
ss_VisioPath = Settings.Default.VisioPath;
ss_UCFImportOpt = Settings.Default.UCFImportOpt;
//ss_UCFImportOpt = Settings.Default.UCFImportOpt;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -228,3 +228,3 @@
Settings.Default.SeparateWindows = ss_SeparateWindows;
Settings.Default.VisioPath = ss_VisioPath;
Settings.Default.UCFImportOpt = ss_UCFImportOpt;
//Settings.Default.UCFImportOpt = ss_UCFImportOpt;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -322,3 +318,1 @@
Settings.Default.UCFImportOpt = 0;
}
}
//private void cbUCFIgnore_CheckedChanged(object sender, EventArgs e)
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -221,3 +216,1 @@
get { return _CheckOffUCF; }
set { _CheckOffUCF = value; }
}
//private bool? _CheckOffUCF;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
Owner

still valid

still valid
mschill marked this conversation as resolved
@@ -289,3 +275,1 @@
HLSSetpnt = 0x0800, // Do ReplaceWords in HighLevelStep SETPoiNTs
Trans = 0x1000, // Do ReplaceWords in TRANSITIONS
Setpoint = 0x2000, // Do ReplaceWords in SETPOINTS
//[Flags]
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -328,3 +322,1 @@
get { return (E_ReplaceFlagsUCF)_Flag; }
set { _Flag = value; }
}
//private E_ReplaceFlags _Flag;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -342,3 +342,3 @@
}
private string _ReplaceWith;
[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
//[Editor(typeof(RtfEditor), typeof(System.Drawing.Design.UITypeEditor))]
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
Owner

still valid

still valid
mschill marked this conversation as resolved
@@ -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;
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -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.
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
Owner

still valid

still valid
mschill marked this conversation as resolved
@@ -6128,3 +6114,1 @@
}
return ActiveFormat.PlantFormat.FormatData.ProcData.CheckOffData.CheckOffList[stpCoIndx]; // DO override of CheckOffList[] to get ucf
}
//if (stpCoIndx > 1)
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
@@ -4464,3 +4462,1 @@
{
if (co.Index > 99) xloc_co += ((float)fc.PlantFormat.FormatData.CheckOffXOffAdj * 72);
}
//FormatConfig fc = PlantFormat.GetFormatConfig(formatInfo);
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
mschill marked this conversation as resolved
jjenko requested changes 2025-09-03 11:17:25 -04:00
Dismissed
jjenko left a comment
Owner

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

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 -
plarsen added 1 commit 2025-09-03 12:30:46 -04:00
mschill reviewed 2025-09-03 12:51:51 -04:00
@@ -329,2 +288,2 @@
set { _Flag = value; }
}
//[Editor(typeof(FlagEnumUIEditor), typeof(System.Drawing.Design.UITypeEditor))]
Owner

Commented out code - should this be removed or is there a reason it needs kept?

Commented out code - should this be removed or is there a reason it needs kept?
Owner

still valid

still valid
mschill marked this conversation as resolved
plarsen added 1 commit 2025-09-03 13:55:02 -04:00
plarsen added 1 commit 2025-09-03 15:51:35 -04:00
plarsen added 1 commit 2025-09-03 15:54:52 -04:00
jjenko approved these changes 2025-09-03 16:25:11 -04:00
jjenko left a comment
Owner

looks OK. no additional comments.

looks OK. no additional comments.
mschill merged commit c02ab116cd into Development 2025-09-04 06:55:26 -04:00
Member

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.

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.
Sign in to join this conversation.
No Reviewers
No Label
4 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Volian/SourceCode#606
No description provided.