Hello,
I've been using CVS to do revision control on my own software.
Today I got a very nasty surprise when I found what appeared to be CVS
revision tags inside my file. I just use cvs commit, import
update and checkout, but I've never seen anything like this. Can anyone
help me out here, is my codebase about to go AWOL?
(Note: The language is Interactive Data Language, a completely useless
propietary language which serves no purpose in this discussion.)
<<<<<<< ra_coronalroigetmask.pro
FUNCTION ra_coronalroiGetMask, widgetData, roiID, EXISTS=exists,
ZOOM=scale, ONLY_INDS=only_inds, INDS=inds
verts = rt_roichooserGetVerts(widgetData.ROIchooser, roiID, ZOOM=scale)
=======
;L+
;L-
;+
; This returns a mask of the ROI. 1 indicates the point is inside the
; ROI.
;-
FUNCTION ra_coronalroiGetMask, widgetData, roiID, EXISTS=exists
verts = rt_roichooserGetVerts(widgetData.ROIchooser, roiID)
>>>>>>> 1.4
if (verts[0] eq -1) then begin
exists = 0
return, -1
endif
verticies = transpose(verts)
size = SIZE(widgetData.dynamicImage)
verticiesSize = SIZE(verticies)
curve = FLTARR(size[3])
inds = -1
IF (verticiesSize[0] GE 2) then begin
exists = 1
help, scale
if (n_elements(scale) eq 0) then scale = 1 ;
;scale = 1 ;
; Must use round rather than floor
if (~ keyword_set(only_inds)) then smask = fltarr(size[1]*scale,
size[2]*scale)
;xv = ((round(verticies[0,*]) + 0.5) *
scale); 0.5 for when we are using /sample
;yv = ((round(verticies[1,*]) + 0.5) *
scale)
xv = verticies[0,*] * scale
yv = verticies[1,*] * scale
inds = polyfillv(xv,yv,size[1]*scale, size[2]*scale)
if (~ keyword_set(only_inds)) then smask[inds] = 1
;smask = rebin(smask,size[1], size[2])
endif else begin
if (~ keyword_set(only_inds)) then smask = fltarr(size[1], size[2])
exists = 0
endelse
if (keyword_set(only_inds)) then return, inds $
else return, smask
end
Robbie Barnett
P.S. I've been following up my last post about the problem of [EMAIL PROTECTED]
Whilst this may not affect students, I think that they have very strict IT
policies regarding staff computers. They dictate everything which must be
used right down to the laptop hardware and keyboard. This seems to
indicate that staff research interests are pretty much secondary to IT
policy. I thank you all for your repsonses and I've passed them on to the
employee concerned.
--
SLUG - Sydney Linux User's Group Mailing List - http://slug.org.au/
Subscription info and FAQs: http://slug.org.au/faq/mailinglists.html
