b5905b49 by chiangbt

update3

1 parent e47db889
......@@ -23,11 +23,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
<file leaf-file-name="Main.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="79" lean-forward="false" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" />
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -35,18 +35,20 @@
</provider>
</entry>
</file>
<file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="false">
<file leaf-file-name="TiandituDownload.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="45" column="10" lean-forward="false" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
<state relative-caret-position="1605">
<caret line="109" column="132" lean-forward="false" selection-start-line="109" selection-start-column="132" selection-end-line="109" selection-end-column="132" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2063#2064#0" expanded="true" />
<element signature="e#2102#2103#0" expanded="true" />
<element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
<marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" />
<marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " />
<marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" />
<marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
<marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
<marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
</folding>
</state>
</provider>
......@@ -230,16 +232,15 @@
<updated>1522029080525</updated>
<workItem from="1522029083503" duration="8800000" />
<workItem from="1522044614927" duration="4004000" />
<workItem from="1522068118889" duration="1963000" />
<workItem from="1522068118889" duration="2393000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="14767000" />
<option name="totallyTimeSpent" value="15197000" />
</component>
<component name="ToolWindowManager">
<frame x="171" y="29" width="1400" height="771" extended-state="0" />
<editor active="true" />
<layout>
<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" />
<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 @@
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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 @@
<caret line="114" column="60" lean-forward="true" selection-start-line="114" selection-start-column="60" selection-end-line="114" selection-end-column="60" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2063#2064#0" expanded="true" />
<element signature="e#2102#2103#0" expanded="true" />
<element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
<marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" />
<marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " />
<marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" />
<marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
<marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
<marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
</folding>
</state>
</provider>
......@@ -388,11 +391,13 @@
<caret line="11" column="29" lean-forward="false" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2063#2064#0" expanded="true" />
<element signature="e#2102#2103#0" expanded="true" />
<element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
<marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" />
<marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " />
<marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" />
<marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
<marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
<marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
</folding>
</state>
</provider>
......@@ -491,27 +496,29 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
<entry file="file://$PROJECT_DIR$/src/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="45" column="10" lean-forward="false" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
<state relative-caret-position="210">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2063#2064#0" expanded="true" />
<element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
<marker date="1522070065953" expanded="true" signature="3289:3386" ph="select * fro... missingValue" />
<marker date="1522070065953" expanded="true" signature="5529:5606" ph="INSERT INTO missingValue... " />
<marker date="1522070065953" expanded="true" signature="6731:6918" ph="CREATE TABLE... IF" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Main.java">
<entry file="file://$PROJECT_DIR$/src/TiandituDownload.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="79" lean-forward="false" selection-start-line="14" selection-start-column="79" selection-end-line="14" selection-end-column="79" />
<state relative-caret-position="1605">
<caret line="109" column="132" lean-forward="false" selection-start-line="109" selection-start-column="132" selection-end-line="109" selection-end-column="132" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2102#2103#0" expanded="true" />
<element signature="method#downloadSingLevelTiles#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#Download#0;class#TiandituDownload#0" expanded="false" />
<element signature="method#getTile#0;class#TiandituDownload#0" expanded="false" />
<marker date="1522070480465" expanded="true" signature="3469:3566" ph="select * fro... missingValue" />
<marker date="1522070480465" expanded="true" signature="5718:5795" ph="INSERT INTO missingValue... " />
<marker date="1522070480465" expanded="true" signature="7165:7352" ph="CREATE TABLE... IF" />
</folding>
</state>
</provider>
......
......@@ -147,7 +147,7 @@ public class TiandituDownload {
byte[] img2 = getTile(url2);
InputStream img_stream2 = new ByteArrayInputStream(img2);
BufferedImage bImageFromConvert2 = ImageIO.read(img_stream2);
// 将两张图片拼凑为一张
Graphics g = bImageFromConvert.getGraphics();
g.drawImage(bImageFromConvert, 0, 0, null);
g.drawImage(bImageFromConvert2, 0, 0, null);
......