Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'B2025-036-SplitScreen-Print-Error' (#587) from B2025-036-SplitScreen-Print-Error into Development

Browse Source 
ready for testing
This commit is contained in:
John Jenko
2025-08-06 11:37:03 -04:00
parent 3e7eb09758 ad0d091b49
commit 1bc421ac6d
2 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
PROMS/VEPROMS User Interface/frmVEPROMS.cs
View File

@@ -1486,9 +1486,11 @@ namespace VEPROMS
// and if they are not the same, use the CurrentItem from the main frmVEPROMS. // and if they are not the same, use the CurrentItem from the main frmVEPROMS.
ProcedureInfo piThis = null; ProcedureInfo piThis = null;
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure; if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
ProcedureInfo pi = args.Proc as ProcedureInfo; ProcedureInfo pi = args.Proc as ProcedureInfo;
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis; if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
{
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
}
// Check if Procedure Info is null // Check if Procedure Info is null
if (pi == null) return; if (pi == null) return;
@@ -1530,8 +1532,11 @@ namespace VEPROMS
if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure; if (_CurrentItem != null) piThis = _CurrentItem.MyProcedure;
ProcedureInfo pi = args.Proc as ProcedureInfo; ProcedureInfo pi = args.Proc as ProcedureInfo;
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
if (args.OringFlg == 1) // B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
{
if (piThis != null && pi.ItemID != piThis.ItemID) pi = piThis;
}
// Check if Procedure Info is null // Check if Procedure Info is null
if (pi == null) return; if (pi == null) return;

29
PROMS/Volian.Controls.Library/StepTabRibbon.cs
View File

@@ -618,6 +618,15 @@ namespace Volian.Controls.Library
} }
private int _MyLastFormatID = -1; private int _MyLastFormatID = -1;
private StepRTB _MyStepRTB; private StepRTB _MyStepRTB;
private static int _OringFlg;
public static int OringFlg
{
get { return _OringFlg; }
set
{
_OringFlg = value;
}
}
public StepRTB MyStepRTB public StepRTB MyStepRTB
{ {
get { return _MyStepRTB; } get { return _MyStepRTB; }
@@ -4143,16 +4152,22 @@ namespace Volian.Controls.Library
private void btnPdfCreate_Click(object sender, EventArgs e) private void btnPdfCreate_Click(object sender, EventArgs e)
{ {
// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
_OringFlg = 0;
DevComponents.DotNetBar.eEventSource oring = ((DevComponents.DotNetBar.Events.EventSourceArgs)e).Source;
if (oring == eEventSource.Keyboard)
_OringFlg = 1;
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return; if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents(); if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 0); OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 0);
} }
private void btnPdfQuickCreate_Click(object sender, EventArgs e) private void btnPdfQuickCreate_Click(object sender, EventArgs e)
{ {
if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return; if (MyItemInfo == null) return; // if creating a pdf before rtb exists, return;
if (MyEditItem != null) MyEditItem.SaveCurrentAndContents(); if (MyEditItem != null) MyEditItem.SaveCurrentAndContents();
OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure), 1); OnPrintRequest(new StepTabRibbonEventArgs(MyItemInfo.MyProcedure, _OringFlg), 1);
} }
private void btnCASCreate_Click(object sender, EventArgs e) private void btnCASCreate_Click(object sender, EventArgs e)
@@ -4814,9 +4829,10 @@ namespace Volian.Controls.Library
public class StepTabRibbonEventArgs : EventArgs public class StepTabRibbonEventArgs : EventArgs
{ {
public StepTabRibbonEventArgs() { ; } public StepTabRibbonEventArgs() { ; }
public StepTabRibbonEventArgs(ItemInfo proc) public StepTabRibbonEventArgs(ItemInfo proc, int oringFlg = 0)
{ {
_Proc = proc; _Proc = proc;
OringFlg = oringFlg;
} }
private ItemInfo _Proc; private ItemInfo _Proc;
@@ -4825,6 +4841,13 @@ namespace Volian.Controls.Library
get { return _Proc; } get { return _Proc; }
set { _Proc = value; } set { _Proc = value; }
} }
// B2025-036 split screen print issue. if oringFlg == 1 the ctrl-p keys was pressed.
private int _OringFlg;
public int OringFlg
{
get { return _OringFlg; }
set { _OringFlg = value; }
}
} }
public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args); public delegate void StepTabRibbonEvent(object sender, StepTabRibbonEventArgs args);