Skip to content

Commit fc1a73b

Browse files
jzkelterjzkelter
authored
Merge pull request #428 from NetLogo/netlogo7-widget-resizing-umit
Resized the widgets of 6 models for NetLogo 7 release
2 parents 400f3c1 + 2e85ece commit fc1a73b

6 files changed

Lines changed: 117 additions & 117 deletions

File tree

‎Sample Models/Biology/Evolution/Genetic Drift/GenDrift P local.nlogox‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta0" snapToGrid="false">
2+
<model version="NetLogo 7.0.0-beta0" snapToGrid="true">
33
<code>to setup
44
clear-all
55
ask patches ;; randomly set the patches' colors
@@ -24,11 +24,11 @@ end
2424
; Copyright 1997 Uri Wilensky.
2525
; See Info tab for full copyright and license.</code>
2626
<widgets>
27-
<view x="335" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-30" height="370" showTickCounter="true" patchSize="6.0" fontSize="10" wrappingAllowedY="true" width="370" tickCounterLabel="ticks" maxPycor="30" updateMode="1" maxPxcor="30" minPxcor="-30"></view>
28-
<button x="159" y="97" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="go" width="68" sizeVersion="0">go</button>
29-
<button x="71" y="97" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="setup" width="72" sizeVersion="0">setup</button>
30-
<slider x="66" step="1" y="55" max="10" display="colors" height="33" min="2" direction="Horizontal" default="5.0" variable="colors" width="161" sizeVersion="0"></slider>
31-
<plot x="5" autoPlotX="true" yMax="200.0" autoPlotY="true" yAxis="Number" y="170" xMin="0.0" height="212" legend="false" xMax="100.0" yMin="0.0" xAxis="Time" display="Patch Colors" width="327" sizeVersion="0">
27+
<view x="320" wrappingAllowedX="true" y="7" frameRate="30.0" minPycor="-30" height="370" showTickCounter="true" patchSize="6.0" fontSize="10" wrappingAllowedY="true" width="370" tickCounterLabel="ticks" maxPycor="30" updateMode="1" maxPxcor="30" minPxcor="-30"></view>
28+
<slider x="5" step="1" y="7" max="10" width="300" display="colors" height="50" min="2" direction="Horizontal" default="5.0" variable="colors"></slider>
29+
<button x="5" y="70" height="50" disableUntilTicks="false" forever="false" kind="Observer" width="72" display="setup">setup</button>
30+
<button x="85" y="70" height="50" disableUntilTicks="true" forever="true" kind="Observer" width="90" display="go">go</button>
31+
<plot x="5" autoPlotX="true" yMax="200.0" autoPlotY="true" yAxis="Number" y="165" xMin="0.0" height="212" legend="false" xMax="100.0" yMin="0.0" width="305" xAxis="Time" display="Patch Colors">
3232
<setup></setup>
3333
<update></update>
3434
<pen interval="1.0" mode="0" display="color5" color="-7500403" legend="true">

