Shape editor has name. & put named shapes into line of sight puzzle

This commit is contained in:
Tim Young 2018-03-06 14:34:29 -06:00
parent 690369ae9c
commit bd300d9c10
4 changed files with 265 additions and 67 deletions

View File

@ -13,7 +13,7 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<showlabels>host</showlabels> <showlabels>host</showlabels>
<level>5</level> <level>5</level>
<sortorder>7.5</sortorder> <sortorder>7.5</sortorder>
<uniqueidentifier>343</uniqueidentifier> <uniqueidentifier>345</uniqueidentifier>
<startinghelplevel>hints</startinghelplevel> <startinghelplevel>hints</startinghelplevel>
<vlansenabled>True</vlansenabled> <vlansenabled>True</vlansenabled>
<VLANPacketColors>False</VLANPacketColors> <VLANPacketColors>False</VLANPacketColors>
@ -43,6 +43,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>176</uniqueidentifier> <uniqueidentifier>176</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -67,6 +69,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>wan</nictype> <nictype>wan</nictype>
<uniqueidentifier>179</uniqueidentifier> <uniqueidentifier>179</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>wan0</nicname> <nicname>wan0</nicname>
<myip> <myip>
@ -91,6 +95,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>177</uniqueidentifier> <uniqueidentifier>177</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -115,6 +121,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>178</uniqueidentifier> <uniqueidentifier>178</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth1</nicname> <nicname>eth1</nicname>
<myip> <myip>
@ -154,6 +162,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>191</uniqueidentifier> <uniqueidentifier>191</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -178,6 +188,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>192</uniqueidentifier> <uniqueidentifier>192</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -217,6 +229,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>133</uniqueidentifier> <uniqueidentifier>133</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -241,6 +255,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>management_interface</nictype> <nictype>management_interface</nictype>
<uniqueidentifier>134</uniqueidentifier> <uniqueidentifier>134</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>management_interface0</nicname> <nicname>management_interface0</nicname>
<myip> <myip>
@ -265,6 +281,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>135</uniqueidentifier> <uniqueidentifier>135</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port1</nicname> <nicname>port1</nicname>
<myip> <myip>
@ -289,6 +307,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>136</uniqueidentifier> <uniqueidentifier>136</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port2</nicname> <nicname>port2</nicname>
<myip> <myip>
@ -313,6 +333,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>137</uniqueidentifier> <uniqueidentifier>137</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port3</nicname> <nicname>port3</nicname>
<myip> <myip>
@ -337,6 +359,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>138</uniqueidentifier> <uniqueidentifier>138</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port4</nicname> <nicname>port4</nicname>
<myip> <myip>
@ -361,6 +385,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>139</uniqueidentifier> <uniqueidentifier>139</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port5</nicname> <nicname>port5</nicname>
<myip> <myip>
@ -385,6 +411,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>140</uniqueidentifier> <uniqueidentifier>140</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port6</nicname> <nicname>port6</nicname>
<myip> <myip>
@ -409,6 +437,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>141</uniqueidentifier> <uniqueidentifier>141</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port7</nicname> <nicname>port7</nicname>
<myip> <myip>
@ -448,6 +478,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>143</uniqueidentifier> <uniqueidentifier>143</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -472,6 +504,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>management_interface</nictype> <nictype>management_interface</nictype>
<uniqueidentifier>144</uniqueidentifier> <uniqueidentifier>144</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>management_interface0</nicname> <nicname>management_interface0</nicname>
<myip> <myip>
@ -496,6 +530,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>145</uniqueidentifier> <uniqueidentifier>145</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port1</nicname> <nicname>port1</nicname>
<myip> <myip>
@ -520,6 +556,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>146</uniqueidentifier> <uniqueidentifier>146</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port2</nicname> <nicname>port2</nicname>
<myip> <myip>
@ -544,6 +582,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>147</uniqueidentifier> <uniqueidentifier>147</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port3</nicname> <nicname>port3</nicname>
<myip> <myip>
@ -568,6 +608,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>148</uniqueidentifier> <uniqueidentifier>148</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port4</nicname> <nicname>port4</nicname>
<myip> <myip>
@ -592,6 +634,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>149</uniqueidentifier> <uniqueidentifier>149</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port5</nicname> <nicname>port5</nicname>
<myip> <myip>
@ -616,6 +660,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>150</uniqueidentifier> <uniqueidentifier>150</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port6</nicname> <nicname>port6</nicname>
<myip> <myip>
@ -640,6 +686,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>151</uniqueidentifier> <uniqueidentifier>151</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port7</nicname> <nicname>port7</nicname>
<myip> <myip>
@ -679,6 +727,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>284</uniqueidentifier> <uniqueidentifier>284</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -703,6 +753,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>management_interface</nictype> <nictype>management_interface</nictype>
<uniqueidentifier>285</uniqueidentifier> <uniqueidentifier>285</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>management_interface0</nicname> <nicname>management_interface0</nicname>
<myip> <myip>
@ -727,6 +779,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>286</uniqueidentifier> <uniqueidentifier>286</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port1</nicname> <nicname>port1</nicname>
<myip> <myip>
@ -751,6 +805,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>287</uniqueidentifier> <uniqueidentifier>287</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port2</nicname> <nicname>port2</nicname>
<myip> <myip>
@ -775,6 +831,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>288</uniqueidentifier> <uniqueidentifier>288</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port3</nicname> <nicname>port3</nicname>
<myip> <myip>
@ -799,6 +857,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>289</uniqueidentifier> <uniqueidentifier>289</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port4</nicname> <nicname>port4</nicname>
<myip> <myip>
@ -823,6 +883,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>290</uniqueidentifier> <uniqueidentifier>290</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port5</nicname> <nicname>port5</nicname>
<myip> <myip>
@ -847,6 +909,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>291</uniqueidentifier> <uniqueidentifier>291</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port6</nicname> <nicname>port6</nicname>
<myip> <myip>
@ -871,6 +935,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>292</uniqueidentifier> <uniqueidentifier>292</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port7</nicname> <nicname>port7</nicname>
<myip> <myip>
@ -910,6 +976,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>110</uniqueidentifier> <uniqueidentifier>110</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -934,6 +1002,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>111</uniqueidentifier> <uniqueidentifier>111</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -973,6 +1043,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>113</uniqueidentifier> <uniqueidentifier>113</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -997,6 +1069,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>114</uniqueidentifier> <uniqueidentifier>114</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1036,6 +1110,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>116</uniqueidentifier> <uniqueidentifier>116</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1060,6 +1136,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>117</uniqueidentifier> <uniqueidentifier>117</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1099,6 +1177,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>119</uniqueidentifier> <uniqueidentifier>119</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1123,6 +1203,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>120</uniqueidentifier> <uniqueidentifier>120</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1162,6 +1244,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>183</uniqueidentifier> <uniqueidentifier>183</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1186,6 +1270,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>184</uniqueidentifier> <uniqueidentifier>184</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1210,6 +1296,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>185</uniqueidentifier> <uniqueidentifier>185</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth1</nicname> <nicname>eth1</nicname>
<myip> <myip>
@ -1249,6 +1337,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>187</uniqueidentifier> <uniqueidentifier>187</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1273,6 +1363,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>188</uniqueidentifier> <uniqueidentifier>188</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1297,6 +1389,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>189</uniqueidentifier> <uniqueidentifier>189</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth1</nicname> <nicname>eth1</nicname>
<myip> <myip>
@ -1342,6 +1436,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>303</uniqueidentifier> <uniqueidentifier>303</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1366,6 +1462,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>304</uniqueidentifier> <uniqueidentifier>304</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1405,6 +1503,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>101</uniqueidentifier> <uniqueidentifier>101</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1429,6 +1529,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>102</uniqueidentifier> <uniqueidentifier>102</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1468,6 +1570,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>104</uniqueidentifier> <uniqueidentifier>104</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1492,6 +1596,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>105</uniqueidentifier> <uniqueidentifier>105</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1531,6 +1637,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>107</uniqueidentifier> <uniqueidentifier>107</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1555,6 +1663,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>108</uniqueidentifier> <uniqueidentifier>108</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1594,6 +1704,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>226</uniqueidentifier> <uniqueidentifier>226</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1618,6 +1730,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>227</uniqueidentifier> <uniqueidentifier>227</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1657,6 +1771,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>229</uniqueidentifier> <uniqueidentifier>229</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1681,6 +1797,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>230</uniqueidentifier> <uniqueidentifier>230</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -1720,6 +1838,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>124</uniqueidentifier> <uniqueidentifier>124</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1744,6 +1864,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>125</uniqueidentifier> <uniqueidentifier>125</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth1</nicname> <nicname>eth1</nicname>
<myip> <myip>
@ -1939,6 +2061,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>155</uniqueidentifier> <uniqueidentifier>155</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -1989,6 +2113,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>157</uniqueidentifier> <uniqueidentifier>157</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port2</nicname> <nicname>port2</nicname>
<myip> <myip>
@ -2013,6 +2139,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>158</uniqueidentifier> <uniqueidentifier>158</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port3</nicname> <nicname>port3</nicname>
<myip> <myip>
@ -2037,6 +2165,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>159</uniqueidentifier> <uniqueidentifier>159</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port4</nicname> <nicname>port4</nicname>
<myip> <myip>
@ -2061,6 +2191,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>port</nictype> <nictype>port</nictype>
<uniqueidentifier>160</uniqueidentifier> <uniqueidentifier>160</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>port5</nicname> <nicname>port5</nicname>
<myip> <myip>
@ -2100,6 +2232,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>315</uniqueidentifier> <uniqueidentifier>315</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -2124,6 +2258,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>316</uniqueidentifier> <uniqueidentifier>316</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -2163,6 +2299,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>318</uniqueidentifier> <uniqueidentifier>318</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -2187,6 +2325,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>319</uniqueidentifier> <uniqueidentifier>319</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -2226,6 +2366,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>321</uniqueidentifier> <uniqueidentifier>321</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -2250,6 +2392,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>322</uniqueidentifier> <uniqueidentifier>322</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -2289,6 +2433,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>lo</nictype> <nictype>lo</nictype>
<uniqueidentifier>324</uniqueidentifier> <uniqueidentifier>324</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>lo0</nicname> <nicname>lo0</nicname>
<myip> <myip>
@ -2313,6 +2459,8 @@ To see the problem, try to ping google and the server from pc1. Then, move the
<nictype>eth</nictype> <nictype>eth</nictype>
<uniqueidentifier>325</uniqueidentifier> <uniqueidentifier>325</uniqueidentifier>
<usesdhcp>False</usesdhcp> <usesdhcp>False</usesdhcp>
<encryptionkey />
<ssid />
<interface> <interface>
<nicname>eth0</nicname> <nicname>eth0</nicname>
<myip> <myip>
@ -2545,7 +2693,7 @@ To see the problem, try to ping google and the server from pc1. Then, move the
</DstNic> </DstNic>
<hostname /> <hostname />
<linktype>wireless</linktype> <linktype>wireless</linktype>
<uniqueidentifier>342</uniqueidentifier> <uniqueidentifier>344</uniqueidentifier>
</link> </link>
<nettest> <nettest>
<shost>pc1</shost> <shost>pc1</shost>
@ -2559,114 +2707,133 @@ To see the problem, try to ping google and the server from pc1. Then, move the
</nettest> </nettest>
<tag>WirelessRepeater</tag> <tag>WirelessRepeater</tag>
<shape> <shape>
<name>Grass</name>
<what>rectangle</what> <what>rectangle</what>
<where>3, 7, 1013, 1004</where> <where>3, 7, 1013, 1004</where>
<fillcolor>Green</fillcolor> <fillcolor>Green</fillcolor>
<linecolor>Green</linecolor> <linecolor>Green</linecolor>
</shape> </shape>
<shape> <shape>
<name>LeftBldg</name>
<what>rectangle</what> <what>rectangle</what>
<where>20, 170, 250, 700</where> <where>20, 170, 250, 700</where>
<fillcolor>SaddleBrown</fillcolor> <fillcolor>SaddleBrown</fillcolor>
<linecolor>SaddleBrown</linecolor> <linecolor>SaddleBrown</linecolor>
</shape> </shape>
<shape> <shape>
<name>RightBldg</name>
<what>rectangle</what> <what>rectangle</what>
<where>650, 170, 250, 700</where> <where>650, 170, 250, 700</where>
<fillcolor>SaddleBrown</fillcolor> <fillcolor>SaddleBrown</fillcolor>
<linecolor>SaddleBrown</linecolor> <linecolor>SaddleBrown</linecolor>
</shape> </shape>
<shape> <shape>
<name>LB_RWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>255, 170, 15, 700</where> <where>255, 170, 15, 700</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>RB_RWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>650, 170, 15, 700</where> <where>650, 170, 15, 700</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>LB_TWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>20, 170, 15, 700</where> <where>20, 170, 15, 700</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>RB_TWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>885, 170, 15, 700</where> <where>885, 170, 15, 700</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>LB_BWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>20, 870, 250, 15</where> <where>20, 870, 250, 15</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>RB_BWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>650, 870, 250, 15</where> <where>650, 870, 250, 15</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>LB_LWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>20, 170, 250, 15</where> <where>20, 170, 250, 15</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>RB_LWall</name>
<what>rectangle</what> <what>rectangle</what>
<where>650, 170, 250, 15</where> <where>650, 170, 250, 15</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>CenterCement</name>
<what>rectangle</what> <what>rectangle</what>
<where>326, 200, 262, 377</where> <where>326, 200, 262, 377</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>CenterPark</name>
<what>rectangle</what> <what>rectangle</what>
<where>359, 270, 188, 247</where> <where>359, 270, 188, 247</where>
<fillcolor>Green</fillcolor> <fillcolor>Green</fillcolor>
<linecolor>Green</linecolor> <linecolor>Green</linecolor>
</shape> </shape>
<shape> <shape>
<name>LWindow</name>
<what>rectangle</what> <what>rectangle</what>
<where>260, 500, 5, 100</where> <where>260, 500, 5, 100</where>
<fillcolor>Blue</fillcolor> <fillcolor>Blue</fillcolor>
<linecolor>Blue</linecolor> <linecolor>Blue</linecolor>
</shape> </shape>
<shape> <shape>
<name>R_Window</name>
<what>rectangle</what> <what>rectangle</what>
<where>655, 500, 5, 100</where> <where>655, 500, 5, 100</where>
<fillcolor>Blue</fillcolor> <fillcolor>Blue</fillcolor>
<linecolor>Blue</linecolor> <linecolor>Blue</linecolor>
</shape> </shape>
<shape> <shape>
<name>LSidewalk</name>
<what>rectangle</what> <what>rectangle</what>
<where>255, 300, 100, 80</where> <where>255, 300, 100, 80</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>RSidewalk</name>
<what>rectangle</what> <what>rectangle</what>
<where>550, 300, 100, 80</where> <where>550, 300, 100, 80</where>
<fillcolor>Gray</fillcolor> <fillcolor>Gray</fillcolor>
<linecolor>Gray</linecolor> <linecolor>Gray</linecolor>
</shape> </shape>
<shape> <shape>
<name>LDoor</name>
<what>rectangle</what> <what>rectangle</what>
<where>255, 300, 10, 80</where> <where>255, 300, 10, 80</where>
<fillcolor>SaddleBrown</fillcolor> <fillcolor>SaddleBrown</fillcolor>
<linecolor>SaddleBrown</linecolor> <linecolor>SaddleBrown</linecolor>
</shape> </shape>
<shape> <shape>
<name>RDoor</name>
<what>rectangle</what> <what>rectangle</what>
<where>655, 300, 10, 80</where> <where>655, 300, 10, 80</where>
<fillcolor>SaddleBrown</fillcolor> <fillcolor>SaddleBrown</fillcolor>

