ALT Linux repos
Group :: Sciences/Chemistry
RPM: RasMol
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: RasMol-2.7.3-distfix.patch
Download
Download
*** abstree.c Mon Apr 25 08:31:12 2005
--- abstree.c Fri Apr 21 11:46:57 2006
***************
*** 1289,1303 ****
double CalcDistance( RAtom __far *atm1, RAtom __far *atm2 )
{
! register Long dx,dy,dz;
register double dist2;
! dx = atm1->xorg - atm2->xorg + atm1->fxorg - atm2->fxorg;
! dy = atm1->yorg - atm2->yorg + atm1->fyorg - atm2->fyorg;
! dz = atm1->zorg - atm2->zorg + atm1->fzorg - atm2->fzorg;
! if( dx || dy || dz )
{ dist2 = dx*dx + dy*dy + dz*dz;
! return( sqrt(dist2)/250.0 );
} else return 0.0;
}
--- 1289,1303 ----
double CalcDistance( RAtom __far *atm1, RAtom __far *atm2 )
{
! register double dx,dy,dz;
register double dist2;
! dx = (double)(atm1->xorg - atm2->xorg + atm1->fxorg - atm2->fxorg);
! dy = (double)(atm1->yorg - atm2->yorg + atm1->fyorg - atm2->fyorg);
! dz = (double)(atm1->zorg - atm2->zorg + atm1->fzorg - atm2->fzorg);
! if( dx != 0.0 || dy != 0.0 || dz != 0.0 )
{ dist2 = dx*dx + dy*dy + dz*dz;
! return( sqrt(dist2/62500.) );
} else return 0.0;
}
*** render.c Mon Apr 25 08:31:12 2005
--- render.c Fri Apr 21 12:13:21 2006
***************
*** 1919,1924 ****
--- 1919,1930 ----
for( i=0; str[i] && i<12; i++ )
if( str[i]!=' ' )
WriteChar(str[i]);
+
+ if (ptr->atm->model)
+ {
+ sprintf(buffer,"/%d",ptr->atm->model);
+ WriteString(buffer);
+ }
if( flag )
{ sprintf(buffer," (%ld)",ptr->atm->serno);
***************
*** 2182,2188 ****
/* [GSG 11/21/95] */
AddMonitors2(PickHist[0].atm, PickHist[2].atm,
PickHist[1].atm, (RAtom __far *)NULL,
! (short) (rint(temp*100)), 128, PickAngle);
ReDrawFlag |= RFRefresh;
--- 2188,2194 ----
/* [GSG 11/21/95] */
AddMonitors2(PickHist[0].atm, PickHist[2].atm,
PickHist[1].atm, (RAtom __far *)NULL,
! (Long) (rint(temp*100)), 128, PickAngle);
ReDrawFlag |= RFRefresh;
***************
*** 2207,2213 ****
/* [GSG 11/21/95] */
AddMonitors2(PickHist[0].atm, PickHist[3].atm,
PickHist[1].atm, PickHist[2].atm,
! (short) (rint(temp*100)), 128, PickTorsn);
ReDrawFlag |= RFRefresh;
}
}
--- 2213,2219 ----
/* [GSG 11/21/95] */
AddMonitors2(PickHist[0].atm, PickHist[3].atm,
PickHist[1].atm, PickHist[2].atm,
! (Long) (rint(temp*100)), 128, PickTorsn);
ReDrawFlag |= RFRefresh;
}
}
*** repres.c Mon Apr 25 08:31:12 2005
--- repres.c Fri Apr 21 11:56:01 2006
***************
*** 523,529 ****
/* [GSG 11/21/95] AddMonitors2 can add a monitor w/a given number */
void AddMonitors2( RAtom __far *src, RAtom __far *dst,
RAtom __far *mid1, RAtom __far *mid2,
! short dist, unsigned char units, int monmode )
{
register Monitor **prev;
register Monitor *ptr;
--- 523,529 ----
/* [GSG 11/21/95] AddMonitors2 can add a monitor w/a given number */
void AddMonitors2( RAtom __far *src, RAtom __far *dst,
RAtom __far *mid1, RAtom __far *mid2,
! Long dist, unsigned char units, int monmode )
{
register Monitor **prev;
register Monitor *ptr;
***************
*** 567,583 ****
void AddMonitors( RAtom __far *src, RAtom __far *dst )
{
! register Long dx, dy, dz;
! register Long dist;
! short temp;
!
! dx = src->xorg - dst->xorg + src->fxorg - dst->fxorg;
! dy = src->yorg - dst->yorg + src->fyorg - dst->fyorg;
! dz = src->zorg - dst->zorg + src->fzorg - dst->fzorg;
!
! /* ptr->dist = 100.0*CalcDistance(src,dst) */
! dist = isqrt( dx*dx + dy*dy + dz*dz );
! temp = rint(100.0*CalcDistance(src,dst));
AddMonitors2(src, dst,
(RAtom __far *)NULL, (RAtom __far *)NULL, temp, 127, PickDist);
--- 567,575 ----
void AddMonitors( RAtom __far *src, RAtom __far *dst )
{
! Long temp;
!
! temp = (Long)rint(100.0*CalcDistance(src,dst));
AddMonitors2(src, dst,
(RAtom __far *)NULL, (RAtom __far *)NULL, temp, 127, PickDist);
*** repres.h Mon Apr 25 08:31:12 2005
--- repres.h Fri Apr 21 14:27:12 2006
***************
*** 99,105 ****
RAtom __far *mid2;
RAtom __far *dst;
int monmode;
! int dist;
short col;
unsigned char units;
} Monitor;
--- 99,105 ----
RAtom __far *mid2;
RAtom __far *dst;
int monmode;
! Long dist;
short col;
unsigned char units;
} Monitor;
***************
*** 162,168 ****
void DeleteMonitors( void );
void AddMonitors2( RAtom __far*, RAtom __far*,
RAtom __far*, RAtom __far*,
! short, unsigned char, int );
void AddMonitors( RAtom __far*, RAtom __far* );
void CreateMonitor( Long, Long );
void DisplayMonitors( void );
--- 162,168 ----
void DeleteMonitors( void );
void AddMonitors2( RAtom __far*, RAtom __far*,
RAtom __far*, RAtom __far*,
! Long, unsigned char, int );
void AddMonitors( RAtom __far*, RAtom __far* );
void CreateMonitor( Long, Long );
void DisplayMonitors( void );