Skip to content

蒋波涛 / tianditudownloader

Go to a project
Toggle navigation
Toggle navigation pinning
b5905b49 by chiangbt
Options

update3

1 parent e47db889
Inline Side-by-side
Showing 2 changed files with 41 additions and 34 deletions
...@@ -23,11 +23,11 @@ ...@@ -23,11 +23,11 @@
23 </component> 23 </component>
24 <component name="FileEditorManager"> 24 <component name="FileEditorManager">
25 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 25 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
26 <file leaf-file-name="Main.java" pinned="false" current-in-tab="true"> 26 <file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
27 <entry file="file://$PROJECT_DIR$/src/Main.java"> 27 <entry file="file://$PROJECT_DIR$/src/Main.java">
28 <provider selected="true" editor-type-id="text-editor"> 28 <provider selected="true" editor-type-id="text-editor">
29 <state relative-caret-position="210"> 29 <state relative-caret-position="210">
30 <caret line="14" column="79" lean-forward="false" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" /> 30 <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
31 <folding> 31 <folding>
32 <element signature="imports" expanded="true" /> 32 <element signature="imports" expanded="true" />
33 </folding> 33 </folding>
...@@ -35,18 +35,20 @@ ...@@ -35,18 +35,20 @@
35 </provider> 35 </provider>
36 </entry> 36 </entry>
37 </file> 37 </file>
38 <file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="false"> 38 <file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="true">
39 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 39 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
40 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
41 <state relative-caret-position="295"> 41 <state relative-caret-position="1605">
42 <caret line="45" column="10" lean-forward="false" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" /> 42 <caret line="109" column="132" lean-forward="false" selection-start-line="109" selection-start-column="132" selection-end-line="109" selection-end-column="132" />
43 <folding> 43 <folding>
44 <element signature="imports" expanded="true" /> 44 <element signature="imports" expanded="true" />
45 <element signature="e#2063#2064#0" expanded="true" /> 45 <element signature="e#2102#2103#0" expanded="true" />
46 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
47 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
46 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" /> 48 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
47 <marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" /> 49 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
48 <marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " /> 50 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
49 <marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" /> 51 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
50 </folding> 52 </folding>
51 </state> 53 </state>
52 </provider> 54 </provider>
...@@ -230,16 +232,15 @@ ...@@ -230,16 +232,15 @@
230 <updated>1522029080525</updated> 232 <updated>1522029080525</updated>
231 <workItem from="1522029083503" duration="8800000" /> 233 <workItem from="1522029083503" duration="8800000" />
232 <workItem from="1522044614927" duration="4004000" /> 234 <workItem from="1522044614927" duration="4004000" />
233 <workItem from="1522068118889" duration="1963000" /> 235 <workItem from="1522068118889" duration="2393000" />
234 </task> 236 </task>
235 <servers /> 237 <servers />
236 </component> 238 </component>
237 <component name="TimeTrackingManager"> 239 <component name="TimeTrackingManager">
238 <option name="totallyTimeSpent" value="14767000" /> 240 <option name="totallyTimeSpent" value="15197000" />
239 </component> 241 </component>
240 <component name="ToolWindowManager"> 242 <component name="ToolWindowManager">
241 <frame x="171" y="29" width="1400" height="771" extended-state="0" /> 243 <frame x="171" y="29" width="1400" height="771" extended-state="0" />
242 <editor active="true" />
243 <layout> 244 <layout>
244 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 245 <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
245 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> 246 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
...@@ -249,9 +250,9 @@ ...@@ -249,9 +250,9 @@
249 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 250 <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
250 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 251 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
251 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 252 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
252 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32988167" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 253 <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32988167" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
253 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 254 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
254 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.14201184" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 255 <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4733728" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
255 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 256 <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
256 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 257 <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
257 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.100883655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 258 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.100883655" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -326,11 +327,13 @@ ...@@ -326,11 +327,13 @@
326 <caret line="114" column="60" lean-forward="true" selection-start-line="114" selection-start-column="60" selection-end-line="114" selection-end-column="60" /> 327 <caret line="114" column="60" lean-forward="true" selection-start-line="114" selection-start-column="60" selection-end-line="114" selection-end-column="60" />
327 <folding> 328 <folding>
328 <element signature="imports" expanded="true" /> 329 <element signature="imports" expanded="true" />
329 <element signature="e#2063#2064#0" expanded="true" /> 330 <element signature="e#2102#2103#0" expanded="true" />
331 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
332 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
330 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" /> 333 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
331 <marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" /> 334 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
332 <marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " /> 335 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
333 <marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" /> 336 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
334 </folding> 337 </folding>
335 </state> 338 </state>
336 </provider> 339 </provider>
...@@ -388,11 +391,13 @@ ...@@ -388,11 +391,13 @@
388 <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" /> 391 <caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" />
389 <folding> 392 <folding>
390 <element signature="imports" expanded="true" /> 393 <element signature="imports" expanded="true" />
391 <element signature="e#2063#2064#0" expanded="true" /> 394 <element signature="e#2102#2103#0" expanded="true" />
395 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
396 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
392 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" /> 397 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
393 <marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" /> 398 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
394 <marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " /> 399 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
395 <marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" /> 400 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
396 </folding> 401 </folding>
397 </state> 402 </state>
398 </provider> 403 </provider>
...@@ -491,27 +496,29 @@ ...@@ -491,27 +496,29 @@
491 </state> 496 </state>
492 </provider> 497 </provider>
493 </entry> 498 </entry>
494 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java"> 499 <entry file="file://$PROJECT_DIR$/src/Main.java">
495 <provider selected="true" editor-type-id="text-editor"> 500 <provider selected="true" editor-type-id="text-editor">
496 <state relative-caret-position="295"> 501 <state relative-caret-position="210">
497 <caret line="45" column="10" lean-forward="false" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" /> 502 <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
498 <folding> 503 <folding>
499 <element signature="imports" expanded="true" /> 504 <element signature="imports" expanded="true" />
500 <element signature="e#2063#2064#0" expanded="true" />
501 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
502 <marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" />
503 <marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " />
504 <marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" />
505 </folding> 505 </folding>
506 </state> 506 </state>
507 </provider> 507 </provider>
508 </entry> 508 </entry>
509 <entry file="file://$PROJECT_DIR$/src/Main.java"> 509 <entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
510 <provider selected="true" editor-type-id="text-editor"> 510 <provider selected="true" editor-type-id="text-editor">
511 <state relative-caret-position="210"> 511 <state relative-caret-position="1605">
512 <caret line="14" column="79" lean-forward="false" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" /> 512 <caret line="109" column="132" lean-forward="false" selection-start-line="109" selection-start-column="132" selection-end-line="109" selection-end-column="132" />
513 <folding> 513 <folding>
514 <element signature="imports" expanded="true" /> 514 <element signature="imports" expanded="true" />
515 <element signature="e#2102#2103#0" expanded="true" />
516 <element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
517 <element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
518 <element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
519 <marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
520 <marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
521 <marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
515 </folding> 522 </folding>
516 </state> 523 </state>
517 </provider> 524 </provider>
......
...@@ -147,7 +147,7 @@ public class TiandituDownload { ...@@ -147,7 +147,7 @@ public class TiandituDownload {
147 byte[] img2 = getTile(url2); 147 byte[] img2 = getTile(url2);
148 InputStream img_stream2 = new ByteArrayInputStream(img2); 148 InputStream img_stream2 = new ByteArrayInputStream(img2);
149 BufferedImage bImageFromConvert2 = ImageIO.read(img_stream2); 149 BufferedImage bImageFromConvert2 = ImageIO.read(img_stream2);
150 150 // 将两张图片拼凑为一张
151 Graphics g = bImageFromConvert.getGraphics(); 151 Graphics g = bImageFromConvert.getGraphics();
152 g.drawImage(bImageFromConvert, 0, 0, null); 152 g.drawImage(bImageFromConvert, 0, 0, null);
153 g.drawImage(bImageFromConvert2, 0, 0, null); 153 g.drawImage(bImageFromConvert2, 0, 0, null);
......