- Final fix for FOCUS problem
This commit is contained in:
8
hmdata.c
8
hmdata.c
@ -33,7 +33,6 @@ pHMdata makeHMData(void)
|
||||
}
|
||||
memset(self, 0, sizeof(HMdata));
|
||||
self->nTimeChan = 1;
|
||||
self->updateFlag = 1;
|
||||
|
||||
return self;
|
||||
}
|
||||
@ -84,7 +83,7 @@ int resizeBuffer(pHMdata self)
|
||||
return 0;
|
||||
}
|
||||
memset(self->localBuffer, 0, size * sizeof(HistInt));
|
||||
self->updateFlag = 1;
|
||||
self->nextUpdate = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -258,7 +257,7 @@ long getHMDataLength(pHMdata self)
|
||||
/*---------------------------------------------------------------------*/
|
||||
void updateHMData(pHMdata self)
|
||||
{
|
||||
self->updateFlag = 1;
|
||||
self->nextUpdate = 0;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------
|
||||
@ -274,7 +273,7 @@ void updateHMData(pHMdata self)
|
||||
--------------------------------------------------------------------------*/
|
||||
static int mustUpdate(pHMdata self)
|
||||
{
|
||||
if (self->updateFlag == 1 && time(NULL) >= self->nextUpdate) {
|
||||
if (time(NULL) >= self->nextUpdate) {
|
||||
return 1;
|
||||
} else {
|
||||
return 0;
|
||||
@ -300,7 +299,6 @@ static int updateHMbuffer(pHistMem hist, int bank, SConnection * pCon)
|
||||
self->localBuffer);
|
||||
if (status == OKOK) {
|
||||
self->nextUpdate = time(NULL) + self->updateIntervall;
|
||||
self->updateFlag = 0;
|
||||
break;
|
||||
} else {
|
||||
status = hist->pDriv->GetError(hist->pDriv, &iErr, pError, 79);
|
||||
|
1
hmdata.h
1
hmdata.h
@ -24,7 +24,6 @@ typedef struct __hmdata {
|
||||
int tofMode;
|
||||
time_t nextUpdate;
|
||||
int updateIntervall;
|
||||
int updateFlag;
|
||||
HistInt *localBuffer;
|
||||
struct __hmdata *timeslave;
|
||||
} HMdata, *pHMdata;
|
||||
|
@ -733,8 +733,6 @@ static void putHistogramMemory(SConnection * pCon, SicsInterp * pSics,
|
||||
*/
|
||||
start = 0;
|
||||
length = GetHistLength(mem);
|
||||
subset = 1;
|
||||
|
||||
updateHMDim(self, mem);
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user