From 20db8e6fa60764f5f9a25504af01832e3b768382 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Mon, 26 Dec 2011 13:09:23 -0500 Subject: [PATCH] Minor file tree structure cleanup --- courseware/capa_module.py | 4 +- courseware/static/circuits/divider.png | Bin 1898 -> 0 bytes courseware/static/circuits/divider.ps | 221 --------------- .../circuits/superposition-ex-e2-fig.gif | Bin 3275 -> 0 bytes courseware/static/circuits/thevenin.png | Bin 2418 -> 0 bytes courseware/static/circuits/thevenin.ps | 251 ------------------ 6 files changed, 2 insertions(+), 474 deletions(-) delete mode 100644 courseware/static/circuits/divider.png delete mode 100644 courseware/static/circuits/divider.ps delete mode 100644 courseware/static/circuits/superposition-ex-e2-fig.gif delete mode 100644 courseware/static/circuits/thevenin.png delete mode 100644 courseware/static/circuits/thevenin.ps diff --git a/courseware/capa_module.py b/courseware/capa_module.py index 412d81010e..683e87f401 100644 --- a/courseware/capa_module.py +++ b/courseware/capa_module.py @@ -133,7 +133,7 @@ class LoncapaModule(XModule): self.attempts=state['attempts'] self.filename=node.getAttribute("filename") - filename=settings.DATA_DIR+self.filename+".xml" + filename=settings.DATA_DIR+"problems/"+self.filename+".xml" self.name=node.getAttribute("name") self.lcp=LoncapaProblem(filename, self.item_id, state) @@ -262,6 +262,6 @@ class LoncapaModule(XModule): self.lcp.questions=dict() # Detailed info about questions in problem instance. TODO: Should be by id and not lid. self.lcp.seed=None - filename=settings.DATA_DIR+self.filename+".xml" + filename=settings.DATA_DIR+"problems/"+self.filename+".xml" self.lcp=LoncapaProblem(filename, self.item_id, self.lcp.get_state()) return json.dumps(self.get_problem_html(encapsulate=False)) diff --git a/courseware/static/circuits/divider.png b/courseware/static/circuits/divider.png deleted file mode 100644 index 99ed33207a2bd562dcfe500130a9520673af42e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1898 zcmZ`)X*3(!7LK8Yh&Dutc`DkP5;3%)K^khVt0*coBAS?DDy7tLNwxIlnwrKG(o(8) z6*UCaR#9r!dnrw&W;I>XThmoHwcd~S)_QNPv(LBB+26PJ{_&l4?l?PL5C_Tu0RVuw ztqsP7hZJ4}f(3c|uL0*uc);&xe*trFAXNqL=bc2uY&;`*Xmc3WJwd3Sm(gLC*LZlS z1)xv$d;tK2(6$&$*BcY7MduSHYY(iVH=DT(1UjwYdD^-_evYM*oXPtJw%ja>ic>P^6i3~ zVJsx0K%5)gz(6_D8I1D_rgG?*h)*%7$CuRRJC2gDw+A8}j9CKxS#Eb5kmVm~$@r^*euii8*fe zJLE3B98EQS`Q>XFH**-_?1rVAu5xM}TH3>7OXr%U3S0LaW*RqJ-gjSXD?FKLn0Ik> z=~O!-`jxF3eJZr`NpB^qQm2fQjrsnJ?H!rZMOFD1jY^F>YY)W&>(`!4CF|2%7H!qs z@7GA_Z4~u2sFe9-ytyEk_~uM?y!V*>F`Pn!C#^~Q>`+6$CaZm&F*kOZX~@?9VC=gp zJFC{eT$SkQ(b7&nh$)8Tm957use-PAxzK4WZJN^g&{F#nvi!CwecL9oS<6GmNz@L- z#y3^d>e7a#3!6sl*?I3#l&GQEr&%du13D%o3Z!dkZl=~J4yZmjms7(*ec7q0v5S7D zz|zykmdT=_3%P^OORhQSLO-~#Z z8(14sYOQE|LV-d9^|e~W*lzhjkgkn5y2B%--jVNDejK;B5<@t(clK$Wy6kVSyjD5i zWAxSrS&g_>N~Q@Yt2|MOQJh{}{AqowI*zobHDYLc>7nS1E_EY7P=*_L-Of;o8>hSO zh;Utz;Q(j$W3ZRnYzXM-zOL=8!Bz|>ZC4t^*i$!*YS%GkJLsC!;ny!QJb;4h0oe?pHEWv(?hXWfLj5ga__au!Ot zf5?FD+$_PmkLY3Byd=(m;T&Lz*+o=%U5RTYi$BFD8%41{gq6!#g#L zMw!2nt-@ECSFOz`CXX2KB0FDo+jJ#mLg%!Nbg6iC-*b8I#hbKB*z?KmF|o5QTjM9oe7GDp-hq zLUC6|zC|@fEE=Pd&Ph>B=a=xlDvZCipPgJyRmNvf9on~wFB=FF?fy6O&{983 zQRqS6^d5hA`uah{PW)vVN^_OP5l2y;;SPmhYPf1Gr8D9qdHLgt*Fr6my9B`3J{^qi z8{1oS`w}a z{r`fy^h#ZxK=o&but=m0$%PP!CSMQrCxu=^lWzdv2*Vq2n6b9;8Q#i$=TXihEBu@6 pK!_#;11$Z?egs{F9!$l``I7a|1XvK(GQ;BmY^|IyHR!7;{{XHdRYCv& diff --git a/courseware/static/circuits/divider.ps b/courseware/static/circuits/divider.ps deleted file mode 100644 index 677fe6d3ef..0000000000 --- a/courseware/static/circuits/divider.ps +++ /dev/null @@ -1,221 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Title: divider -%%Creator: XCircuit v3.6 rev135 -%%CreationDate: Thu Dec 1 09:49:39 2011 -%%Pages: 1 -%%BoundingBox: 68 68 202 174 -%%DocumentNeededResources: font Helvetica Times-Roman -%%EndComments -%%BeginProlog -% -% PostScript prolog for output from xcircuit -% Version: 3.3 -% -% Electrical circuit (and otherwise general) drawing program -% -% Written by Tim Edwards 8/5/93--7/13/05 (tim.edwards@multigig.com) -% The Johns Hopkins University (1993-2004) -% MultiGiG, Inc. (2004-present) -% -%%BeginResource: procset XCIRCproc 3.3 0 -% -% supporting definitions --- these are the primary xcircuit types. - -/XCIRCsave save def -/topmat matrix currentmatrix def - -/fontslant { /slant exch def [1 0 slant 1 0 0] - exch findfont exch makefont dup length dict /ndict exch def - { 1 index /FID ne { ndict 3 1 roll put } { pop pop } ifelse } forall - ndict definefont pop} def -/ul { dup type /stringtype eq showflag 1 eq and { gsave - currentpoint topmat setmatrix 0 0 moveto 2 index stringwidth pop (_) - false charpath flattenpath pathbbox grestore exch pop 1 index - sub setlinewidth exch pop currentpoint 3 -1 roll add moveto 0 - rlineto stroke moveto } if } def -/ol { dup type /stringtype eq showflag 1 eq and { gsave gsave - currentpoint topmat setmatrix 2 index stringwidth pop 3 index - true charpath flattenpath pathbbox grestore exch pop - exch pop topmat setmatrix (_) true charpath pathbbox grestore - exch pop 1 index sub setlinewidth exch pop currentpoint - exch 4 1 roll exch sub add moveto pop 0 rlineto stroke - moveto } if } def -/stW { gsave currentpoint newpath moveto true charpath flattenpath - pathbbox pop exch pop sub grestore } def -/Ts {mark Tabs aload pop counttomark 1 add array astore /Tabs exch def Tabs - 0 currentpoint pop put} def -/Tbn {mark Tabs aload pop counttomark dup 2 add 1 roll cleartomark 1 sub} def -/Tb { 0 1 Tbn {Tabs exch get dup currentpoint pop lt - {currentpoint exch pop moveto exit} {pop} ifelse } for } def -/Tf { Tbn -1 0 {Tabs exch get dup currentpoint pop gt - {currentpoint exch pop moveto exit} {pop} ifelse } for } def -/qS { (aa) stW (a a) stW sub 4 div 0 Kn } def -/hS { qS qS } def -/pspc 0 def -/cf0 { scalefont setfont } bind def -/Kn { dup kY add /kY exch def rmoveto } bind def -/ss { /fscale fscale 0.67 mul def currentfont 0.67 cf0 0 fscale0 fscale mul - 0.33 mul neg Kn} def -/Ss { /fscale fscale 0.67 mul def currentfont 0.67 cf0 0 fscale0 fscale mul - 0.67 mul Kn } def -/ns { 0 kY neg Kn /kY 0 def /fscale 1.0 def xfont0 1.0 cf0 } def -/CR { ns 0 /Bline Bline fscale0 neg add def Bline moveto } def -/cf { dup type /realtype ne {1.0} if exch findfont exch kY 0 eq - { 40 mul dup /fscale0 exch def cf0 /xfont0 currentfont def} - {fscale0 mul fscale mul cf0} ifelse } def -/ctmk { counttomark dup 2 add -1 roll pop } bind def -/label { gsave translate 0 0 moveto dup scale neg /rotval exch def - /just exch def just 384 and 0 gt {/mshow {pop} def} {/mshow {show} - def} ifelse just 16 and 0 gt {gsave rotval rotate 0 1 dtransform - gsave pagemat setmatrix idtransform exch grestore 1 0 dtransform - gsave pagemat setmatrix idtransform exch grestore dup abs 1e-9 lt - {pop mul 0 gt} {3 1 roll pop pop 0 lt} ifelse grestore {-1 /rotval - rotval neg def /just just dup 3 and 1 ne {3 xor} if def} {1} ifelse - exch -1e-9 lt {-1 /rotval rotval neg def /just just dup 12 and - 4 ne {12 xor} if def} {1} ifelse scale } if /showflag 0 def - /fspc pspc def /Bline 0 def /Tabs 0 array def /fscale 1.0 def - /kY 0 def gsave dup 1 add copy 0 exch 1 0 dtransform exch atan rotate - {exch dup type /stringtype eq {true charpath flattenpath} {dup type - /arraytype eq {exec} {12 string cvs true charpath flattenpath} ifelse} - ifelse} repeat pop pathbbox grestore 3 -1 roll pop 3 1 roll just - 1 and 0 gt {just 2 and 0 gt {exch pop neg fspc sub} {exch sub 0.5 - mul neg} ifelse} {pop neg fspc add} ifelse exch Bline exch just 4 - and 0 gt {just 8 and 0 gt {exch pop neg fspc sub} {add 0.5 mul neg} - ifelse} {pop neg fspc add} ifelse rotval rotate Kn currentpoint - translate /showflag 1 def /Bline 0 def /Tabs 0 array def /fscale - 1.0 def /kY 0 def {dup type /stringtype eq {mshow} {dup type - /arraytype eq {exec} {12 string cvs mshow} ifelse} ifelse} repeat - grestore } def -/pinlabel { 4 index 32 and 0 ne hlevel 0 eq or { /pspc 10 def label - /pspc 0 def } { pop pop pop pop pop {pop} repeat } ifelse } def -/pinglobal { pinlabel } def -/infolabel { pinlabel } def -/graphic { gsave 4 index cvx exec /DataSource get resetfile translate - 0 0 moveto neg rotate dup scale cvx exec image grestore } def - -/scb { setrgbcolor } bind def /sce { defColor aload pop scb } bind def -/cRedef {/defColor currentcolor 3 array astore def} def -/begingate {dup type /dicttype ne {1 dict} if begin % default params - dup type /dicttype ne {1 dict} if begin % instanced params - /hlevel hlevel 1 add def /defColor currentcolor sce 3 array - astore def gsave sce translate 0 0 moveto neg rotate dup abs scale - } bind def -/endgate { /hlevel hlevel 1 sub def grestore defColor aload pop cRedef - scb end end} bind def - -/hlevel 0 def -/tmpa [1 0 0 1 0 0] def -/gar {8 8 true tmpa {} imagemask} bind -{8 8 true tmpa {<30 70 60 02 03 07 06 20>} imagemask} bind -{8 8 true tmpa {<0c 1e 1e 0c c0 e1 e1 c0>} imagemask} bind -{8 8 true tmpa {<0f 0f 0f 0f f0 f0 f0 f0>} imagemask} bind -{8 8 true tmpa {<3f f3 e1 e1 f3 3f 1e 1e>} imagemask} bind -{8 8 true tmpa {} imagemask} bind -{8 8 true tmpa {} imagemask} bind 7 array astore def -/ppaint { gsave clip tmpa dup setmatrix pathbbox neg exch neg 4 2 roll - neg 4 -1 roll 2 copy gt {exch} if 8 div ceiling 8 mul 4 2 roll neg 2 copy - gt {exch} if 8 div ceiling 8 mul 3 -1 roll -8 5 -1 roll - { 3 index exch 5 exch put dup -8 3 index { 3 index - exch 4 exch put 3 index exec } for } for pop pop pop pop grestore } bind def -/setstyles { - currentlinewidth mul setlinewidth /style exch def - style 1 and 0 gt not {closepath} if - style 1024 and 0 gt {2 setlinecap} if - style 2 and 0 gt {currentlinewidth 4 mul dup 2 array astore 0 setdash} if - style 4 and 0 gt {0.5 currentlinewidth 4 mul 2 array astore 0 setdash} if - gsave style 16 and 0 gt { style 224 and -5 bitshift style 256 and 0 gt { - 7 exch sub 8 div dup 1 exch sub currentrgbcolor 3 array astore - {3 copy mul add 4 1 roll pop} forall pop pop setrgbcolor eofill} - {dup 7 lt {gar exch get ppaint} {pop eofill} ifelse} ifelse} - {style 256 and 0 gt {1 setgray eofill} if} ifelse grestore style 8 and 0 gt - style 512 eq or {newpath} {stroke} ifelse grestore} def - -/polygon { gsave /num exch def moveto num 1 sub {lineto} repeat setstyles } def -/xcarc { gsave newpath arc setstyles } def -/elb { matrix currentmatrix 7 -1 roll 7 -1 roll translate 5 1 roll 4 -1 roll - 3 index div 1 scale } def -/ele { 0 4 1 roll 0 4 1 roll } bind def -/ellipse { gsave elb newpath ele arc setmatrix setstyles } def -/pellip { elb ele arc setmatrix } def -/nellip { elb ele arcn setmatrix } def -/spline { gsave moveto curveto setstyles } def -/polyc { {lineto} repeat } bind def -/beginpath { gsave moveto } bind def -/endpath { setstyles } bind def -/bop { 1 setlinecap 0 setlinejoin 6 setmiterlimit 0 0 0 scb cRedef } def -/psinsertion {/PSobj save def /showpage {} def /setpagedevice {pop} def bop - rotate translate dup scale} def -/end_insert {PSobj restore} def -/setpagemat {/pagemat matrix currentmatrix def} def -/inchscale {setpagemat 0.375 mul dup scale} def -/cmscale {setpagemat 0.35433071 mul dup scale} def - -%%EndResource -%%EndProlog - -% XCircuit output starts here. - -%%BeginSetup - -/analog::resistor { -begingate -1 1.000 0 64 0 36 2 polygon -1 1.000 0 -64 0 -36 2 polygon -1 1.000 0 -36 14 -30 -14 -18 14 -6 -14 6 14 18 -14 30 0 36 8 polygon -1.000 0.000 0.000 scb -(r.1) {/Times-Roman cf} 2 9 0 1.000 0 64 pinlabel -(r.2) {/Times-Roman cf} 2 13 0 1.000 0 -64 pinlabel -0.180 0.545 0.341 scb -(spice:R%i %pr.1 %pr.2 1.0K) {/Times-Roman cf} 2 0 0 1.000 -208 -160 infolabel -(sim:r %pr.1 %pr.2) {/Times-Roman cf} 2 0 0 1.000 -208 -208 infolabel -endgate -} def - -/analog::gnd { -% trivial -begingate -1 1.000 0 0 0 -32 2 polygon -1 1.000 -32 -32 32 -32 2 polygon -1 1.000 -18 -46 18 -46 2 polygon -1 1.000 -4 -60 4 -60 2 polygon -0.933 0.604 0.000 scb -(GND) {/Times-Roman cf} 2 1 0 1.000 0 0 pinglobal -endgate -} def - -/generic::circle { -% trivial -begingate -1 1.000 16 0 6 0.000 360.000 xcarc -1 1.000 0 0 10 0 2 polygon -1.000 0.000 0.000 scb -(out) {/Times-Roman cf} 2 4 0 1.000 16 0 pinlabel -(out) {/Times-Roman cf} 2 7 0 1.000 0 0 pinlabel -endgate -} def - - -%%EndSetup - -%%Page: 1 1 -%%PageOrientation: Portrait -/pgsave save def bop -1.0000 inchscale -2.6000 setlinewidth 864 -132 translate - -1.000 90 -528 528 analog::resistor -1.000 0 -448 448 analog::resistor -1.000 0 -448 384 analog::gnd -1.000 0 -432 528 generic::circle -1 1.000 -480 528 -448 528 -448 512 3 polygon -1 1.000 -432 528 -448 528 2 polygon --1.000 0 -592 528 generic::circle -(in) {ss} (V) {/Helvetica cf} 4 16 0 1.000 -672 512 label -(out) {ss} (V) {/Helvetica cf} 4 16 0 1.000 -400 512 label -(1) {ss} (R) {/Helvetica cf} 4 16 0 1.000 -560 560 label -(2) {ss} (R) {/Helvetica cf} 4 16 0 1.000 -432 432 label -pgsave restore showpage - -%%Trailer -XCIRCsave restore -%%EOF diff --git a/courseware/static/circuits/superposition-ex-e2-fig.gif b/courseware/static/circuits/superposition-ex-e2-fig.gif deleted file mode 100644 index 88f4c4deca021893d7796b010524573e16ec6e9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3275 zcmV;+3^emcNk%w1Va@?s0igo`0000pGnu>KVv8Y}DZdf;eSTS_|1+xw8KYa0j* z>}$+hd(x#G{2>;2Psq-cwiWh?p87e4XQlCaCC_`v5XHyzT zdnzpyY3hVS;?POe8Y(MRv5%&K)#bHovy5k1bXse6EZL?21lSeeis+~n6Z`u83plXg z!GsGNK5W=2z{PPJ&)teRvgFB>D;K_tm+>RDe8D2teDyI?(K8cY!z}d`+na4UypNF@8(qfRYUI9kGsn5t#eQX+-`a6CLNk0a*+!qI+`CpEm(H3x_(tl-bC24cJ9_9P)tRrh8&{0@t^V!T=kE)EFbFswYz4-)$bkwL zx6^_SqClVv5k5%aXh%#~;e!}vUt{uCCCV) z2=~E3;|Mv{_)9LrLG>dYJBBbMkF7Mc*JiB<>7tP~Ai1QH2D(w?2UR+`3^P(DiDQ#k z&VWsnT6Wpsmol8AUypHI`JtKn(KOUB;jt+Mog3I`WSG=#^9G*KxjEpR7V=4@mw>tj zXKCSJ;-?Rd%6BNDAR$@HjW8J+=_-OMD(0ecJZb@`vHYjfdns|M)I;K}A*y00l6vZJ zi3U@XD+scRX@)T+1*=npDikC}t>!T7NUyfH{#bYxwiIlq6;awO8^yBc;i_aQi|ka> zVlv`&Wi9L2wq&YU?Q*YK1uk8=YH03nv5DK~x(nJ0TDtVcC@&M1?aS}J^&(r|w+!`5 zaKQ#2>{q@DYxFO`0^iEq!sM>$?x5(V%MrX6pY-W+>iGt7#AQaIF;yY&`BSzcPfYS0 z)?WKl$!5shu*3|joGQ0CXKeF@LehkBRy30_w8t#3*{hn`_MD*0kd?ah$WRoWX$w>b zeRS2*GF`;gTCc)25ng|Ng4bg|Om-S(PjPnII);4|g_dqDHOJce2&J%XhX{9_bVa+R zr&$(Sw-bBkLFnK{&)jzqhr=|h;DOWroweaw>8W_9xE9{T<659u)Z}WcErsV;V1CP{ z>og98=~w6(6{GQTuJ7Hlf2=y?NSN+=6=AY-`|7l_{>(S3j!Agso&SBiS6n8)JKNAB zue7PnpL_hyL=*4mI!RM6Yph%`b#L#qaNmRZcWS@uQsn)LQ?#M0jXn?RABS!Jvd;g} zJf%UKw=hT+*W9N$?Nts^9_LGr{PMu43mxTLNEKza4zg zRip{nzeY%f1=>wt{W>Aqz*QcE$#8}=oJ$m(v1EAu~rZuE^muNWFHn^wlWP8P>Cb}qfhjwt_=E&i#q%s zR4y0A8%$ACPz#<>v`EGz5@{EfY7+ll>8I5R1GqBM>0zgzB?LbLaa8eC~ zv;-^VXfQ_#P?o-+r5H%5Oi4gfvW=8YIjw06Z0Z4^hCrwsAgV}tW{w)0oy&u?To$0}@wSfsd#FFx3Eim*SD?{dr*EmM*6OPBx>Z|l^_uI?=V}+8;k~Uv z$4lPw=JvekEo^cfdcA^diZRQM6U=0xkwA)$jMR_ZZ2_F}H62>lWH5Xz{de^h_6=+dE%;LAs z_Q9j5;$q`U;gr5s#wvbGoJ@S;aM;+tI970tPd3~a>o~?dHso?6JYyP5X&u4OTn<2M$Lj!<8lBZ22-F>ZR=ZO3D!@|wX5%JHC;RROq-DP~DkH(146~ce#q^0B`xm&jzr% z(Y1%iHdWmpW(u{9)9uuzJHS8+#B}w$UkFE5-T)sjkWL-g9nG8GGR?$NT)#5r~}K8;_{ThqUr>fBdVOHLF~&6m$M( zdpqSScllB6wDM91o#s4u^P@yA>w72t;%@E%wUhnysxFn3CoekDdyQ45F1_jV{OZtI ziu9`|yz4#pdCkXK_M86zxDBRj$lYGroJ$A60F|>1*p6YjBRsaU+}3dQK61j={kKpJ zLVDfpbm9gV?>OzL;+8$KxvLjIr@9 znWXn2C8bBq)-SGgu-B&SwMY9^#{TxWf4%N)FMHM3{+FZ|{_ly;dE>Kwm&s?oGrPz8 z&ij7(+uXJDbD7EL_a6Gxe?BCYzk6#I|N6l6zFf)QO!QY&{nZ41>%s4S^ZrA=`oRu= z@Y$dJ_&1;a4AOr);g5Xfw}0|yKixNg*w=mmxKH>OH}>~_3|LDFSa|%`Y!diV5LieK zIDQnEYW}x?90)cVcz^;(fW)GG+m}AWCw?QCek(|VA6SAoB!d5kfw|{_6BvUgID;^V zfca;E>j#1+vV%C-gAI6t7Z`+PV}LZ6gk5xmK$wG4w1hnPf>oG+w+DbO*n%4vg>p27 zL}-QCRD<6)hTQjq&s2sfID|;pg-`N@Y*>U5n1=J$hKaO>a2SSH*o4Qjhh=n!P#A|9 zc!p@$hi~(QfS89qIENy&h%z{cebHgR{)t|AiI7-`Hu8s< z7>G8gg;cnOp?E$gn1!9_Yth$=s>n#%7mJxFZm{TzcKC^uD2s=*i=5bttGJ0|m5Z8q zieQ+Ewg_#sSd6dOjNJ5$% zv-pjO7>9|S1NR0ZpKKw|H{uoK?NQ&+#hXPq3@o11{ z2#@91e+0>m@~DRAczy_(A`r=o-Dr&#i5?0mh8#I}4%vYeNrw_SkK34$Ch3SI$%r6H zLM-Vv9;t^e=^Y{&f&ht*8mWya35+^vjxZTmHYtQSS&=@l`H&ddlPW2RK&ewgsf0Y) zk49O6NEww%X^BKxk_$O~O!+l3sfbR=B3_A)R2h&v!C_~KmT9S$Ysr>v>6UK^mvJeV zb4izVX_t42mwBm|d&!q}Nsq?(m-iQ#4LO)tSeS-+m=BnkT)3F1*q86)(zo3SaIvq_t^X`8o+ Jn`lq~06PMse0l%? diff --git a/courseware/static/circuits/thevenin.png b/courseware/static/circuits/thevenin.png deleted file mode 100644 index 99010e2884546cd6869f9968ba18e4ccd7b3a34e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2418 zcmZ`*c{tQv8~#~JretEuRwJcF$XJIdrZCowH6aWd#F(*g1idUxjd?ssnfeF*Of<;MIh4<4f5YS*&R}Pe7&wp!y zBVq1Y0IG ze#$}4f)TGDQH#0w@TcQxl!6=R!%?;851y~eLDTAFhYT3KU-aKE-AwUX4?wO?m6?|G zZ5^-^?07Iv#tBLL*gMtl({rjf1{=QTJSsM%*WkG28woS@T3|zqc!HFNPT!40fYK*$ z?^wK}<@?UnJSM49%tOahCo=@$_W3wH4D{d!5bO#G3;jAR5d18^dlC5(Z*bU8^!Tk( z=pR3Ti5lFE^2bkhHndFdkJ-PlR+HBB;V#PZ)+e}EUGAe(r#d%1PfvE<#!+z>Ezl5& zZG23RYDTSK=9A&z)T(6AFsdFG@yA11DK+yqEV{Y|zIl+-f0%m#z7ExjS-@dCI zQjKzGe%Tj{Pf~4qm$JtWWJ}|X3sN?li`yS&DTt)-(b%W)ZOn}MAQ5E=C}hwbp%P7T zuiN~-WL7IWuZESCo_ELy71FJc#OIBZf?Xq^XOhZ9po!_&4lreuVdjj1+BF&AbSsi; z69tN4bbU{!D^QHYg{l(FujuDdu5$1EhT4=tmqe@5&eIej0a*g|teo2NOHGdQ6QITK zVzQy(lN+GWbHs>XoImg6dIwnKRH^$_b3s_av_Z{;dh2yX<3?&M*}Cx7o{niIcUg(h zLTV`>?H3p5>gw0kRoIA~jdrGoj3(Y#1!!@*))w04<{djzq?)u}l6*xPTS!&i+_@v5 z@=?Zsxgg~n(NeDf6dY`8Mb_QDwp8N66#(36bT)UjajE;KQtJpg4w-Dhpbd%hCVxRd zFVI}6C(p99tuH@jT;Wm7mJWMpv_1L(*e(Ye5cC&>mF^nFA8kFIqX=|(x<$q8`hmax zvRVzcjnT;#im+Nv{t7O-3|5i4dO2!ScxL3wTd zREC+B)E34Ht22$HlCrWfJU3snMXZ^SujJpVN6+s-peKp|tMk-`cFgSBT@)@J9IQge zCKOrmw!`u1frBg7Y-@T@Of1ARdi(IIz`xsYv=uJ>HatT(Qx+EBB>?@CT_7_ zRwvi|VW%;AwiYTad3Q^{yzPFW{QiUasl1E;Ziz^%9Amaq+73j7VaI4%!sAWQOOBJ#v%H=31d-28i%ZwWh*-761u zx~-O;n79ds9ch&~2oA(RW z{p|DA+!UjZE&r@I{o}Q|%V#c2GmKw_}bKfinxu|3ENI zF0`_jXMRg0ErdE3=e5GdM<8s+aF=pc&Y#v&a_Iwb#fgaBH(kgjqEm#tf;4cZXt59c zE?%(9Wn^B65@@q_!hR@_ain6lAv)pSZgHV(e>sfMdgjAef)XtAB z?U+9qyKmVyMlzrW%})_+NNt&_>GOWchN%;smLiAFrY-6pbo*(nR*7i(Wv#jd9plVa z95UFo*GT08MD$--W}`zrDJy9VenOGV?!fxD&&fo_?GK8ZLr8oc*)~lF4C1~`-@M9m zau5B=5Fa@8llUe!MdbThlX-e}S;tNi$U=v6Ws0`;VlSl_p@MWB9F1@r zqvA+0>oAS16KjFnN1}-i?zA~Uzx5?XBT84N8TDQof znyN1yD0}*t!^t>T0Aqr^3>YtFK85VDeO3nAyB_2NzOyIZ)9&Wuf>E_vDRq zNcDA@kWKObbQ@{KD8euEONI6RyFh`+{D-Aso F{sMkfff@h+ diff --git a/courseware/static/circuits/thevenin.ps b/courseware/static/circuits/thevenin.ps deleted file mode 100644 index a4a2d21703..0000000000 --- a/courseware/static/circuits/thevenin.ps +++ /dev/null @@ -1,251 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Title: thevenin -%%Creator: XCircuit v3.6 rev135 -%%CreationDate: Thu Dec 1 09:57:24 2011 -%%Pages: 1 -%%BoundingBox: 68 68 241 172 -%%DocumentNeededResources: font Helvetica Times-Roman -%%EndComments -%%BeginProlog -% -% PostScript prolog for output from xcircuit -% Version: 3.3 -% -% Electrical circuit (and otherwise general) drawing program -% -% Written by Tim Edwards 8/5/93--7/13/05 (tim.edwards@multigig.com) -% The Johns Hopkins University (1993-2004) -% MultiGiG, Inc. (2004-present) -% -%%BeginResource: procset XCIRCproc 3.3 0 -% -% supporting definitions --- these are the primary xcircuit types. - -/XCIRCsave save def -/topmat matrix currentmatrix def - -/fontslant { /slant exch def [1 0 slant 1 0 0] - exch findfont exch makefont dup length dict /ndict exch def - { 1 index /FID ne { ndict 3 1 roll put } { pop pop } ifelse } forall - ndict definefont pop} def -/ul { dup type /stringtype eq showflag 1 eq and { gsave - currentpoint topmat setmatrix 0 0 moveto 2 index stringwidth pop (_) - false charpath flattenpath pathbbox grestore exch pop 1 index - sub setlinewidth exch pop currentpoint 3 -1 roll add moveto 0 - rlineto stroke moveto } if } def -/ol { dup type /stringtype eq showflag 1 eq and { gsave gsave - currentpoint topmat setmatrix 2 index stringwidth pop 3 index - true charpath flattenpath pathbbox grestore exch pop - exch pop topmat setmatrix (_) true charpath pathbbox grestore - exch pop 1 index sub setlinewidth exch pop currentpoint - exch 4 1 roll exch sub add moveto pop 0 rlineto stroke - moveto } if } def -/stW { gsave currentpoint newpath moveto true charpath flattenpath - pathbbox pop exch pop sub grestore } def -/Ts {mark Tabs aload pop counttomark 1 add array astore /Tabs exch def Tabs - 0 currentpoint pop put} def -/Tbn {mark Tabs aload pop counttomark dup 2 add 1 roll cleartomark 1 sub} def -/Tb { 0 1 Tbn {Tabs exch get dup currentpoint pop lt - {currentpoint exch pop moveto exit} {pop} ifelse } for } def -/Tf { Tbn -1 0 {Tabs exch get dup currentpoint pop gt - {currentpoint exch pop moveto exit} {pop} ifelse } for } def -/qS { (aa) stW (a a) stW sub 4 div 0 Kn } def -/hS { qS qS } def -/pspc 0 def -/cf0 { scalefont setfont } bind def -/Kn { dup kY add /kY exch def rmoveto } bind def -/ss { /fscale fscale 0.67 mul def currentfont 0.67 cf0 0 fscale0 fscale mul - 0.33 mul neg Kn} def -/Ss { /fscale fscale 0.67 mul def currentfont 0.67 cf0 0 fscale0 fscale mul - 0.67 mul Kn } def -/ns { 0 kY neg Kn /kY 0 def /fscale 1.0 def xfont0 1.0 cf0 } def -/CR { ns 0 /Bline Bline fscale0 neg add def Bline moveto } def -/cf { dup type /realtype ne {1.0} if exch findfont exch kY 0 eq - { 40 mul dup /fscale0 exch def cf0 /xfont0 currentfont def} - {fscale0 mul fscale mul cf0} ifelse } def -/ctmk { counttomark dup 2 add -1 roll pop } bind def -/label { gsave translate 0 0 moveto dup scale neg /rotval exch def - /just exch def just 384 and 0 gt {/mshow {pop} def} {/mshow {show} - def} ifelse just 16 and 0 gt {gsave rotval rotate 0 1 dtransform - gsave pagemat setmatrix idtransform exch grestore 1 0 dtransform - gsave pagemat setmatrix idtransform exch grestore dup abs 1e-9 lt - {pop mul 0 gt} {3 1 roll pop pop 0 lt} ifelse grestore {-1 /rotval - rotval neg def /just just dup 3 and 1 ne {3 xor} if def} {1} ifelse - exch -1e-9 lt {-1 /rotval rotval neg def /just just dup 12 and - 4 ne {12 xor} if def} {1} ifelse scale } if /showflag 0 def - /fspc pspc def /Bline 0 def /Tabs 0 array def /fscale 1.0 def - /kY 0 def gsave dup 1 add copy 0 exch 1 0 dtransform exch atan rotate - {exch dup type /stringtype eq {true charpath flattenpath} {dup type - /arraytype eq {exec} {12 string cvs true charpath flattenpath} ifelse} - ifelse} repeat pop pathbbox grestore 3 -1 roll pop 3 1 roll just - 1 and 0 gt {just 2 and 0 gt {exch pop neg fspc sub} {exch sub 0.5 - mul neg} ifelse} {pop neg fspc add} ifelse exch Bline exch just 4 - and 0 gt {just 8 and 0 gt {exch pop neg fspc sub} {add 0.5 mul neg} - ifelse} {pop neg fspc add} ifelse rotval rotate Kn currentpoint - translate /showflag 1 def /Bline 0 def /Tabs 0 array def /fscale - 1.0 def /kY 0 def {dup type /stringtype eq {mshow} {dup type - /arraytype eq {exec} {12 string cvs mshow} ifelse} ifelse} repeat - grestore } def -/pinlabel { 4 index 32 and 0 ne hlevel 0 eq or { /pspc 10 def label - /pspc 0 def } { pop pop pop pop pop {pop} repeat } ifelse } def -/pinglobal { pinlabel } def -/infolabel { pinlabel } def -/graphic { gsave 4 index cvx exec /DataSource get resetfile translate - 0 0 moveto neg rotate dup scale cvx exec image grestore } def - -/scb { setrgbcolor } bind def /sce { defColor aload pop scb } bind def -/cRedef {/defColor currentcolor 3 array astore def} def -/begingate {dup type /dicttype ne {1 dict} if begin % default params - dup type /dicttype ne {1 dict} if begin % instanced params - /hlevel hlevel 1 add def /defColor currentcolor sce 3 array - astore def gsave sce translate 0 0 moveto neg rotate dup abs scale - } bind def -/endgate { /hlevel hlevel 1 sub def grestore defColor aload pop cRedef - scb end end} bind def - -/hlevel 0 def -/tmpa [1 0 0 1 0 0] def -/gar {8 8 true tmpa {} imagemask} bind -{8 8 true tmpa {<30 70 60 02 03 07 06 20>} imagemask} bind -{8 8 true tmpa {<0c 1e 1e 0c c0 e1 e1 c0>} imagemask} bind -{8 8 true tmpa {<0f 0f 0f 0f f0 f0 f0 f0>} imagemask} bind -{8 8 true tmpa {<3f f3 e1 e1 f3 3f 1e 1e>} imagemask} bind -{8 8 true tmpa {} imagemask} bind -{8 8 true tmpa {} imagemask} bind 7 array astore def -/ppaint { gsave clip tmpa dup setmatrix pathbbox neg exch neg 4 2 roll - neg 4 -1 roll 2 copy gt {exch} if 8 div ceiling 8 mul 4 2 roll neg 2 copy - gt {exch} if 8 div ceiling 8 mul 3 -1 roll -8 5 -1 roll - { 3 index exch 5 exch put dup -8 3 index { 3 index - exch 4 exch put 3 index exec } for } for pop pop pop pop grestore } bind def -/setstyles { - currentlinewidth mul setlinewidth /style exch def - style 1 and 0 gt not {closepath} if - style 1024 and 0 gt {2 setlinecap} if - style 2 and 0 gt {currentlinewidth 4 mul dup 2 array astore 0 setdash} if - style 4 and 0 gt {0.5 currentlinewidth 4 mul 2 array astore 0 setdash} if - gsave style 16 and 0 gt { style 224 and -5 bitshift style 256 and 0 gt { - 7 exch sub 8 div dup 1 exch sub currentrgbcolor 3 array astore - {3 copy mul add 4 1 roll pop} forall pop pop setrgbcolor eofill} - {dup 7 lt {gar exch get ppaint} {pop eofill} ifelse} ifelse} - {style 256 and 0 gt {1 setgray eofill} if} ifelse grestore style 8 and 0 gt - style 512 eq or {newpath} {stroke} ifelse grestore} def - -/polygon { gsave /num exch def moveto num 1 sub {lineto} repeat setstyles } def -/xcarc { gsave newpath arc setstyles } def -/elb { matrix currentmatrix 7 -1 roll 7 -1 roll translate 5 1 roll 4 -1 roll - 3 index div 1 scale } def -/ele { 0 4 1 roll 0 4 1 roll } bind def -/ellipse { gsave elb newpath ele arc setmatrix setstyles } def -/pellip { elb ele arc setmatrix } def -/nellip { elb ele arcn setmatrix } def -/spline { gsave moveto curveto setstyles } def -/polyc { {lineto} repeat } bind def -/beginpath { gsave moveto } bind def -/endpath { setstyles } bind def -/bop { 1 setlinecap 0 setlinejoin 6 setmiterlimit 0 0 0 scb cRedef } def -/psinsertion {/PSobj save def /showpage {} def /setpagedevice {pop} def bop - rotate translate dup scale} def -/end_insert {PSobj restore} def -/setpagemat {/pagemat matrix currentmatrix def} def -/inchscale {setpagemat 0.375 mul dup scale} def -/cmscale {setpagemat 0.35433071 mul dup scale} def - -%%EndResource -%%EndProlog - -% XCircuit output starts here. - -%%BeginSetup - -/analog::resistor { -begingate -1 1.000 0 64 0 36 2 polygon -1 1.000 0 -64 0 -36 2 polygon -1 1.000 0 -36 14 -30 -14 -18 14 -6 -14 6 14 18 -14 30 0 36 8 polygon -1.000 0.000 0.000 scb -(r.1) {/Times-Roman cf} 2 9 0 1.000 0 64 pinlabel -(r.2) {/Times-Roman cf} 2 13 0 1.000 0 -64 pinlabel -0.180 0.545 0.341 scb -(spice:R%i %pr.1 %pr.2 1.0K) {/Times-Roman cf} 2 0 0 1.000 -208 -160 infolabel -(sim:r %pr.1 %pr.2) {/Times-Roman cf} 2 0 0 1.000 -208 -208 infolabel -endgate -} def - -/analog::source { -% hidden -begingate -1 1.000 0 0 32 0.000 360.000 xcarc -1 1.000 0 32 0 64 2 polygon -1 1.000 0 -32 0 -64 2 polygon -endgate -} def - -/generic::arrowhead { -% nonetwork -begingate -8 -28 beginpath -3 -18 3 -15 0 0 curveto --3 -15 -3 -18 -8 -28 curveto --2 -26 2 -26 8 -28 curveto -249 -1.000 endpath -endgate -} def - -/analog::isource { -begingate -1.000 0 0 0 analog::source -1 0.750 0 20 0 -8 2 polygon -0.800 180 0 -20 generic::arrowhead -1.000 0.000 0.000 scb -(i.p) {/Times-Roman cf} 2 9 0 1.000 0 64 pinlabel -(i.m) {/Times-Roman cf} 2 13 0 1.000 0 -64 pinlabel -endgate -} def - -/generic::circle { -% trivial -begingate -1 1.000 16 0 6 0.000 360.000 xcarc -1 1.000 0 0 10 0 2 polygon -1.000 0.000 0.000 scb -(out) {/Times-Roman cf} 2 4 0 1.000 16 0 pinlabel -(out) {/Times-Roman cf} 2 7 0 1.000 0 0 pinlabel -endgate -} def - - -%%EndSetup - -%%Page: 1 1 -%%PageOrientation: Portrait -/pgsave save def bop -1.0000 inchscale -2.6000 setlinewidth 896 -218 translate - -1.000 90 -416 608 analog::resistor -1.000 0 -640 512 analog::isource -1.000 180 -512 512 analog::resistor -1.000 180 -320 512 analog::resistor -1 1.000 -640 448 -640 416 2 polygon -1 1.000 -512 448 -512 416 2 polygon -1 1.000 -320 448 -320 416 2 polygon -1 1.000 -320 416 -640 416 2 polygon -1 1.000 -640 576 -640 608 2 polygon -1 1.000 -512 576 -512 608 2 polygon -1 1.000 -320 576 -320 608 2 polygon -1 1.000 -320 608 -352 608 2 polygon -1 1.000 -480 608 -640 608 2 polygon -1.000 0 -288 608 generic::circle -1 1.000 -288 608 -320 608 2 polygon -1.000 0 -288 416 generic::circle -1 1.000 -288 416 -320 416 2 polygon -(1) {ss} (R) {/Helvetica cf} 4 16 0 1.000 -432 640 label -(2) {ss} (R) {/Helvetica cf} 4 16 0 1.000 -496 512 label -(3) {ss} (R) {/Helvetica cf} 4 16 0 1.000 -304 512 label -(I) {/Helvetica cf} 2 16 0 1.000 -704 512 label -pgsave restore showpage - -%%Trailer -XCIRCsave restore -%%EOF