From b62ab5bb1a54141038dbeacc6536a9a75427b6f0 Mon Sep 17 00:00:00 2001 From: zepumph Date: Mon, 3 Jul 2017 11:48:50 -0800 Subject: [PATCH] update slider thumbs in RIAW, https://github.com/phetsims/sun/issues/289 https://github.com/phetsims/sun/issues/293, https://github.com/phetsims/resistance-in-a-wire/issues/88 --- assets/note.txt | 1 - images/license.json | 10 ---------- images/thumb.png | Bin 2819 -> 0 bytes js/resistance-in-a-wire/view/SliderUnit.js | 17 ++++++----------- 4 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 assets/note.txt delete mode 100644 images/license.json delete mode 100644 images/thumb.png diff --git a/assets/note.txt b/assets/note.txt deleted file mode 100644 index bcca6c4..0000000 --- a/assets/note.txt +++ /dev/null @@ -1 +0,0 @@ -The SVG asset used to generate the slider thumb png can be found in the assets directory of the Ohm's Law simulation. \ No newline at end of file diff --git a/images/license.json b/images/license.json deleted file mode 100644 index 65f5c5a..0000000 --- a/images/license.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "thumb.png": { - "text": [ - "Copyright 2002-2015 University of Colorado Boulder" - ], - "projectURL": "http://phet.colorado.edu", - "license": "contact phethelp@colorado.edu", - "notes": "created by Sharon Siman-Tov" - } -} \ No newline at end of file diff --git a/images/thumb.png b/images/thumb.png deleted file mode 100644 index 63cf0fe0bd03b6bac9a9b7c24952f0c0b439d550..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2819 zcmV+e3;gtnP)|948DMgCq2uK10Nr3o}OTJ0IQ$9fu134teTmt0kLxRWw z48f8UT9!qNn?w!C*_ZC=?n+fp&-7YdH6#$gtoHWcnbE(<9qP9y#a5Iz7O7$cC+RkY&D@X7$Y5t z{o?U``10(<}ucUo}SA0n-El>PC2cy)3CwlmKv4;BQ$Dwp7Z0qpcfNG!Db zEECygG2!zszRG+?R#$ZS;gQVu51r`S9YK@ABc%#9O)|zPr(cf#v`|e$a;V zP8X&#TcA9~iyCpqT|nGqgXGM1!1sME!QEqlqGl0z`TDK!J0z_;Blfz{sKID5(-PhT zmh%o-MR9Wep%`8~WW?RLYL#KmavPsgt-w{7;@YfSeg5jW@Oy;D+?6I=mt7kMRI641 zP$%2p*#OU{aQNn=7+(5DT4RKjC7$at^=Slecas$g0~k$5?zoy$4K%nswV7|O_(I72SL-&3msLEiXc^? zi5u5!tTQx&HxKd*DLk5!9>XfSQdv%OM@>a4v91cu`IW_|v$+SF2`_M4L&a^QfJ~5J{g%LnFkA9 zg-6$OTbgObI4&<#^rYuWR70qM_wqiUtD)VoP)(Nt#9YSbBN`=q>5by zblaTDf}87l=(e)zgRZ9XWHW0F7?JCGo-0X`W7j%Aa!gyLQepM2t(YW-Z*a_$xNY9L zD2i!H%5BY}JTKW4z%(UkwQ2==h2>eSl}rJ!6_t*j#Yu8BFL@CxklqSXq1$F6F2zt0 zvwE#s1TWIw^06%{Ptk4D+M^WRHtDt{wel=*Sq9EDC{hcpQLl>1vz+HYKE(uCskRO2 z#kx_LAPehTU*NXOZILL&@h;bOYplMV7mRrnBkelz)?9S(XzqeNw4~eSz>A>Kuql9+ z=eG4Cc&NH{&7`rhZov-$=2@j;NtB1&gjTik;L&sk83`&U$;qk~;O~F=15yzMjVHen z=Xo69>({T5lE8kMhL`rzXaJm)~6kGo;Xx z*6Z~o@L;hovaQ*s(kkY9t{k2L*bL1x$F}9smMahEJQ)i)kbW$;qc z3nn=7Tm^GIkSi}8HVmm`b+OTSvJSiuAWv7&Z3_cu!A4xzj^{R+&DMvvV2;tYsJlc& zvg4sb_wA5Gl|_^!7l=#u2SKtUxl^Z4C6gAuh)QSi%>^CgY-51NGin;ku=S$1 zS!I!^Fw#dl&_uxSw3~Y2`M#p^;(#Uq zn1ftcVdNAStNXmhwXD0ZzIFaWQ=FvG#5>h`?}u((g;tcnZH1{GG|MJ5*|$$G2eFAj zG(IaRwL{DQ-_kR_ivK4xcelHBcJ`3EEw@^Qz-FTY=a+rBxa{3&<&iZSAf`lcfj!-C z2T|zas(!|4fxOyK5B0U9puwaSDRF2rM_AXY{yYh zUQVdxxAwN0&>KymKhkeQLVn^@x4(|t#uC1RofcGBIrj4CUC>q0&8&(gedL;T+wjKY zdz-Azv!T-)gRWMq@namE^#aCDs|Ho3x^Ip@XgAg+;5F*d@AnJf?x z-aFTtCV>(mlI@UU0fU!en~f@b`R%EeV_n*+)hgJ6#e2!d0K0h1(vvw$hR?2stZ>FT zDz!!v`n{eAUepV*hzZ-x8vOUT1J2wBz)c#!Fw0P8NwYTSvObsL*Wcux;@tnSE$cil14kyyFfVtHS*8tQ)n3;@Pb V5-vRhyHo%G002ovPDHLkV1kliY=i&+ diff --git a/js/resistance-in-a-wire/view/SliderUnit.js b/js/resistance-in-a-wire/view/SliderUnit.js index 8860b53..e48e2e9 100644 --- a/js/resistance-in-a-wire/view/SliderUnit.js +++ b/js/resistance-in-a-wire/view/SliderUnit.js @@ -11,7 +11,6 @@ define( function( require ) { var inherit = require( 'PHET_CORE/inherit' ); var Dimension2 = require( 'DOT/Dimension2' ); var HSlider = require( 'SUN/HSlider' ); - var Image = require( 'SCENERY/nodes/Image' ); var Node = require( 'SCENERY/nodes/Node' ); var Text = require( 'SCENERY/nodes/Text' ); var Util = require( 'DOT/Util' ); @@ -19,11 +18,10 @@ define( function( require ) { var ResistanceInAWireConstants = require( 'RESISTANCE_IN_A_WIRE/resistance-in-a-wire/ResistanceInAWireConstants' ); var RichText = require( 'SCENERY_PHET/RichText' ); - // images - var thumbImage = require( 'image!RESISTANCE_IN_A_WIRE/thumb.png' ); - // constants var MAX_TEXT_WIDTH = ResistanceInAWireConstants.SLIDERS_HORIZONTAL_SEPARATION * 0.90; // Max text width for labels + var THUMB_FILL_ENABLED = '#81aac2'; // dark grey + var THUMB_FILL_HIGHLIGHTED = '#a5becd'; // light steel blue /** * @param {Property.} property @@ -32,6 +30,7 @@ define( function( require ) { * @param {string} nameString * @param {string} unitString * @param {Tandem} tandem + * @param {object} options * @constructor */ function SliderUnit( property, range, symbolString, nameString, unitString, tandem, options ) { @@ -66,16 +65,12 @@ define( function( require ) { tandem: tandem.createTandem( 'nameText' ) } ); - // Thumb for the slider - var thumb = new Image( thumbImage, { rotation: Math.PI / 2, tandem: tandem.createTandem( 'thumb' ) } ); - thumb.scale( ResistanceInAWireConstants.THUMB_HEIGHT / thumb.height ); - thumb.touchArea = thumb.localBounds.dilated( 30 ); - var slider = new HSlider( property, range, { trackFillEnabled: 'black', rotation: -Math.PI / 2, - trackSize: new Dimension2( ResistanceInAWireConstants.SLIDER_HEIGHT - 2 * thumb.height, 4 ), - thumbNode: thumb, + trackSize: new Dimension2( ResistanceInAWireConstants.SLIDER_HEIGHT - 30, 4 ), + thumbFillEnabled: THUMB_FILL_ENABLED, + thumbFillHighlighted: THUMB_FILL_HIGHLIGHTED, x: 0, centerY: sliderCenterY, tandem: tandem.createTandem( 'slider' ),