Merged PR 15046: Buffered the current QBF position and used that buffered value to override th...

Buffered the current QBF position and used that buffered value to override the QBF Next function that is occuring at the system level. Removed unnessecary writing of the window title, and commented out code.

Related work items: #252917
This commit is contained in:
Ouellette Jonathan (CSC FI SPS MESLEO) 2025-04-15 01:38:09 +02:00
parent 781274c395
commit 8b0eb3e468
2 changed files with 6 additions and 24 deletions

View File

@ -2308,7 +2308,6 @@ RETURN
CIClick: CIClick:
* * * * * * * * * * * * * *
CurrCtrl = Parm1 CurrCtrl = Parm1
BEGIN CASE BEGIN CASE
@ -2379,10 +2378,12 @@ CIClick:
END END
IF CINo NE '' THEN IF CINo NE '' THEN
CurrQBFPos = Get_Property (@WINDOW, "QBFPOS"); // 4/14/2025 - JRO - CLEAR event below is advancing the QBF position. Buffer the current position before that happens
Send_Event(@WINDOW,'WRITE') Send_Event(@WINDOW,'WRITE')
Send_Event(@WINDOW,'CLEAR') ; // 12/22/2017 - DMB - Although WRITE normally clears the form, QBF mode will prevent the clear so do this explicitly so the lock is removed from the RDS record. Send_Event(@WINDOW,'CLEAR') ; // 12/22/2017 - DMB - Although WRITE normally clears the form, QBF mode will prevent the clear so do this explicitly so the lock is removed from the RDS record.
Set_Property (@WINDOW, "QBFPOS", CurrQBFPos); // - JRO - 4/14/2025 CLEAR event above is advancing the QBF position. apply the buffered position value
DetWindow = 'CLEAN_INSP' DetWindow = 'CLEAN_INSP'
DetKeys = CINo DetKeys = CINo
DefaultRec = '' DefaultRec = ''
@ -2951,3 +2952,4 @@ RefreshWaferCounterData:
return return

View File

@ -276,13 +276,6 @@ IF SkipSaveWarn THEN
Set_Property(@WINDOW,'@SKIP_SAVEWARN','') Set_Property(@WINDOW,'@SKIP_SAVEWARN','')
END END
*IF Get_Property( @window, 'SAVEWARN' ) THEN
* MsgInfo = ''
* MsgInfo<mtext$> = 'You must either save this first or clear the form.'
* MsgInfo<micon$> = '!'
* Void = msg( '', MsgInfo )
*END ELSE
RdsWindowToCall = Get_Property( @window, '@RdsWindowToCall' ) RdsWindowToCall = Get_Property( @window, '@RdsWindowToCall' )
QbfList = Get_Property( @window, 'QBFLIST' ) QbfList = Get_Property( @window, 'QBFLIST' )
@ -300,20 +293,6 @@ END
Void = Start_Window( RdsWindowToCall, Parent, QbfList:'*CENTER', '', '' ) Void = Start_Window( RdsWindowToCall, Parent, QbfList:'*CENTER', '', '' )
IF QbfPos THEN
Void = Set_Property( RdsWindowToCall, 'QBFPOS', QbfPos )
Void = Send_Event( RdsWindowToCall, 'READ' )
* The reason we have to fill in the title with the qbf stuff is
* when setting the qbfpos and then calling read it does not show
* N of N in the title - OI bug a boo
CurTitle = Get_Property( RdsWindowToCall, 'TEXT' )
CurTitle:= ' - <QBF Browse: ':QbfPos:' of ':fieldcount( QbfList, @vm ):'>'
Void = Set_Property( RdsWindowToCall, 'TEXT', CurTitle )
END
*END
RETURN RETURN
*============================================================================* *============================================================================*
@ -558,3 +537,4 @@ SET_ML_LIMITS:
return return
*===============================================================================================* *===============================================================================================*