From 2861fd9f0daeb36fc5e2da3ad73ce8a6702af40c Mon Sep 17 00:00:00 2001
From: "t.youngs" <t.youngs@qub.ac.uk>
Date: Fri, 18 Apr 2008 15:43:46 +0000
Subject: [PATCH] Corrected rendering of drawing ruler, and added display of
 current bond length when drawing chains. Fixed placement of new atoms when
 drawing. More fixes to Windows CMake files.

---
 CMakeLists.txt              |  21 ++++++++++-----
 NSIS.template.in            |   9 ++++---
 src/base/prefs.cpp          |   2 +-
 src/gui/icons/uninstall.ico | Bin 5438 -> 15934 bytes
 src/model/view.cpp          |  10 ++++---
 src/render/extra.cpp        |  52 +++++++++++++++++++++---------------
 6 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8bf03ffff..629f36ec7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,10 +98,9 @@ Find_File(qtcore QtCore4.dll PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 Find_File(qtsvg QtSvg4.dll PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 Find_File(qtxml QtXml4.dll PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 Find_File(qsvg qsvg4.dll PATHS ${QT_PLUGINS_DIR}/iconengines NO_DEFAULT_PATH)
-install(FILES ${qtgui} ${qtgl} ${qtcore} ${Rline} ${HRline} ${qtsvg} ${qtxml}
+install(FILES ${qtgui} ${qtgl} ${qtcore} ${Rline} ${HRline} ${qtsvg} ${qtxml} ${CMAKE_CURRENT_SOURCE_DIR}/src/gui/icons/aten.ico
 DESTINATION bin
 )
-message("tt: ${QT_PLUGINS_DIR}   ${qsvg}")
 install(FILES ${qsvg} 
 DESTINATION bin/iconengines
 )
@@ -133,19 +132,25 @@ SET(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
 SET(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "aten${VERSION_MAJOR}.${VERSION_MINOR}")
 IF(WIN32)
+  SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Aten-${VERSION_MAJOR}.${VERSION_MINOR}")
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
   set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/src/gui/icons\\\\aten.ico")
   set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/src/gui/icons\\\\uninstall.ico")
   SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/src/gui/icons\\\\aten.bmp")
-  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\aten.exe")  
+  SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\aten.ico")  
   SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Aten")
   SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.projectaten.org")
   SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.projectaten.org")
-  SET(CPACK_NSIS_CONTACT "t.youngs@qub.ac.uk")
-  SET(CPACK_NSIS_MODIFY_PATH ON)
+  SET(CPACK_NSIS_CONTACT "tris@projectaten.org")
+  SET(CPACK_NSIS_MODIFY_PATH ON)  
   SET(CPACK_PACKAGE_EXECUTABLES "aten" "aten")
-  set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+  set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut \\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\aten.lnk\\\" \\\"$INSTDIR\\\\bin\\\\aten.exe\\\" \\\"\\\" \\\"$INSTDIR\\\\bin\\\\aten.ico\\\"
+      StrCmp $INSTALL_DESKTOP \\\"1\\\" 0 +2
+      CreateShortCut \\\"$DESKTOP\\\\aten.lnk\\\" \\\"$INSTDIR\\\\bin\\\\aten.exe\\\" \\\"\\\" \\\"$INSTDIR\\\\bin\\\\aten.ico\\\"
+"
+  )
+set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
     Push \\\"ATENDATA\\\"
     Push \\\"$INSTDIR\\\\share\\\\aten\\\"
     Call WriteEnvStr      
@@ -153,7 +158,9 @@ IF(WIN32)
   )
   set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "    
     Push \\\"ATENDATA\\\"
-    Call un.DeleteEnvStr  
+    Call un.DeleteEnvStr 
+    StrCmp $INSTALL_DESKTOP \\\"1\\\" 0 +2
+    Delete \\\"$DESKTOP\\\\aten.lnk\\\"    
 "
 )
 Endif(WIN32)
diff --git a/NSIS.template.in b/NSIS.template.in
index a89f718e3..23311476a 100644
--- a/NSIS.template.in
+++ b/NSIS.template.in
@@ -73,12 +73,13 @@ Function .onInit
     ;Get installation folder from registry if available
 
   done:
-  StrCmp $SV_ALLUSERS "AllUsers" 0 +2
-    StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+  StrCmp $SV_ALLUSERS "AllUsers" 0 +3
+    StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"    
+    !define ALL_USERS
 
   StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
     !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
-
+    
   noOptionsPage:
 FunctionEnd
 
@@ -582,7 +583,7 @@ Section "Installer Section" InstSection
   
   ;Create shortcuts
   CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-@CPACK_NSIS_CREATE_ICONS@
+@CPACK_NSIS_CREATE_ICONS@  
 @CPACK_NSIS_CREATE_ICONS_EXTRA@
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
 
diff --git a/src/base/prefs.cpp b/src/base/prefs.cpp
index 93fb4ec2d..9b0882809 100644
--- a/src/base/prefs.cpp
+++ b/src/base/prefs.cpp
@@ -177,7 +177,7 @@ Prefs::Prefs()
 	// Build
 	showGuide_ = FALSE;
 	bondTolerance_ = 1.1;
-	drawDepth_ = 0.0;
+	drawDepth_ = 10.0;
 	guideSpacing_ = 1.0;
 	guideTicks_ = 5;
 	guideExtent_ = 10;
diff --git a/src/gui/icons/uninstall.ico b/src/gui/icons/uninstall.ico
index af48381c9ea94ddb47e1090c44f681fcbf14aae3..73d79b0f2e46f7f8b0ab221cddd7360732686270 100644
GIT binary patch
literal 15934
zcmc(m33yc16~|{XnI)N!Ndl=5l1zZeBDhdDiq>E&xT0WHv~H-V;8MT^+&&T%L2;=S
z(7NM>Td6D}t@;US6*r0$ELDo6E}&LrlCT6w=Jt19a+5cY_h#ONgg(AM=f3;SJ@@?I
z-Ojyl;_-O-ck~bs|Cf3C9^>)+%;WL&1xJG_Ao)(0Qp#gS&hVNO!)Mmc&OWzxMfQbt
zwP1Djd9{y)&#FB)JiNwh*2U)GAkWFRUB0=zIh~HKxtv|vYD;wVrS;(%36HFKGW&u$
zl{Idw3QgRmg4Z`e(xEH1s;tp<uZPd5DbZ!H;RTu6mK&+dTBTiCt4=!icJ`X{e9c@p
zWL;dRLKC*Bz%AQV;PxHLKeJx>?*h~7Rba{v6}o1d${JI*1<w2Hy0KB3#P%MKbU7z!
zDv;r%<0ik^j<iR@C1v3|SK8I!Iu)M3->G~L?^3?GyPNRHE|vL*ohoqK4i&r>&KK3a
z8$Pwh@CReZCm2j|<HpyH)Pd_T#;ehXrCklK@bu1aP@Y#C4R~K}RKBNntIYf1TuD1$
zwN+)GU3<0o#WfgYrJ&jJxV^bxcmh}nHh>?%7VuxN8GH?@!FsR;yba%3%uU94l|C%(
zYH(eqRQN-saz0Wj<1MAU3*h|NF6F<oUInk)rkKZGZ{{oWRcGMp>Hxm~q+)sTZm<Bp
z@8P>KH_2F)J}m7jTuc6~RM{6wMOM;~e~qh*XLc+9y*pL#hV6>6{-gGtx<X)&u|i(L
zrS;oWQo%alhO6jY2wz!q;7eZ?zE8q;X<T*sSg9Txl`8*Isk~M2eGR_P!k4ifyb->a
z)G5}dBJFzuF`FB$*WQw<J_2s|eve)lzH3-tjk(u91HO;apQZ1<-NZBh6Qu(0(w`TT
z_XK=-C-QDso3>Lnv%URK*B%_+bjkNIv5n79WRHUHm0OLuNam!Br<t!7F;~4FSDrWG
z%KJ*A%9zJ|HHZ1?R_3eUF@AqryCPlRIzk_=i(K+OxtZ_9tSz#}7;8;n+76XDi}i@M
z6pjKJ)52BSKRAiD9YbFpSu?XE{7=^=T%UEpSLSCUHl%$e-uS>+lP=wA%)J3wgXy=K
z_w6*`zngeN*51i*9c!#b-%utmUEexFA0B^n!8f68@cjT#PmFBLL(*TR9fLQ4n*lsS
z<B2nPAFR6y-IF@P_qN!C>)k2%#(93I)ixZC0_(#gYGiC0{agBN)}??rQ`YG4={4V@
z^BZf~|K~kiDpT-%-^o9?WP>}wTF?+atwsq*Zvc;mPuwJ1uOq=YFb13sIyu?f7x~nG
z4M?^gO>*N0{A8{AImj1%uCu|vY;1o^o{XV#H+I`whkCED@k#UF#<P|f!EN1?c`S)d
zZCm2i^WEBPFFop<mc+Lg(ya$uHzu*CxoX*n?&BbsZar<)r><n{(a3b{VrwX<2bzyt
z`3z+e&O*|uHyvH-dC$Q=S##6cL!<wIgDuVbeV$JTw}Z77-GntS9S-T}Qm2d~?T=Yb
zOJ%1o*MI>7d|D4XZ#&qkBmYv+^8QE%z;!_OoKml>d*ijOj*!^z*<6pAr=)j*-gb3n
zWc(!)^c8ST04u?refsnn;`jTvc)eb$ExDg<XG`+9qTn+iH#@+YPP%)WkL{7o^+;W2
zEOoLC&k(2rE3&d4ol{aW{JY-02Pin#Mx)Ukg@uJG7z~<iHDKHJ-RU}beh|?8>_^gr
z^|SVr*mYVrE=*PrTn_>3GBTDn1_IADgu@T0Zr#pM<>iMe+F6yAm8qPZ9L+hF%$9zJ
zFTVn{K+4HkOS`Vm*y{wo1KKYwH<6d6{cw`-Jpt4KrQ!F#sJeC?WpM7<v!@D$LSl2X
zlMQP=x}(5OAmu&)M(kqMqc7!w-r!&$R{?058?5?r&vgmV9L@56JAJ!6cs`-IYMGh&
zf+{H)YH;q-rHj~=^~rS%iSBqHbC;A|2wLVt`i>7?zXXqikHHt<6Yvxm(Z7Fx+cgav
za(474F!PkO)N_O#H@iGI4gs4rS1mhrnxT64?yY+D>ZO|JuL`^JPI>rXj)CTg9<~`G
zcU_*7Gvm{6c(xK06pU9rdK@KlM;vSdXV}@q-Xvh<D))c0(@&O%9}~b1%~hoI>+app
z5I<CYe!kcpo6LsYGs-;N>f=H8V0XQ_4xP@-T%ZaIujc(8EcJaxA4u5CVPhcB^MaN0
zRd#hJ%cI^huvFKtWh63H?Z5v(Ra#oA0)fCQ$!yp?!$%+Z6GvwBktr>6gtl*%nVB!^
z_q!d=6Z`e+XN+aamjgL#w(^vFId?9wt2<R5b<5n9;FI6~l8Q!$!g+s{mzTGle%&RN
z9qV)a$@X}Lt@e87CD^vsCHFZwQ;q%v-&ufip3}fLz>cfr&9&B-&OLR$Wc4FAcZ%VI
zv~f5bz9k)dTG#7+ai-O-(>*+Q5d%EOyL|{g5;Hk*mHeT)j<!gAkeF+g*%zO00rSaV
zWA5tQx%29D?P5z}oBPZ*ozgzvBE=fmke!_^T!ia#AangjVCDUfbbYbv<A=nV<3Ylj
zoS%QK(Z)S`^oSF8^{|#pc8{%Mu*cj$-X8tCQ>VLF2TOkP`Fyv+ub<fElKq;MtK8p|
ztX{Xz@S`hOZ1yJ*n5T-1Pc}Fg6%{R#H8c%-r<iRyrDeV<DH*nt{`?EGZFt>l!*@G*
zrDnaoN#m2mnx^-^R7E0FjJcZrR)<gh-P*^_6N$FWc3acAxwo>`ANB@&wS*W8UZ2|V
zo$t1Ow|e+E+w7;j|I*T7#yE!aoC6LxAmqjtHWJ2$*``isX3i&uJ-?<;pS~l^HsM)e
z!&UmSZA@Y=n{FCk%E1cllgRAsd*FMZtWVo$<Kt4<q|6QG@=j@Du7+N{20nz%g!6oO
z&9vdWk-W@Qb+_d?{*3?$v1Ye!=NRLdSo1An0>6`8%1I29FxPW$8Y8Xg;^N~ahOV&M
zg4b#rzIRyl+Up+wWGzV;f7#iyWSq%fq7m5kE6U`6J3vB=%KaXE!{K|y)*bLoIPZh!
zU>mNo4|hFxwB<eEqx5T28!siEo^14M{9KQphccEE_B80roNOwyCr_Reqs}FMJ8lhq
zCEMy7yySdL#;O^{?+dKD?R}4LW5E{jQQ-GKPpmuAXk+-wzOE(C<hiV8Df_X{x0t=r
zr0?h}wtWPif46WI-s9Svo1H!Um;U)6Xz7ok(1XVQm^QA3?*+OXI+M+MPU%qSQR2p5
zN}Qal%W4U)K|t@Hb^FS>Sh3dWXo=s_Zp+O6=jTtNUmNFMTYC09<}jYgeC%TVSx9Vg
z>|*A-Zgzgd>wchlYPnDPve_TFoM7fFd*q^`(~WkHMt{A^=Ue!h`MF(M;&I0RX4*Aj
zkE`o}XD-m^ewwRDSKq+2o%WJ&NQgtSvK}PHKU(GHPH)V}Skhp}(VQ0!-&a>sa>7_*
zmV`M@`v))i4r%5oX_=Recv|c2D~a#Yub&6ITX`&L8P~0Otz%v1@os90i-%02Z5_`N
z;q{IUU&rsc`+_(AOMJaf^Kc`j?-v%1yBn^ZoqU9+{JhsXPf7bubt<#3^5H0RldE=>
z^Ui{TE0(a%COvzBm+8DKp-&ImSG=tCz)|+da;9l}_GWzt%ul=W@~&ABjULqUn_{a?
zx##Kv<hz7*?5?%b-&c8oz|$weDP=sNdFSO#UD>_+Sp!q~2hWK%T!s5RsmgZ5bNZq$
z6q;V;^DU{?TvExryc=1c4_WK9_L%*I*M|;#k2mXebei-2jDmv84-bXrJP+6UR2=nl
z8M8%2O?xT$eh$tg7PCDUf#>lKTsM-Ru>bE!zI<Eg9EnW6C>Wf(mRQ2o+@$%6l=Ix;
z;t@tX0^e`JC=f9F3?KPU;`Gh=VY6;Wrb|nQ9+{ha^L)R5-cM!@snahfycgaT-yMZ>
zKiM~L1m}R3{W@GP1J*f8-*?#WzKCUg^tS@`J%<+-o;xcTd@5zEl*oPQPM>ee*IsWv
z-x6*Bue6kx7_v*3%Qfd8;5&x-AOoKAyK(8Wnx9#IPrj=&qjcIGo?+@A25#AJzq6jn
z$(gyH?>WSV?$%bV$Jy~hulK;pCf|kgwT)iyt2<ktFQA=`J*2er_uv$C?{eTOyyvCE
z!;P-YMWv;K=5*~k`pbfXiMv^A=!@=RL(QXE&Src^@$uAF|Aq6_8_asLzb`5pZj5Kn
zz`o*pMY7)kwafXkya#*;fzcr48HCwioAg)YNt~4<cDc@K<*WPXDId|d*PvsZ?fCsK
z$oKR(V@JLvn14ec2F$q9O`EyVp>BzPH-dz@CC&S#=$~M&4}YsHJ~#W{ZIjn~-8!%L
z&s(JqpYH`?=?md|kinUDHuKc!31-`SlcrADo42)XrQ8It$5{hhoz@jN$nPSKppVaK
ze#Z+q-@T0Ws@(Xd&UXv_+X>D0wY}kJE{m^nJ|q3m?H)(^qQsDonC+O;a6R9?Z4>$^
zT;$vNnecwx;4LyQZzSL34upHL<|<Nt1Jd$0ZRWb#n#O<W*E7H}V2m%MxsS^k-3lP>
zS>{v^e#y7m&w<(B6zRTjo&pw8-+YyoHJm+EfwfGVzP~#8Df#e_{Z1K}1~gaM``iHr
zf%0VK<r&xY>2cNXMcR6(QK#2?9^Ci%o!ef2^GxM?Tb{%9B2WY5Hx_L``Br|GAm!xu
z2|oeZ7s}tsEoqBCHf6|Cu~<}uid9FN<Z?OT=e|m!`W9K0*L07R6DL)5Nb|i_PG~A$
zHKE$DQ`Kz0Di*Ia%EeSn<kXm2UeP40qRmnY+!j;bubO0VH*!Wy1sjpU*zQQ&ko6H&
z$zQ(3ViC1W#SOVp#iOzMpjtJfAsTB4s!iS|8S~ax$bG#hRuPN)RK2&lBBn&%P#IIV
zA!Ep?D&`Zfv|O%Y!D{ZSRdwV)$XI2oe24q`isey}4HZ=thKzbDS8yMXcq(Uz40x1C
z74WKv$mKqZ491)Cqw%ObuZlJp($gg4o=ANK`SqTlA!8n2OzxKlj*V3!s{*5|kqw^Q
oveC$D&oRYS$mO0XxgL>Tj)o*Z!f_w6p#oWf#GpuCqFk~60n@5<m;e9(

literal 5438
zcmeI0>2nih9LIl~ZJVZ7(ko5cra9VV7f=Ls4M-sz1-Wl10z$b&%3-<7VUtqIEvJa0
zjEcvMFC5R&@t84n#y1|LZ+z!y^e+hI3Q)R!cQ@^BuF}Of&d4&~e4pR*{65d`d7d=M
zvP2C2)sH8<<`Q2{WF;aVs)s_5)IZS0Fbo+C24Y#3va+%$CntxDMkD3s=90-|qP)C3
z%FoZIf`S4nDk>tg*-RFTg^G)dsidTYN=r+rtgMX6%gd>vqJnHT8`<r4vRXY<Sy@R{
zRaI17T}=*$18jh5YHGlYBA3fWZnv8}9uL*l)>2(v9XUNi$?Nr!&*vkK<A~>Z@(meD
zg@t=jdmj`;`zY3O7Hhfyf0aBVX2LHaejoZ6>LTlmi&QY{3gyp+=0J0ydC;P6%3s_~
zd5zH0ZYtRD8|5uSdpWe?D&?)bN~R`g6|^Qwrqz-|YoT?Lu90cOHOg&<HbR@AE!Qcx
z1=<R2yH3XK&<<#)q#I=11+_wZpuNz(8<evjYP(4}L8u)%0ChkIq0XC>eJDoRhoPg;
zG3YpS0y=q%vQOQjtkcjL=qz*&I)97Ui?@k=4SF5A1if*G*f*iKpv!m2@HX@g^e*(?
z9b!J{A?Cxo#C!yO0(}a7c9-aL=!;&WFQKoXuc2?CZ$&b6iNt;<QqK1x<^Ld3!H*&p
z{v?w5XOS$wh*bQmNRHn{a{VEa`%jVT{uT%N(|a)XpE!XD4Gj~=-p@+LOq#Wzv2nrd
z$@<|jQ|GT(x1ssjl?$iqh9}KmwRwAM>yGEwESjPduAjAHb8E1(Gqks*X|6ujKViYT
z?ZM-xPM>Js_1xkHeQ-l#b8F|R^Dm!0ynoZusk&Hy!;<Dbht6Dh<=l}MHZPl|kDa)1
z{m%9m&%JcAV|VkC$$mYsf83m=mVF0~9y{2!ZS}l>9+YU*ltpW|?rv*q-L`)GQ)Be8
z{`#4VS2b_hvQZG87&%1#EgSp<{;|{MJ-z%H0aqQz>xG{TOqo7osssx*FMfOUTz>M8
z9_=R?7Obd!AD03<(pScAFpzOxg%x~h%F08-+&o{LW>D@@U^|~e$7dBPe4d;Pa9?3p
z(s&;#2$eo_(pZ0}BssmM{XKF+Wd**BNgPunC5v~cJyJ`<awUmFnn=lV`-(Ju39Q?c
zFrp0<b~x|Su1r%_uxkgjB-%=zgSTk<HEfkp)1T6m6Cd+Bv(*s|E8Y4HaLJhtu0&m&
z%9iC10AfhV<b3^yqM|~nVPIB)?YuLdra{Yd?}5e(dwAu2(x8H79~mc+@`w94d0fL<
z)g#D=DwV5vABz-~9h#S!P)C$}`Aa}Wh4OnHlrn)#3<In|9fK;{w^BRjQrU+xer2fZ
zjkjdTt)fCoM&=F;B{wr?rWr|u@xK^7mll3l52!t0L3mUbn!t{@e>CkEcE;%**X~uY
zr~jcyOJ^l47}HeY4{R_W1ETDNqH<v4xPr80k~*tXQ9-ETyoE`5$steHWHP>fD_1-4
zN5N?uo`Uv$fNh+s{|hX+Wb*kalPFnoyPR{|Q=oW9az(`bsq$D!ZN~R1mF-94>wbhA
zB&-3IrZl%L<GqNsatf-{zUTdhW}^vHNOLE2=nDP~tE<q1<p1*t^f*Q7ibl+ehmCP(
z6%WZCvJfN1c%G(sJVrms{e9yj;^Xk3l;0A@Llem(<b;P>uDPT_)FMiSE{CFG$SmT?
z3Y-=3G$x9tD`E`Zi-MAi2FclIuYrPn9z`q~DG()NwAUPRN-i41aC1~-!^Vi@ha+s5
zoKdkO!h~dx;YJH_R}61A{I3}9<^%8^+>!*NVg#$OAijc4HX+7JD1z5mFhpT^PcY0#
zaZiBQE_iQ%jO}o792q+#w-GD*5n_x|93pH*_1ic*sXt0gSn?1yp}09F<%P%@W8h)J
yIlv=$F~Fl(oYap6L`KUVhy>yul)Tp&R$^yJj(bcb$JmeT*l)5sC9d1T!2ba_6}hAU

diff --git a/src/model/view.cpp b/src/model/view.cpp
index 69b4d6f67..248dacb1d 100644
--- a/src/model/view.cpp
+++ b/src/model/view.cpp
@@ -389,17 +389,21 @@ Vec3<double> Model::guideToModel(double sx, double sy)
 	dbgBegin(Debug::Calls,"Model::guideToModel");
 	static Vec4<double> guidepoint;
 	static Vec3<double> newpoint;
+	static Mat4<double> rotmat;
 	double radius, depth;
-	depth = prefs.drawDepth();
+	depth = -rCamera_.z - prefs.drawDepth();
 	// First, project a point at the guide z-position into screen coordinates to get the guide 'yardstick'
-	newpoint.set(0.0,0.0,depth);
+	newpoint.set(rCamera_.x, rCamera_.y, depth);
+	rotmat = rotationMatrix_;
+	rotmat.invert();
+	newpoint *= rotmat;
 	guidepoint = worldToScreen(newpoint);
 	radius = guidepoint.w;
 	// Now, calculate the position of the clicked point on the guide
 	newpoint.x = sx - (gui.mainView.width() / 2.0 );
 	newpoint.y = (gui.mainView.height() - sy) - (gui.mainView.height() / 2.0 );
 	newpoint /= radius;
-	newpoint.z = depth + rCamera_.z;
+	newpoint.z = -prefs.drawDepth();
 	// Convert this world coordinate into model coordinates by multiplying by the inverse of the PM matrix.
 	newpoint *= viewMatrixInverse_;
 	// Also need to account for periodic systems (which are translated so the cell midpoint is centred in the screen) by adding the cell's centre coordinate
diff --git a/src/render/extra.cpp b/src/render/extra.cpp
index b329d611d..b4f238b46 100644
--- a/src/render/extra.cpp
+++ b/src/render/extra.cpp
@@ -25,13 +25,17 @@
 #include "methods/mc.h"
 #include "gui/canvas.h"
 
+// Local variables
+double editChainDistance = 0.0;
+
 // Render other 3D objects
 void Canvas::renderExtra3d()
 {
 	dbgBegin(Debug::Calls,"Canvas::renderExtra3d");
 	// Draw on 3D embellishments for active modes
 	static double radius;
-	static Vec3<double> r, mouse;
+	static char s[64];
+	static Vec3<double> r, mouse, textpos;
 	static Vec3<double> tempv;
 	static Atom *i;
 	// Draw on the selection highlights (for atoms in canvas.subsel)
@@ -41,16 +45,15 @@ void Canvas::renderExtra3d()
 	{
 		// Draw on the bounding sphere of a radial selection
 		case (Canvas::SelectRadialAction):
-			i = atomHover_;
-			if (i == NULL) break;
+			if (atomHover_ == NULL) break;
 			// Work out the radius of the sphere
 			tempv = rMouseDown_ - rMouseUp_;
 			radius = tempv.x * tempv.y;
-			radius /= i->screenRadius();
+			radius /= atomHover_->screenRadius();
 			// Convert the pixel radius into model coordinate radius. We will have the selection 'hotspot'
 			// radius of the atom from its screen projection, which itself depends on the drawing style...
-			radius *= prefs.screenRadius(i);
-			r = i->rWorld();
+			radius *= prefs.screenRadius(atomHover_);
+			r = atomHover_->rWorld();
 			glPushMatrix();
 			  glTranslatef(r.x,r.y,r.z);
 			  glScalef(radius,radius,radius);
@@ -65,6 +68,7 @@ void Canvas::renderExtra3d()
 			i = displayModel_->atomOnScreen(rMouseLast_.x, rMouseLast_.y);
 			if (i == NULL) mouse = displayModel_->guideToModel(rMouseLast_);
 			else mouse = i->r();
+			textpos = mouse;
 			mouse -= r;
 			glPushMatrix();
 			  glTranslated(r.x,r.y,r.z);
@@ -95,6 +99,9 @@ void Canvas::renderExtra3d()
 				}
 			  }
 			glPopMatrix();
+			// Draw text showing distance
+			sprintf(s," l = %f A",mouse.magnitude());
+			glText(textpos,s);
 			break;
 	}
 	dbgEnd(Debug::Calls,"Canvas::renderExtra3d");
@@ -105,7 +112,7 @@ void Canvas::renderExtra2d()
 {
 	dbgBegin(Debug::Calls,"Canvas::renderExtra2d");
 	// Draw on any 2D objects, e.g. selection boxes, labels etc.
-	static int n, i;
+	static int n, i, skip;
 	static double dx, dy, halfw;
 	// First set up a 2D drawing area...
 	glMatrixMode(GL_PROJECTION);		// Swap to projection matrix...
@@ -144,30 +151,33 @@ void Canvas::renderExtra2d()
 			dx = 1.0 / drawPixelWidth_;
 			halfw = width_ / 2.0;
 			i = int( halfw / dx);
-			if (i < 2) break;
+			//if (i < 2) break;
+			skip = 1;
+			while ( (i/skip) > 5)
+			{
+				skip += (skip == 1 ? 4 : 5);
+			}
 			glBegin(GL_LINES);
-			  for (n = -i; n <= i; n++)
+			  for (n = -i; n <= i; n ++)
 			  {
-				glVertex2d(halfw + n*dx, 10);
+				if ((n%skip) != 0) continue;
 				glVertex2d(halfw + n*dx, 20);
-				glVertex2d(halfw + (n+0.5)*dx, 10);
-				glVertex2d(halfw + (n+0.5)*dx, 15);
+				glVertex2d(halfw + n*dx, 10);
+				if (n != i) glVertex2d(halfw + (n+0.5*skip)*dx, 15);
+				if (n != i) glVertex2d(halfw + (n+0.5*skip)*dx, 10);
 			  }
 			  glVertex2d(halfw - i*dx, 11);
 			  glVertex2d(halfw + i*dx, 11);
 			glEnd();
-			for (n = -i; n < 0; n++) glText(halfw + n*dx - 8, 1, itoa(n));
-			for (n = 0; n <= i; n++) glText(halfw + n*dx - 3, 1, itoa(n));
+			for (n = -i; n <= i; n++)
+			{
+				if ((n%skip) != 0) continue;
+				glText(halfw + n*dx - (n < 0 ? 8 : 3), height_, itoa(n));
+			}
 			break;
 	}
-	// If the mouse is hovering over an atom, draw a circle around it...
-	if (atomHover_ != NULL)
-	{
-		Vec3<double> hoverpos = atomHover_->rScreen();
-		circlePrimitive(hoverpos.x,hoverpos.y,atomHover_->screenRadius());
-	}
 	// Add text
-	//text(1.0,h-12.0,displayModel_->name());
+	//glText(1.0,height_-12.0,displayModel_->name());
 	// Draw on colour scale if necessary
 	if (prefs.colourScheme() != Prefs::ElementScheme)
 	{