View File

@ -2101,4 +2101,8 @@
<value>Y</value> <value>Y</value>
<comment>SE_Y = Y</comment> <comment>SE_Y = Y</comment>
</data> </data>
<data name="SE_Name" xml:space="preserve">
<value>Name</value>
<comment>SE_Name = Name</comment>
</data>
</root> </root>

View File

@ -40,12 +40,14 @@
this.tbWidth = new System.Windows.Forms.TextBox(); this.tbWidth = new System.Windows.Forms.TextBox();
this.tbHeight = new System.Windows.Forms.TextBox(); this.tbHeight = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.cbFillColor = new System.Windows.Forms.ComboBox();
this.cbLineColor = new System.Windows.Forms.ComboBox();
this.lblFill = new System.Windows.Forms.Label();
this.lblLine = new System.Windows.Forms.Label();
this.cbShape = new System.Windows.Forms.ComboBox();
this.lblShape = new System.Windows.Forms.Label(); this.lblShape = new System.Windows.Forms.Label();
this.cbShape = new System.Windows.Forms.ComboBox();
this.lblLine = new System.Windows.Forms.Label();
this.lblFill = new System.Windows.Forms.Label();
this.cbLineColor = new System.Windows.Forms.ComboBox();
this.cbFillColor = new System.Windows.Forms.ComboBox();
this.lblName = new System.Windows.Forms.Label();
this.tbName = new System.Windows.Forms.TextBox();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -58,7 +60,7 @@
this.lbShapeList.ItemHeight = 16; this.lbShapeList.ItemHeight = 16;
this.lbShapeList.Location = new System.Drawing.Point(12, 29); this.lbShapeList.Location = new System.Drawing.Point(12, 29);
this.lbShapeList.Name = "lbShapeList"; this.lbShapeList.Name = "lbShapeList";
this.lbShapeList.Size = new System.Drawing.Size(120, 212); this.lbShapeList.Size = new System.Drawing.Size(166, 276);
this.lbShapeList.TabIndex = 0; this.lbShapeList.TabIndex = 0;
this.lbShapeList.SelectedIndexChanged += new System.EventHandler(this.lbShapeList_SelectedIndexChanged); this.lbShapeList.SelectedIndexChanged += new System.EventHandler(this.lbShapeList_SelectedIndexChanged);
this.lbShapeList.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbShapeList_MouseDown); this.lbShapeList.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lbShapeList_MouseDown);
@ -76,7 +78,7 @@
// btnDone // btnDone
// //
this.btnDone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnDone.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDone.Location = new System.Drawing.Point(201, 244); this.btnDone.Location = new System.Drawing.Point(274, 278);
this.btnDone.Name = "btnDone"; this.btnDone.Name = "btnDone";
this.btnDone.Size = new System.Drawing.Size(75, 23); this.btnDone.Size = new System.Drawing.Size(75, 23);
this.btnDone.TabIndex = 2; this.btnDone.TabIndex = 2;
@ -86,15 +88,15 @@
// //
// tbX // tbX
// //
this.tbX.Location = new System.Drawing.Point(96, 47); this.tbX.Location = new System.Drawing.Point(93, 71);
this.tbX.Name = "tbX"; this.tbX.Name = "tbX";
this.tbX.Size = new System.Drawing.Size(46, 22); this.tbX.Size = new System.Drawing.Size(64, 22);
this.tbX.TabIndex = 3; this.tbX.TabIndex = 3;
// //
// lblX // lblX
// //
this.lblX.AutoSize = true; this.lblX.AutoSize = true;
this.lblX.Location = new System.Drawing.Point(73, 50); this.lblX.Location = new System.Drawing.Point(70, 74);
this.lblX.Name = "lblX"; this.lblX.Name = "lblX";
this.lblX.Size = new System.Drawing.Size(17, 17); this.lblX.Size = new System.Drawing.Size(17, 17);
this.lblX.TabIndex = 4; this.lblX.TabIndex = 4;
@ -103,7 +105,7 @@
// lblY // lblY
// //
this.lblY.AutoSize = true; this.lblY.AutoSize = true;
this.lblY.Location = new System.Drawing.Point(73, 78); this.lblY.Location = new System.Drawing.Point(70, 102);
this.lblY.Name = "lblY"; this.lblY.Name = "lblY";
this.lblY.Size = new System.Drawing.Size(17, 17); this.lblY.Size = new System.Drawing.Size(17, 17);
this.lblY.TabIndex = 5; this.lblY.TabIndex = 5;
@ -111,15 +113,15 @@
// //
// tbY // tbY
// //
this.tbY.Location = new System.Drawing.Point(96, 75); this.tbY.Location = new System.Drawing.Point(93, 99);
this.tbY.Name = "tbY"; this.tbY.Name = "tbY";
this.tbY.Size = new System.Drawing.Size(47, 22); this.tbY.Size = new System.Drawing.Size(64, 22);
this.tbY.TabIndex = 6; this.tbY.TabIndex = 6;
// //
// lblWidth // lblWidth
// //
this.lblWidth.AutoSize = true; this.lblWidth.AutoSize = true;
this.lblWidth.Location = new System.Drawing.Point(46, 106); this.lblWidth.Location = new System.Drawing.Point(43, 130);
this.lblWidth.Name = "lblWidth"; this.lblWidth.Name = "lblWidth";
this.lblWidth.Size = new System.Drawing.Size(44, 17); this.lblWidth.Size = new System.Drawing.Size(44, 17);
this.lblWidth.TabIndex = 7; this.lblWidth.TabIndex = 7;
@ -128,7 +130,7 @@
// lblHeight // lblHeight
// //
this.lblHeight.AutoSize = true; this.lblHeight.AutoSize = true;
this.lblHeight.Location = new System.Drawing.Point(41, 134); this.lblHeight.Location = new System.Drawing.Point(38, 158);
this.lblHeight.Name = "lblHeight"; this.lblHeight.Name = "lblHeight";
this.lblHeight.Size = new System.Drawing.Size(49, 17); this.lblHeight.Size = new System.Drawing.Size(49, 17);
this.lblHeight.TabIndex = 8; this.lblHeight.TabIndex = 8;
@ -136,21 +138,23 @@
// //
// tbWidth // tbWidth
// //
this.tbWidth.Location = new System.Drawing.Point(96, 103); this.tbWidth.Location = new System.Drawing.Point(93, 127);
this.tbWidth.Name = "tbWidth"; this.tbWidth.Name = "tbWidth";
this.tbWidth.Size = new System.Drawing.Size(47, 22); this.tbWidth.Size = new System.Drawing.Size(64, 22);
this.tbWidth.TabIndex = 9; this.tbWidth.TabIndex = 9;
// //
// tbHeight // tbHeight
// //
this.tbHeight.Location = new System.Drawing.Point(96, 131); this.tbHeight.Location = new System.Drawing.Point(93, 155);
this.tbHeight.Name = "tbHeight"; this.tbHeight.Name = "tbHeight";
this.tbHeight.Size = new System.Drawing.Size(47, 22); this.tbHeight.Size = new System.Drawing.Size(64, 22);
this.tbHeight.TabIndex = 10; this.tbHeight.TabIndex = 10;
// //
// panel1 // panel1
// //
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.tbName);
this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.lblShape); this.panel1.Controls.Add(this.lblShape);
this.panel1.Controls.Add(this.cbShape); this.panel1.Controls.Add(this.cbShape);
this.panel1.Controls.Add(this.lblLine); this.panel1.Controls.Add(this.lblLine);
@ -165,67 +169,83 @@
this.panel1.Controls.Add(this.lblY); this.panel1.Controls.Add(this.lblY);
this.panel1.Controls.Add(this.lblX); this.panel1.Controls.Add(this.lblX);
this.panel1.Controls.Add(this.tbX); this.panel1.Controls.Add(this.tbX);
this.panel1.Location = new System.Drawing.Point(138, 29); this.panel1.Location = new System.Drawing.Point(184, 29);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(146, 212); this.panel1.Size = new System.Drawing.Size(165, 243);
this.panel1.TabIndex = 11; this.panel1.TabIndex = 11;
// //
// cbFillColor
//
this.cbFillColor.FormattingEnabled = true;
this.cbFillColor.Location = new System.Drawing.Point(47, 159);
this.cbFillColor.Name = "cbFillColor";
this.cbFillColor.Size = new System.Drawing.Size(96, 24);
this.cbFillColor.TabIndex = 11;
//
// cbLineColor
//
this.cbLineColor.FormattingEnabled = true;
this.cbLineColor.Location = new System.Drawing.Point(47, 184);
this.cbLineColor.Name = "cbLineColor";
this.cbLineColor.Size = new System.Drawing.Size(96, 24);
this.cbLineColor.TabIndex = 12;
//
// lblFill
//
this.lblFill.AutoSize = true;
this.lblFill.Location = new System.Drawing.Point(16, 162);
this.lblFill.Name = "lblFill";
this.lblFill.Size = new System.Drawing.Size(25, 17);
this.lblFill.TabIndex = 13;
this.lblFill.Text = "Fill";
//
// lblLine
//
this.lblLine.AutoSize = true;
this.lblLine.Location = new System.Drawing.Point(6, 187);
this.lblLine.Name = "lblLine";
this.lblLine.Size = new System.Drawing.Size(35, 17);
this.lblLine.TabIndex = 14;
this.lblLine.Text = "Line";
//
// cbShape
//
this.cbShape.FormattingEnabled = true;
this.cbShape.Location = new System.Drawing.Point(63, 17);
this.cbShape.Name = "cbShape";
this.cbShape.Size = new System.Drawing.Size(83, 24);
this.cbShape.TabIndex = 15;
//
// lblShape // lblShape
// //
this.lblShape.AutoSize = true; this.lblShape.AutoSize = true;
this.lblShape.Location = new System.Drawing.Point(8, 20); this.lblShape.Location = new System.Drawing.Point(5, 44);
this.lblShape.Name = "lblShape"; this.lblShape.Name = "lblShape";
this.lblShape.Size = new System.Drawing.Size(49, 17); this.lblShape.Size = new System.Drawing.Size(49, 17);
this.lblShape.TabIndex = 16; this.lblShape.TabIndex = 16;
this.lblShape.Text = "Shape"; this.lblShape.Text = "Shape";
// //
// cbShape
//
this.cbShape.FormattingEnabled = true;
this.cbShape.Location = new System.Drawing.Point(60, 41);
this.cbShape.Name = "cbShape";
this.cbShape.Size = new System.Drawing.Size(97, 24);
this.cbShape.TabIndex = 15;
//
// lblLine
//
this.lblLine.AutoSize = true;
this.lblLine.Location = new System.Drawing.Point(19, 215);
this.lblLine.Name = "lblLine";
this.lblLine.Size = new System.Drawing.Size(35, 17);
this.lblLine.TabIndex = 14;
this.lblLine.Text = "Line";
//
// lblFill
//
this.lblFill.AutoSize = true;
this.lblFill.Location = new System.Drawing.Point(29, 186);
this.lblFill.Name = "lblFill";
this.lblFill.Size = new System.Drawing.Size(25, 17);
this.lblFill.TabIndex = 13;
this.lblFill.Text = "Fill";
//
// cbLineColor
//
this.cbLineColor.FormattingEnabled = true;
this.cbLineColor.Location = new System.Drawing.Point(60, 208);
this.cbLineColor.Name = "cbLineColor";
this.cbLineColor.Size = new System.Drawing.Size(97, 24);
this.cbLineColor.TabIndex = 12;
//
// cbFillColor
//
this.cbFillColor.FormattingEnabled = true;
this.cbFillColor.Location = new System.Drawing.Point(60, 183);
this.cbFillColor.Name = "cbFillColor";
this.cbFillColor.Size = new System.Drawing.Size(97, 24);
this.cbFillColor.TabIndex = 11;
//
// lblName
//
this.lblName.AutoSize = true;
this.lblName.Location = new System.Drawing.Point(9, 14);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(45, 17);
this.lblName.TabIndex = 17;
this.lblName.Text = "Name";
//
// tbName
//
this.tbName.Location = new System.Drawing.Point(60, 11);
this.tbName.Name = "tbName";
this.tbName.Size = new System.Drawing.Size(97, 22);
this.tbName.TabIndex = 18;
//
// ShapeEditor // ShapeEditor
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(288, 279); this.ClientSize = new System.Drawing.Size(353, 313);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.btnDone); this.Controls.Add(this.btnDone);
this.Controls.Add(this.lblShapes); this.Controls.Add(this.lblShapes);
@ -259,5 +279,7 @@
private System.Windows.Forms.ComboBox cbFillColor; private System.Windows.Forms.ComboBox cbFillColor;
private System.Windows.Forms.Label lblShape; private System.Windows.Forms.Label lblShape;
private System.Windows.Forms.ComboBox cbShape; private System.Windows.Forms.ComboBox cbShape;
private System.Windows.Forms.TextBox tbName;
private System.Windows.Forms.Label lblName;
} }
} }

