• R/O
  • HTTP
  • SSH
  • HTTPS

KODS: Commit

KODS source codes.


Commit MetaInfo

Revision73eceb904edf0712c2f66042d7b177cccd76babe (tree)
Time2018-01-31 07:58:48
AuthorENDO Michiaki <dinosaur@db3....>
CommiterENDO Michiaki

Log Message

Modified text on graph.

Change Summary

Incremental Difference

--- a/HARDWAR1.FOR
+++ b/HARDWAR1.FOR
@@ -1772,32 +1772,32 @@ C NOW WRITE THE ARRAY VALUES
17721772 NEUTTOTAL=NEUTTOTAL+1
17731773
17741774 WRITE(NEUTLINE,5000) C1A
1775- call gnuplotlabel(I1,I2,C1A,I3)
1775+
17761776 IF(NEUTTOTAL+1.GE.MAXNEUTRAL/2)
17771777 1CALL RESIZE_NEUT
17781778 NEUTARRAY(NEUTTOTAL+1)=NEUTLINE
17791779 NEUTTOTAL=NEUTTOTAL+1
17801780
17811781 WRITE(NEUTLINE,5000) C1B
1782- call gnuplotlabel(I1+1300,I2,C1B,I3)
17831782 IF(NEUTTOTAL+1.GE.MAXNEUTRAL/2)
17841783 1CALL RESIZE_NEUT
17851784 NEUTARRAY(NEUTTOTAL+1)=NEUTLINE
17861785 NEUTTOTAL=NEUTTOTAL+1
17871786
17881787 WRITE(NEUTLINE,5000) C1C
1789- call gnuplotlabel(I1+2600,I2,C1C,I3)
17901788 IF(NEUTTOTAL+1.GE.MAXNEUTRAL/2)
17911789 1CALL RESIZE_NEUT
17921790 NEUTARRAY(NEUTTOTAL+1)=NEUTLINE
17931791 NEUTTOTAL=NEUTTOTAL+1
17941792
17951793 WRITE(NEUTLINE,5000) C1D
1796- call gnuplotlabel(I1+3900,I2,C1D,I3)
1794+
17971795 IF(NEUTTOTAL+1.GE.MAXNEUTRAL/2)
17981796 1CALL RESIZE_NEUT
17991797 NEUTARRAY(NEUTTOTAL+1)=NEUTLINE
18001798
1799+ call gnuplotlabel(I1,I2,C1A//C1B//C1C//C1D,I3,I4)
1800+
18011801 5000 FORMAT(A20,22X)
18021802 RETURN
18031803 END
--- a/HARDWAR2.FOR
+++ b/HARDWAR2.FOR
@@ -205,7 +205,7 @@ C CALL BY HARDCOPY GRAPHICS ROUTINE
205205 ! COMMON/TOTALNEUT/NEUTTOTAL
206206 ! COMMON/PENPEN2/PENPOSX,PENPOSY
207207 INCLUDE 'DATMAI.INC'
208- character STRINGER*1,GRFILN*12
208+ character GRFILN*12
209209 integer JK_TAG
210210 C INITIALIZE CHARACTER ASPECT RATIO
211211 ! JJ_X=1.0
@@ -1150,16 +1150,13 @@ C PLOTTING A STRING
11501150 J=J+1
11511151 4000 FORMAT(A20,22X)
11521152 READ(NEUTARRAY(J),4000) C1A
1153-! call gnuplotlabel(I1,I2,C1A,I3)
11541153 J=J+1
11551154 READ(NEUTARRAY(J),4000) C1B
1156-! call gnuplotlabel(I1+1250,I2,C1B,I3)
11571155 J=J+1
11581156 READ(NEUTARRAY(J),4000) C1C
1159-! call gnuplotlabel(I1+2500,I2,C1C,I3)
11601157 J=J+1
11611158 READ(NEUTARRAY(J),4000) C1D
1162-! call gnuplotlabel(I1+3750,I2,C1D,I3)
1159+
11631160 AB=' '
11641161 C1=AB//AB//AB//AB
11651162 IF(II6.LE.20) THEN
@@ -1379,7 +1376,8 @@ C
13791376 CON_ARRAY(II,JJ)=I1
13801377 END DO
13811378 END DO
1382- CALL DrawContour_APD(NX,NY,ZSTEP,CON_ARRAY)
1379+ CALL DrawContour_APD(NX,NY,CON_ARRAY)
1380+! CALL DrawContour_APD(NX,NY,ZSTEP,CON_ARRAY)
13831381 DEALLOCATE(CON_ARRAY,STAT=ALLOERR)
13841382 GO TO 300
13851383 END IF
@@ -1422,7 +1420,7 @@ c
14221420
14231421 INTEGER ICC,NX,NY,CON_ARRAY,ZSTEP,NZSTEP,ALLOERR
14241422 REAL ZCONT,RSTEP,STEP_VAL,OPDPIT,OPDPEAK
1425- CHARACTER*13 KEYSTR
1423+ CHARACTER KEYSTR*80
14261424 CHARACTER*8 ASTEP_VAL,B
14271425 DIMENSION ZCONT(:),KEYSTR(:)
14281426 ALLOCATABLE :: ZCONT,KEYSTR
@@ -1488,6 +1486,11 @@ C
14881486 STEP_VAL=STEP_VAL+RSTEP
14891487 ! CALL IPgStyle(IC,MOD(IC,7),6,IC,ICC*16,ICC*16)
14901488 ! CALL IPgContourLabel(IC,CHAR(64+IC))
1489+
1490+ call contlabel(26.0,real(10.0+IC),KEYSTR(IC))
1491+
1492+ call drawcmdsave2
1493+
14911494 END DO
14921495 c
14931496 c generate contour plot
@@ -1499,13 +1502,14 @@ c
14991502 ! CALL IPgKeyAll(KEYSTR,'B')
15001503
15011504 call system('/usr/bin/gnuplot '//trim
1502- 1 (HOME)//'plotdata/plotcont.txt')
1505+ 1 (HOME)//'drawcmd.txt')
15031506
15041507 RETURN
15051508 END SUBROUTINE DrawContour_OPD
15061509
15071510
1508- SUBROUTINE DrawContour_APD(NX,NY,NZSTEP,CON_ARRAY)
1511+ SUBROUTINE DrawContour_APD(NX,NY,CON_ARRAY)
1512+! SUBROUTINE DrawContour_APD(NX,NY,NZSTEP,CON_ARRAY)
15091513 c
15101514 c Draw 2D APD CONTOUR CONTOUR
15111515 c
@@ -1515,9 +1519,10 @@ c
15151519
15161520 include 'DATMAI.INC'
15171521
1518- INTEGER ICC,NX,NY,CON_ARRAY,ZSTEP,NZSTEP,ALLOERR
1522+ INTEGER ICC,NX,NY,CON_ARRAY,ZSTEP,ALLOERR
1523+! INTEGER ICC,NX,NY,CON_ARRAY,ZSTEP,NZSTEP,ALLOERR
15191524 REAL ZCONT
1520- CHARACTER*7 KEYSTR
1525+ CHARACTER*7 KEYSTR*80
15211526 DIMENSION ZCONT(:),KEYSTR(:)
15221527 ALLOCATABLE :: ZCONT,KEYSTR
15231528 DIMENSION CON_ARRAY(1:NX,1:NY)
@@ -1570,6 +1575,10 @@ c 1(ICC*16).GE.208.AND.(ICC*16).LE.223) ICC=ICC+1
15701575 WRITE(KEYSTR(IC),100) REAL(IC-1)/10.0
15711576 100 FORMAT('I = ',F3.1)
15721577 ! CALL IPgStyle(IC,MOD(IC,7),6,IC,ICC*16,ICC*16)
1578+
1579+ call contlabel(26.0,real(9.0+IC),KEYSTR(IC))
1580+ call drawcmdsave2
1581+
15731582 END DO
15741583 ! CALL IPgContourLabel(1,'0')
15751584 ! CALL IPgContourLabel(2,'.1')
@@ -1592,7 +1601,7 @@ c
15921601 ! CALL IPgKeyAll(KEYSTR,'B')
15931602
15941603 call system('/usr/bin/gnuplot '//trim
1595- 1 (HOME)//'plotdata/plotcont.txt')
1604+ 1 (HOME)//'drawcmd.txt')
15961605
15971606 RETURN
15981607 END SUBROUTINE DrawContour_APD
--- a/PLOTCAD11.FOR
+++ b/PLOTCAD11.FOR
@@ -617,18 +617,18 @@ C AT X=200, Y=500
617617 C LI BLANK, NOT ACTION
618618 END IF
619619 IF(IJ.EQ.1) THEN
620- IF(ROT.EQ.0) CALL MY_JUSTSTRING(200,300,
620+ IF(ROT.EQ.0) CALL MY_JUSTSTRING(5200,300,
621621 1'Complex Aperture Function Wavefront Phase',
622622 1 0,2,3)
623- IF(ROT.EQ.90) CALL MY_JUSTSTRING(200,300,
623+ IF(ROT.EQ.90) CALL MY_JUSTSTRING(5200,300,
624624 1'Complex Aperture Function Wavefront Phase-ROTATED',
625625 1 0,2,3)
626626 END IF
627627 IF(IJ.EQ.2) THEN
628- IF(ROT.EQ.0) CALL MY_JUSTSTRING(200,300,
628+ IF(ROT.EQ.0) CALL MY_JUSTSTRING(5200,300,
629629 1'Complex Aperture Function Wavefront Intensity',
630630 1 0,2,3)
631- IF(ROT.EQ.90) CALL MY_JUSTSTRING(200,300,
631+ IF(ROT.EQ.90) CALL MY_JUSTSTRING(5200,300,
632632 1'Complex Aperture Function Wavefront Intensity-ROTATED',
633633 1 0,2,3)
634634 END IF
--- a/PLOTCAD4.FOR
+++ b/PLOTCAD4.FOR
@@ -187,13 +187,13 @@ C
187187 IF(PLV.EQ.1) THEN
188188 INPUT='PNOTE FOCAL SHIFT VERSUS WAVELENGTH, YZ-PLANE'
189189 CALL PROCES
190- INPUT='PLOT NOTE 2750 400'
190+ INPUT='PLOT NOTE 5000 400'
191191 CALL PROCES
192192 END IF
193193 IF(PLV.EQ.2) THEN
194194 INPUT='PNOTE FOCAL SHIFT VERSUS WAVELENGTH, XZ-PLANE'
195195 CALL PROCES
196- INPUT='PLOT NOTE 2750 400'
196+ INPUT='PLOT NOTE 5000 400'
197197 CALL PROCES
198198 END IF
199199 INPUT='PLOT LSTYLE 0'
@@ -212,11 +212,11 @@ C
212212 CALL PROCES
213213 INPUT='PNOTE MARGINAL RAY AXIAL FOCUS SHIFT'
214214 CALL PROCES
215- INPUT='PLOT NOTE 3200 6500'
215+ INPUT='PLOT NOTE 5300 6400'
216216 CALL PROCES
217217 INPUT='PNOTE CHIEF RAY LATERAL SHIFT'
218218 CALL PROCES
219- INPUT='PLOT NOTE 3200 6000'
219+ INPUT='PLOT NOTE 4800 5900'
220220 CALL PROCES
221221 INPUT='PLOT LSTYLE 2'
222222 CALL PROCES
@@ -2032,18 +2032,18 @@ C AT X=200, Y=500
20322032 C LI BLANK, NOT ACTION
20332033 END IF
20342034 IF(IJ.EQ.1) THEN
2035- IF(ROT.EQ.0) CALL MY_JUSTSTRING(200,300,
2035+ IF(ROT.EQ.0) CALL MY_JUSTSTRING(5200,300,
20362036 1'Complex Aperture Function Wavefront Phase',
20372037 1 0,2,3)
2038- IF(ROT.EQ.90) CALL MY_JUSTSTRING(200,300,
2038+ IF(ROT.EQ.90) CALL MY_JUSTSTRING(5200,300,
20392039 1'Complex Aperture Function Wavefront Phase-ROTATED',
20402040 1 0,2,3)
20412041 END IF
20422042 IF(IJ.EQ.2) THEN
2043- IF(ROT.EQ.0) CALL MY_JUSTSTRING(200,300,
2043+ IF(ROT.EQ.0) CALL MY_JUSTSTRING(5200,300,
20442044 1'Complex Aperture Function Wavefront Intensity',
20452045 1 0,2,3)
2046- IF(ROT.EQ.90) CALL MY_JUSTSTRING(200,300,
2046+ IF(ROT.EQ.90) CALL MY_JUSTSTRING(5200,300,
20472047 1'Complex Aperture Function Wavefront Intensity-ROTATED',
20482048 1 0,2,3)
20492049 END IF
@@ -2680,7 +2680,7 @@ C SPOT DIAGRAM HEADING
26802680 CALL MY_JUSTSTRING(3150,5600,'SUMMED SPOT DIAGRAM'
26812681 1,0,2,3)
26822682 ELSE
2683- CALL MY_JUSTSTRING(3900,5600,'SPOT DIAGRAM'
2683+ CALL MY_JUSTSTRING(5000,5600,'SPOT DIAGRAM'
26842684 1,0,2,3)
26852685 END IF
26862686 C
@@ -5611,8 +5611,8 @@ C GENERATE GRAPHIC
56115611 INPUT='PLOT LI'
56125612 CALL PROCES
56135613 REST_KDP(1)=RESTINPT(1)
5614- CALL MY_PLOT(5400,1500,0,0,0,10000,0,7000)
5615- CALL MY_PLOT(5400,2000,1,0,0,10000,0,7000)
5614+ CALL MY_PLOT(5400,1500,1,0,0,10000,0,7000)
5615+ CALL MY_PLOT(5400,2000,0,0,0,10000,0,7000)
56165616 CALL MY_PLOT(5400,1500,0,0,0,10000,0,7000)
56175617 CALL MY_PLOT(5900,1500,1,0,0,10000,0,7000)
56185618 CALL MY_JUSTSTRING(5285,2040,'+Y',0,1,3)
--- a/PLOTCAD5.FOR
+++ b/PLOTCAD5.FOR
@@ -113,7 +113,7 @@ C PRINT OUT THE CURRENT PLOT NOTE
113113 ELSE
114114 C EXPLICT INPUT EXISTS, PLOT IT
115115 END IF
116- NNTT(1:80)=PLOTNOTE(1:80)
116+ NNTT=PLOTNOTE(1:80)
117117 C DO THE PLOTTING OF THE LENS NOTE AT THE CURRENT
118118 C PLOT POSITION
119119 IB=1
@@ -129,8 +129,7 @@ C PLOT POSITION
129129 IIX=INT(W1)
130130 IIY=INT(W2)
131131 IF(.NOT.PLEXIS) PLEXIS=.TRUE.
132-! CALL MY_JUSTSTRING(IIX,IIY,NNTT(1:IB),NTANG,NTSIZ,3)
133- call gnuplotlabel(IIX,IIY,NNTT(1:IB),NTANG)
132+ CALL MY_JUSTSTRING(IIX,IIY,NNTT(1:IB),NTANG,NTSIZ,3)
134133 C
135134 RETURN
136135 END
@@ -5033,6 +5032,7 @@ C DON'T DO THE PLOTTING OF THE WAVELENGTH #4 LEGEND
50335032 IF(FAN3.NE.0) THEN
50345033 C DO THE PLOTTING OF THE LEGEND FOR WAVELENGTH 3
50355034 C DRAW THE WV3 LINE
5035+! Magenta legend line at bottom left
50365036 COLPAS=COLR3
50375037 CALL MY_COLTYP(COLPAS)
50385038 CALL MY_PLOT(100,810,0,2,-10,10010,-10,7010)
@@ -5059,6 +5059,7 @@ C DRAW THE WV3 LINE
50595059 END IF
50605060 CALL MY_SETCHARASPECT(1.5,1.5)
50615061 CALL MY_SETFONT(2,0)
5062+! "Label 'm' = micron
50625063 NNTT2='m'
50635064 COLPAS=COLLBL
50645065 CALL MY_COLTYP(COLPAS)
@@ -5071,6 +5072,7 @@ C DON'T DO THE PLOTTING OF THE WAVELENGTH #3 LEGEND
50715072 IF(FAN2.NE.0) THEN
50725073 C DO THE PLOTTING OF THE LEGEND FOR WAVELENGTH 2
50735074 C DRAW THE WV2 LINE
5075+! Yellow legend line at bottom left
50745076 COLPAS=COLR2
50755077 CALL MY_COLTYP(COLPAS)
50765078 CALL MY_PLOT(100,1010,0,1,-10,10010,-10,7010)
@@ -5097,6 +5099,7 @@ C DRAW THE WV2 LINE
50975099 END IF
50985100 CALL MY_SETCHARASPECT(1.5,1.5)
50995101 CALL MY_SETFONT(2,0)
5102+! "Label 'm' = micron
51005103 NNTT2='m'
51015104 COLPAS=COLLBL
51025105 CALL MY_COLTYP(COLPAS)
@@ -5109,6 +5112,7 @@ C DON'T DO THE PLOTTING OF THE WAVELENGTH #2 LEGEND
51095112 IF(FAN1.NE.0) THEN
51105113 C DO THE PLOTTING OF THE LEGEND FOR WAVELENGTH 1
51115114 C DRAW THE WV1 LINE
5115+! Black legend line at bottom left
51125116 COLPAS=COLR1
51135117 CALL MY_COLTYP(COLPAS)
51145118 CALL MY_PLOT(100,1210,0,0,-10,10010,-10,7010)
@@ -5135,6 +5139,7 @@ C DRAW THE WV1 LINE
51355139 END IF
51365140 CALL MY_SETCHARASPECT(1.5,1.5)
51375141 CALL MY_SETFONT(2,0)
5142+! "Label 'm' = micron
51385143 NNTT2='m'
51395144 COLPAS=COLLBL
51405145 CALL MY_COLTYP(COLPAS)
--- a/PLOTCAD8.FOR
+++ b/PLOTCAD8.FOR
@@ -3857,7 +3857,7 @@ C FOCAL OR UFOCAL
38573857 END IF
38583858 IF(QALTYP.EQ.1)
38593859 1UNN='WAVE(S)'
3860-C scale bar
3860+! scale bar
38613861 COLPAS=COLFRM
38623862 CALL MY_COLTYP(COLPAS)
38633863 CALL MY_PLOT(100,1683,0,0,-10,10010,-10,10010)
@@ -3879,11 +3879,9 @@ C DO THE PLOTTING OF THE SCALE BAR AND ITS CAPTION
38793879 COLPAS=COLLBL
38803880 CALL MY_COLTYP(COLPAS)
38813881 CALL MY_JUSTSTRING(1100,1673,NNTT1,0,1,3)
3882- call gnuplotlabel(1100,1673,NNTT1,0)
38833882 NNTT1='VERTICAL ABERRATION SCALE BAR'
38843883 CALL MY_SETCHARASPECT(1.5,1.5)
38853884 CALL MY_JUSTSTRING(100,1500,NNTT1,0,1,3)
3886- call gnuplotlabel(100,1500,NNTT1,0)
38873885
38883886 C
38893887 C NOW THE DERIVATIVES ARE SCALED CORRECTLY TO PLOTTER UNITS
--- a/WAVSPOT6.FOR
+++ b/WAVSPOT6.FOR
@@ -283,14 +283,14 @@ C AT X=200, Y=500
283283 C LI BLANK, NOT ACTION
284284 END IF
285285 IF(PSFLIN.EQ.1) THEN
286- IF(ROT.EQ.0) CALL MY_JUSTSTRING(200,300,
286+ IF(ROT.EQ.0) CALL MY_JUSTSTRING(5000,300,
287287 1'Diffraction PSF (Intensity)',0,2,3)
288- IF(ROT.EQ.90) CALL MY_JUSTSTRING(200,300,
288+ IF(ROT.EQ.90) CALL MY_JUSTSTRING(5000,300,
289289 1'Diffraction PSF (Intensity)-ROTATED',0,2,3)
290290 ELSE
291- IF(ROT.EQ.0) CALL MY_JUSTSTRING(200,300,
291+ IF(ROT.EQ.0) CALL MY_JUSTSTRING(5000,300,
292292 1'Diffraction PSF (Log10 Intensity)',0,2,3)
293- IF(ROT.EQ.90) CALL MY_JUSTSTRING(200,300,
293+ IF(ROT.EQ.90) CALL MY_JUSTSTRING(5000,300,
294294 1'Diffraction PSF (Log10 Intensity)-ROTATED',0,2,3)
295295 END IF
296296 C
--- /dev/null
+++ b/git/KODS_Other_Files
@@ -0,0 +1 @@
1+Subproject commit f6295332c831c42974fe9aae5f4b77675e38a594
--- a/kods.for
+++ b/kods.for
@@ -127,48 +127,56 @@
127127 end
128128
129129
130- subroutine drawdatasave3(I1,I2,I3)
130+ subroutine gnuplotlabel(I1,I2,label,I3,I4)
131131
132132 implicit none
133- integer I1,I2,I3
134-
135- if (I1.LT.0.OR.I2.LT.0.OR.I1.GT.10000.OR.I2.GT.7000) then
136- return
137- end if
138-
139- if (I3.eq.1) then
140- write(116,'(2I5)') I1,I2
133+ integer I1,I2,I3,I4
134+ real X,Y
135+ character label*80
136+
137+ X=real(I1)/10500.0+0.02
138+ Y=real(I2)/7350.0+0.03
139+
140+ if ((I4.eq.2).and.(I3.eq.90)) then
141+ write(150,'(A,F6.3,A1,F6.3,A2,A,A)') 'set label font "Courier,12"
142+ 1center at screen ',real(I1)/10000.0,",",real(I2/7000.0)+0.01,
143+ 2' "',trim(label),'" rotate by 90'
144+ goto 10
145+
146+ else if (I4.eq.2) then
147+ write(150,'(A,F6.3,A1,F6.3,A2,A,A)') 'set label font "Courier,12"
148+ 1center at screen ',real(I1)/10000.0,",",real(I2/7000.0)+0.01,
149+ 2' "',trim(label),'"'
150+ goto 10
151+
141152 else
142- write(116,*)
143- write(116,'(2I5)') I1,I2
153+ write(150,'(A,F6.3,A1,F6.3,A2,A,A)') 'set label at screen '
154+ 1,X,",",Y,' "',trim(label),'"'
155+
144156 end if
145157
146- return
158+ 10 return
147159 end
148160
149- subroutine gnuplotlabel(I1,I2,label,I3)
161+
162+ subroutine contlabel(X0,Y0,label)
150163
151164 implicit none
152- integer I1,I2,I3
153- real X,Y
154- character label*20
155165
156- X=real(I1)/10000.0
157- Y=real(I2)/7000.0
166+ real X0,Y0,X,Y
167+ character label*80
158168
159- if (I3.eq.90) then
160- write(150,'(A19,F6.4,A1,F6.4,A2,A,A)') 'set label at graph ',
161- 1X,",",Y,' "',label,'" rotate by 90'
162- else
163- write(150,'(A19,F6.4,A1,F6.4,A2,A,A)') 'set label at graph ',
164- 1X,",",Y,' "',label,'"'
165- end if
169+ X=real(300.0/10000.0*X0)
170+ Y=real(210.0/7000.0*Y0)
166171
172+ write(150,'(A,F6.3,A1,F6.3,A2,A,A)') 'set label at screen ',
173+ 1X,",",Y,' "',label,'"'
167174
168175 return
169176 end
170177
171178
179+
172180 subroutine drawcmdsave
173181
174182 include 'DATMAI.INC'
@@ -183,6 +191,20 @@
183191 end
184192
185193
194+ subroutine drawcmdsave2
195+
196+ include 'DATMAI.INC'
197+ character*150 catcommand2
198+
199+ catcommand2="cat "//trim(HOME)//"drawcmd3.txt "
200+ 1//trim(HOME)//"plotdata/plotcont.txt"//"> "
201+ 2//trim(HOME)//"drawcmd.txt"
202+
203+ call system(catcommand2)
204+
205+ return
206+ end
207+
186208
187209 subroutine userinpt2(I)
188210 implicit none
Show on old repository browser