diff options
Diffstat (limited to 'Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r')
-rw-r--r-- | Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r index c68ccc5e83e..673d457e780 100644 --- a/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r +++ b/Master/texmf-dist/scripts/ketcindy/ketlib/ketpiccurrent_reptikz.r @@ -16,8 +16,12 @@ ######################################### -ThisVersion<- "tikzv1_1_1(190402)" +ThisVersion<- "tikzv1_1_1(191126)" +# 20191126 +# Drwpt debugged/changed +# 20191104 +# Dotteline changed (Ookisa 2->1/0.075) # 2019.04.05 Drwpt ( Incolor, Takato) # 2019.04.02 Beginpicture ( Unitlen, Takato) # 2019.04.02 Drwline ( Sepen restore when finished, Takato) @@ -248,7 +252,7 @@ Dottedline<- function(...) varargin <- list(...) Nall <- length(varargin) Nagasa <- 0.1 - Ookisa <- PenThick*2 #17.10.07 + Ookisa <- PenThick*1/0.075 #2 #171007,191104(1/0.075) I <- Nall Tmp <- varargin[[I]] while (mode(Tmp)=="numeric" && length(Tmp)==1 ) { @@ -503,24 +507,23 @@ Drwpt<-function(...) #181230 P<- Doscaling(P) X=sprintf('%5.5f',P[1]) Y=sprintf('%5.5f',P[2]) - if(Same!="no"){ #190405from - Str=paste("{\\linethickness{0 in}",Incolor,sep="") - } - if(Same!="no"){ #190405from - Str=paste("{\\linethickness{0 in}%\n",sep="") - cat(Str,file=Wfile,append=TRUE) - if(Same=="n"){ #190405 - Str1<- paste("{\\color[rgb]",Incolor,"%\n",sep="") - cat(Str1,file=Wfile,append=TRUE) - } - Str=paste('\\put(',X,',',Y,'){\\circle*{',sprintf('%6.6f',Ra),'}}%\n',sep="") - cat(Str,file=Wfile,append=TRUE) - if(Same=="n"){ - cat("}%\n",file=Wfile,append=TRUE) + Str1<- paste("{\\color[rgb]",Incolor,"%\n",sep="") + cat(Str1,file=Wfile,append=TRUE) + Str=paste('\\fill (',X,',',Y,') circle [radius=',sprintf('%6.6f',Ra/2),'];%\n',sep="") + #191126 + cat(Str,file=Wfile,append=TRUE) + cat("}%\n",file=Wfile,append=TRUE) + Str=paste('\\draw [line width=','0.008','in]',sep="") + for(J in 0:24){ + Tmp1=sprintf('%6.6f',P[1]+Ra/2*cos(J*2*pi/24)) + Tmp2=sprintf('%6.6f',P[2]+Ra/2*sin(J*2*pi/24)) + Str=paste(Str,"(",Tmp1,",",Tmp2,")",sep=""); + if(J<24){ + Str=paste(Str,"--",sep="") + }else{ + Str=paste(Str,";%\n",sep="") } - cat("}%\n",file=Wfile,append=TRUE) } - Str=paste('\\put(',X,',',Y,'){\\circle{',sprintf('%6.6f',Ra),'}}%\n',sep="") cat(Str,file=Wfile,append=TRUE) } } # 190405to |