- Major changes folling the rework of the connection object
- Added support for galil controllers
This commit is contained in:
22
nextrics.c
22
nextrics.c
@@ -486,7 +486,7 @@ name of hkl object holding crystallographic information
|
||||
|
||||
/* close and done */
|
||||
sprintf(pBueffel,"Frame %d succesfully written",iFrameNum-1);
|
||||
SCWrite(pCon,pBueffel,eStatus);
|
||||
SCWrite(pCon,pBueffel,eLog);
|
||||
|
||||
return 1;
|
||||
}
|
||||
@@ -1339,24 +1339,28 @@ name of hkl object holding crystallographic information
|
||||
return iRet;
|
||||
}
|
||||
/*-------------------------------------------------------------------------*/
|
||||
static int FrameInterest(int iEvent, void *pEvent, void *pUser, commandContext cc)
|
||||
static int FrameInterest(int iEvent, void *pEvent, void *pUser)
|
||||
{
|
||||
SConnection *pCon = NULL;
|
||||
int *iFrame;
|
||||
char pBueffel[512];
|
||||
pCon = (SConnection *)pUser;
|
||||
|
||||
if(iEvent != NEWFRAME)
|
||||
/* kill condition check */
|
||||
if(pCon == NULL || !SCisConnected(pCon))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
if(iEvent != NEWFRAME )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
pCon = (SConnection *)pUser;
|
||||
iFrame = (int *)pEvent;
|
||||
assert(pCon);
|
||||
sprintf(pBueffel,"framenumber = %d",*iFrame);
|
||||
SCPushContext2(pCon,cc);
|
||||
SCWrite(pCon,pBueffel,eWarning);
|
||||
SCPopContext(pCon);
|
||||
return 1;
|
||||
}
|
||||
/*-------------------------------------------------------------------------
|
||||
@@ -1509,9 +1513,9 @@ name of hkl object holding crystallographic information
|
||||
}
|
||||
else if(strcmp(argv[1],"interest") == 0)
|
||||
{
|
||||
lID = RegisterCallback(self->pCall, comCon, NEWFRAME, FrameInterest,
|
||||
pCon, NULL);
|
||||
SCRegister(pCon,pSics, self->pCall,lID);
|
||||
lID = RegisterCallback(self->pCall, NEWFRAME, FrameInterest,
|
||||
SCCopyConnection(pCon),
|
||||
SCDeleteConnection);
|
||||
SCSendOK(pCon);
|
||||
return 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user