‎Sample Models/Biology/Evolution/Genetic Drift/GenDrift T interact.nlogox‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta0" snapToGrid="false">
2+
<model version="NetLogo 7.0.0-beta0" snapToGrid="true">
33
<code><![CDATA[globals [
44
max-percent ;; percent of the total population that is in the
55
;; most populous group
@@ -96,12 +96,9 @@ end
9696
; Copyright 1997 Uri Wilensky.
9797
; See Info tab for full copyright and license.]]></code>
9898
<widgets>
99-
<view x="305" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-17" height="424" showTickCounter="true" patchSize="12.0" fontSize="10" wrappingAllowedY="true" width="424" tickCounterLabel="ticks" maxPycor="17" updateMode="1" maxPxcor="17" minPxcor="-17"></view>
100-
<button x="98" y="80" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="go" width="73" sizeVersion="0">go</button>
101-
<button x="18" y="80" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="setup" width="77" sizeVersion="0">setup</button>
102-
<slider x="158" step="1" y="36" max="10" display="colors" height="33" min="2" direction="Horizontal" default="5.0" variable="colors" width="129" sizeVersion="0"></slider>
103-
<slider x="15" step="1" y="36" max="1000" display="number" height="33" min="1" direction="Horizontal" default="300.0" variable="number" width="141" sizeVersion="0"></slider>
104-
<plot x="5" autoPlotX="true" yMax="70.0" autoPlotY="true" yAxis="Number" y="130" xMin="0.0" height="223" legend="false" xMax="100.0" yMin="0.0" xAxis="Time" display="Turtle Populations" width="293" sizeVersion="0">
99+
<view x="455" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-17" height="465" showTickCounter="true" patchSize="13.17143" fontSize="10" wrappingAllowedY="true" width="465" tickCounterLabel="ticks" maxPycor="17" updateMode="1" maxPxcor="17" minPxcor="-17"></view>
100+
<monitor x="35" precision="2" y="170" height="60" fontSize="11" width="117" display="% most populous">max-percent</monitor>
101+
<plot x="10" autoPlotX="true" yMax="70.0" autoPlotY="true" yAxis="Number" y="140" xMin="0.0" height="223" legend="false" xMax="100.0" yMin="0.0" width="360" xAxis="Time" display="Turtle Populations">
105102
<setup>set-plot-y-range 0 count turtles</setup>
106103
<update></update>
107104
<pen interval="1.0" mode="0" display="color5" color="-7500403" legend="true">
@@ -145,12 +142,15 @@ end
145142
<update>plot count turtles with [color = 95]</update>
146143
</pen>
147144
</plot>
148-
<monitor x="35" precision="2" y="151" height="45" fontSize="11" display="% most populous" width="117" sizeVersion="0">max-percent</monitor>
149-
<button x="5" y="421" height="33" disableUntilTicks="false" forever="true" kind="Observer" width="90" sizeVersion="0">place-wall</button>
150-
<button x="100" y="421" height="33" disableUntilTicks="false" forever="true" kind="Observer" width="95" sizeVersion="0">remove-wall</button>
151-
<button x="200" y="421" height="33" disableUntilTicks="false" forever="false" kind="Observer" width="100" sizeVersion="0">remove-all-walls</button>
152-
<note x="24" y="391" height="28" textColorLight="-16777216" fontSize="10" width="257" markdown="false">As the model runs, you may optionally create and
145+
<note x="10" y="375" backgroundDark="0" fontSize="12" width="285" markdown="false" height="41" textColorDark="-1" textColorLight="-16777216" backgroundLight="0">As the model runs, you may optionally create and
153146
remove walls that separate groups of turtles.</note>
147+
<button x="9" y="425" height="50" disableUntilTicks="false" forever="true" kind="Observer" width="90">place-wall</button>
148+
<button x="104" y="425" height="50" disableUntilTicks="false" forever="true" kind="Observer" width="96">remove-wall</button>
149+
<button x="205" y="425" height="50" disableUntilTicks="false" forever="false" kind="Observer" width="104">remove-all-walls</button>
150+
<slider x="7" step="1" y="9" max="1000" width="215" display="number" height="50" min="1" direction="Horizontal" default="300.0" variable="number"></slider>
151+
<slider x="230" step="1" y="10" max="10" width="215" display="colors" height="50" min="2" direction="Horizontal" default="5.0" variable="colors"></slider>
152+
<button x="10" y="75" height="50" disableUntilTicks="false" forever="false" kind="Observer" width="77" display="setup">setup</button>
153+
<button x="90" y="75" height="50" disableUntilTicks="true" forever="true" kind="Observer" width="85" display="go">go</button>
154154
</widgets>
155155
<info><![CDATA[## WHAT IS IT?
156156

‎Sample Models/Biology/Evolution/Genetic Drift/GenDrift T reproduce.nlogox‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta0" snapToGrid="false">
2+
<model version="NetLogo 7.0.0-beta0" snapToGrid="true">
33
<code><![CDATA[to setup
44
clear-all
55
create-turtles number [
@@ -44,12 +44,12 @@ end
4444
; Copyright 1997 Uri Wilensky.
4545
; See Info tab for full copyright and license.]]></code>
4646
<widgets>
47-
<view x="320" wrappingAllowedX="true" y="10" frameRate="30.0" minPycor="-22" height="409" showTickCounter="true" patchSize="9.0" fontSize="10" wrappingAllowedY="true" width="409" tickCounterLabel="ticks" maxPycor="22" updateMode="1" maxPxcor="22" minPxcor="-22"></view>
48-
<button x="114" y="33" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="go" width="74" sizeVersion="0">go</button>
49-
<button x="28" y="33" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="setup" width="75" sizeVersion="0">setup</button>
50-
<slider x="33" step="1" y="77" max="10" display="colors" height="33" min="2" direction="Horizontal" default="5.0" variable="colors" width="148" sizeVersion="0"></slider>
51-
<slider x="28" step="1" y="114" max="1000" display="number" height="33" min="1" direction="Horizontal" default="500.0" variable="number" width="161" sizeVersion="0"></slider>
52-
<plot x="4" autoPlotX="true" yMax="50.0" autoPlotY="true" yAxis="Number" y="162" xMin="0.0" height="254" legend="false" xMax="50.0" yMin="0.0" xAxis="Time" display="Turtle Populations" width="313" sizeVersion="0">
47+
<view x="400" wrappingAllowedX="true" y="7" frameRate="30.0" minPycor="-22" height="435" showTickCounter="true" patchSize="9.58" fontSize="10" wrappingAllowedY="true" width="435" tickCounterLabel="ticks" maxPycor="22" updateMode="1" maxPxcor="22" minPxcor="-22"></view>
48+
<button x="4" y="7" height="50" disableUntilTicks="false" forever="false" kind="Observer" width="75" display="setup">setup</button>
49+
<button x="90" y="7" height="50" disableUntilTicks="true" forever="true" kind="Observer" width="90" display="go">go</button>
50+
<slider x="5" step="1" y="71" max="10" width="250" display="colors" height="50" min="2" direction="Horizontal" default="5.0" variable="colors"></slider>
51+
<slider x="5" step="1" y="125" max="1000" width="250" display="number" height="50" min="1" direction="Horizontal" default="500.0" variable="number"></slider>
52+
<plot x="5" autoPlotX="true" yMax="50.0" autoPlotY="true" yAxis="Number" y="190" xMin="0.0" height="254" legend="false" xMax="50.0" yMin="0.0" width="380" xAxis="Time" display="Turtle Populations">
5353
<setup>set-plot-y-range 0 count turtles</setup>
5454
<update></update>
5555
<pen interval="1.0" mode="0" display="color5" color="-7500403" legend="true">
@@ -93,7 +93,7 @@ end
9393
<update>plot count turtles with [color = 95]</update>
9494
</pen>
9595
</plot>
96-
<monitor x="220" precision="0" y="75" height="45" fontSize="11" display="Total Turtles" width="86" sizeVersion="0">count turtles</monitor>
96+
<monitor x="290" precision="0" y="70" height="60" fontSize="11" width="100" display="Total Turtles">count turtles</monitor>
9797
</widgets>
9898
<info><![CDATA[## WHAT IS IT?
9999

‎Sample Models/Biology/Evolution/Peppered Moths.nlogox‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<model version="NetLogo 7.0.0-beta0" snapToGrid="false">
2+
<model version="NetLogo 7.0.0-beta0" snapToGrid="true">
33
<code><![CDATA[breed [moths moth] ;; might extend the model with other breeds: birds, bugs, etc.
44
55
moths-own [
@@ -178,9 +178,8 @@ end
178178
; Copyright 1997 Uri Wilensky.
179179
; See Info tab for full copyright and license.]]></code>
180180
<widgets>
181-
<view x="296" wrappingAllowedX="true" y="10" frameRate="15.0" minPycor="-20" height="414" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="true" width="334" tickCounterLabel="ticks" maxPycor="20" updateMode="1" maxPxcor="16" minPxcor="-16"></view>
182-
<slider x="4" step="1" y="152" max="200" display="num-moths" height="33" min="0" direction="Horizontal" default="100.0" variable="num-moths" width="258" sizeVersion="0"></slider>
183-
<plot x="642" autoPlotX="true" yMax="200.0" autoPlotY="true" yAxis="Moth Color Count" y="36" xMin="0.0" height="299" legend="true" xMax="100.0" yMin="0.0" xAxis="Time" display="Moth Colors Over Time" width="300" sizeVersion="0">
181+
<view x="345" wrappingAllowedX="true" y="5" frameRate="15.0" minPycor="-20" height="414" showTickCounter="true" patchSize="10.0" fontSize="10" wrappingAllowedY="true" width="334" tickCounterLabel="ticks" maxPycor="20" updateMode="1" maxPxcor="16" minPxcor="-16"></view>
182+
<plot x="690" autoPlotX="true" yMax="200.0" autoPlotY="true" yAxis="Moth Color Count" y="5" xMin="0.0" height="299" legend="true" xMax="100.0" yMin="0.0" width="300" xAxis="Time" display="Moth Colors Over Time">
184183
<setup>set-plot-y-range 0 upper-bound</setup>
185184
<update></update>
186185
<pen interval="1.0" mode="0" display="Light" color="-1184463" legend="true">
@@ -200,19 +199,20 @@ end
200199
<update>plot ((upper-bound / 3) * darkness / 8)</update>
201200
</pen>
202201
</plot>
203-
<button x="4" y="41" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="setup" width="55" sizeVersion="0">setup</button>
204-
<monitor x="4" precision="0" y="316" height="45" fontSize="11" display="Light Moths" width="82" sizeVersion="0">light-moths</monitor>
205-
<monitor x="200" precision="0" y="316" height="45" fontSize="11" display="Dark Moths" width="88" sizeVersion="0">dark-moths</monitor>
206-
<monitor x="92" precision="0" y="316" height="45" fontSize="11" display="Medium Moths" width="103" sizeVersion="0">medium-moths</monitor>
207-
<button x="65" y="41" height="33" disableUntilTicks="true" forever="true" kind="Observer" display="go" width="56" sizeVersion="0">go</button>
208-
<slider x="4" step="1.0" y="261" max="100.0" display="mutation" height="33" min="0.0" direction="Horizontal" default="15.0" variable="mutation" width="260" sizeVersion="0"></slider>
209-
<slider x="4" step="1.0" y="206" max="100.0" display="selection" height="33" min="0.0" direction="Horizontal" default="50.0" variable="selection" width="259" sizeVersion="0"></slider>
210-
<monitor x="4" precision="0" y="378" height="45" fontSize="11" display="Total Moths" width="81" sizeVersion="0">light-moths + medium-moths + dark-moths</monitor>
211-
<button x="4" y="91" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="pollute" width="55" sizeVersion="0">pollute-world</button>
212-
<button x="65" y="91" height="33" disableUntilTicks="false" forever="false" kind="Observer" display="clean up" width="67" sizeVersion="0">clean-up-world</button>
213-
<monitor x="92" precision="1" y="378" height="45" fontSize="11" display="Pollution (%)" width="102" sizeVersion="0">100 * darkness / 8</monitor>
214-
<slider x="144" step="1.0" y="91" max="100.0" display="speed" height="33" min="1.0" direction="Horizontal" default="10.0" variable="speed" width="133" sizeVersion="0"></slider>
215-
<switch x="127" y="41" height="33" on="false" variable="cycle-pollution?" display="cycle-pollution?" width="151" sizeVersion="0"></switch>
202+
<switch x="145" y="5" height="38" on="false" variable="cycle-pollution?" width="190" display="cycle-pollution?"></switch>
203+
<monitor x="235" precision="0" y="300" height="60" fontSize="11" width="100" display="Dark Moths">dark-moths</monitor>
204+
<monitor x="120" precision="0" y="299" height="60" fontSize="11" width="103" display="Medium Moths">medium-moths</monitor>
205+
<monitor x="9" precision="0" y="299" height="60" fontSize="11" width="100" display="Light Moths">light-moths</monitor>
206+
<slider x="145" step="1.0" y="55" max="100.0" width="190" display="speed" height="50" min="1.0" direction="Horizontal" default="41.0" variable="speed"></slider>
207+
<slider x="5" step="1.0" y="240" max="100.0" width="330" display="mutation" height="50" min="0.0" direction="Horizontal" default="15.0" variable="mutation"></slider>
208+
<slider x="5" step="1.0" y="180" max="100.0" width="330" display="selection" height="50" min="0.0" direction="Horizontal" default="50.0" variable="selection"></slider>
209+
<slider x="5" step="1" y="120" max="200" width="330" display="num-moths" height="50" min="0" direction="Horizontal" default="100.0" variable="num-moths"></slider>
210+
<button x="65" y="55" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="70" display="clean up">clean-up-world</button>
211+
<button x="5" y="55" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="55" display="pollute">pollute-world</button>
212+
<button x="5" y="5" height="35" disableUntilTicks="false" forever="false" kind="Observer" width="55" display="setup">setup</button>
213+
<button x="65" y="5" height="35" disableUntilTicks="true" forever="true" kind="Observer" width="70" display="go">go</button>
214+
<monitor x="65" precision="0" y="370" height="60" fontSize="11" width="100" display="Total Moths">light-moths + medium-moths + dark-moths</monitor>
215+
<monitor x="180" precision="1" y="370" height="60" fontSize="11" width="102" display="Pollution (%)">100 * darkness / 8</monitor>
216216
</widgets>
217217
<info><![CDATA[## WHAT IS IT?
218218

0 commit comments

Comments
 (0)