View File

@ -57,6 +57,7 @@ namespace EduNetworkBuilder
cbFillColor.Leave += DataUpdated; cbFillColor.Leave += DataUpdated;
cbLineColor.Leave += DataUpdated; cbLineColor.Leave += DataUpdated;
cbShape.Leave += DataUpdated; cbShape.Leave += DataUpdated;
tbName.Leave += DataUpdated;
FillFormItems(); FillFormItems();
} }
@ -72,6 +73,7 @@ namespace EduNetworkBuilder
lblHeight.Text = NB.Translate("SE_Height", OurSettings); lblHeight.Text = NB.Translate("SE_Height", OurSettings);
lblShape.Text = NB.Translate("SE_Shape", OurSettings); lblShape.Text = NB.Translate("SE_Shape", OurSettings);
lblShapes.Text = NB.Translate("SE_Shapes", OurSettings); lblShapes.Text = NB.Translate("SE_Shapes", OurSettings);
lblName.Text = NB.Translate("SE_Name", OurSettings);
} }
void FillFormItems(bool SaveIndex = false) void FillFormItems(bool SaveIndex = false)
@ -128,6 +130,7 @@ namespace EduNetworkBuilder
cbFillColor.Text = ShapeForEditing.FillColor.Name; cbFillColor.Text = ShapeForEditing.FillColor.Name;
cbLineColor.Text = ShapeForEditing.LineColor.Name; cbLineColor.Text = ShapeForEditing.LineColor.Name;
cbShape.Text = ShapeForEditing.MyShape.ToString(); cbShape.Text = ShapeForEditing.MyShape.ToString();
tbName.Text = ShapeForEditing.Name;
} }
else else
{ {
@ -139,6 +142,7 @@ namespace EduNetworkBuilder
cbFillColor.Text = "Empty"; cbFillColor.Text = "Empty";
cbLineColor.Text = "Empty"; cbLineColor.Text = "Empty";
cbShape.Text = "None"; cbShape.Text = "None";
tbName.Text = "";
} }
} }
} }
@ -169,6 +173,7 @@ namespace EduNetworkBuilder
ShapeForEditing.FillColor = Color.FromName(cbFillColor.Text); ShapeForEditing.FillColor = Color.FromName(cbFillColor.Text);
ShapeForEditing.LineColor = Color.FromName(cbLineColor.Text); ShapeForEditing.LineColor = Color.FromName(cbLineColor.Text);
ShapeForEditing.MyShape = NB.TryParseEnum<NetShapeType>(cbShape.Text, NetShapeType.rectangle); ShapeForEditing.MyShape = NB.TryParseEnum<NetShapeType>(cbShape.Text, NetShapeType.rectangle);
ShapeForEditing.Name = tbName.Text;
} }
FillFormItems(true); //Update the listbox FillFormItems(true); //Update the listbox
} }