OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr
  • R/O
  • SSH
  • HTTPS

gokigen: Commit


Commit MetaInfo

Révision347 (tree)
l'heure2017-05-22 00:09:36
Auteurmrsa

Message de Log

操作パネル搭載のための準備その14。作例表示モードへのインパクト修正。

Change Summary

Modification

--- android/AirA01b/trunk/.idea/workspace.xml (revision 346)
+++ android/AirA01b/trunk/.idea/workspace.xml (revision 347)
@@ -34,6 +34,7 @@
3434 <list default="true" readonly="true" id="754c9e42-e168-4355-a96f-5b6d4290fd93" name="Default" comment="">
3535 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
3636 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java" />
37+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" afterPath="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
3738 </list>
3839 <ignored path="AirA01b.iws" />
3940 <ignored path=".idea/workspace.xml" />
@@ -2726,12 +2727,12 @@
27262727 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/ICameraPanelDrawer.java" />
27272728 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/ScalableImageViewPanel.java" />
27282729 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/olycamerawrapper/CameraStatusListenerImpl.java" />
2729- <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
27302730 <option value="$PROJECT_DIR$/app/src/main/res/xml/preferences.xml" />
27312731 <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
27322732 <option value="$PROJECT_DIR$/app/src/main/res/values-ja/strings.xml" />
27332733 <option value="$PROJECT_DIR$/app/src/main/res/values-ja/arrays.xml" />
27342734 <option value="$PROJECT_DIR$/app/src/main/res/values/arrays.xml" />
2735+ <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java" />
27352736 <option value="$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java" />
27362737 </list>
27372738 </option>
@@ -3517,13 +3518,6 @@
35173518 <option name="presentableId" value="Default" />
35183519 <updated>1469871562549</updated>
35193520 </task>
3520- <task id="LOCAL-00079" summary="OpenCVを3.2.0に更新。&#10;">
3521- <created>1483102296563</created>
3522- <option name="number" value="00079" />
3523- <option name="presentableId" value="LOCAL-00079" />
3524- <option name="project" value="LOCAL" />
3525- <updated>1483102296564</updated>
3526- </task>
35273521 <task id="LOCAL-00080" summary="フォーカスアシストを少し変更。&#10;">
35283522 <created>1483105831830</created>
35293523 <option name="number" value="00080" />
@@ -3860,7 +3854,14 @@
38603854 <option name="project" value="LOCAL" />
38613855 <updated>1495290506150</updated>
38623856 </task>
3863- <option name="localTasksCounter" value="128" />
3857+ <task id="LOCAL-00128" summary="操作パネル搭載のための準備その13。見た目を変えてみた。作例表示モードへのインパクトを治す必要あり。&#10;&#10;">
3858+ <created>1495378445382</created>
3859+ <option name="number" value="00128" />
3860+ <option name="presentableId" value="LOCAL-00128" />
3861+ <option name="project" value="LOCAL" />
3862+ <updated>1495378445382</updated>
3863+ </task>
3864+ <option name="localTasksCounter" value="129" />
38643865 <servers />
38653866 </component>
38663867 <component name="TodoView">
@@ -3890,6 +3891,7 @@
38903891 <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="6" side_tool="false" content_ui="tabs" />
38913892 <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46058732" sideWeight="0.50921756" order="11" side_tool="true" content_ui="tabs" />
38923893 <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2277755" sideWeight="0.4935484" order="2" side_tool="false" content_ui="tabs" />
3894+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33848533" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
38933895 <window_info id="Gradle" 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="6" side_tool="false" content_ui="tabs" />
38943896 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24979983" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
38953897 <window_info id="Android Model" 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="9" side_tool="true" content_ui="tabs" />
@@ -3907,7 +3909,6 @@
39073909 <window_info id="Palette&#9;" 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="8" side_tool="false" content_ui="tabs" />
39083910 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
39093911 <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32978287" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
3910- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33848533" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
39113912 </layout>
39123913 <layout-to-restore>
39133914 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -3956,7 +3957,6 @@
39563957 <option name="myLimit" value="2678400000" />
39573958 </component>
39583959 <component name="VcsManagerConfiguration">
3959- <MESSAGE value="内蔵カメラの位置情報を記録するように作りこんだ。" />
39603960 <MESSAGE value="位置情報をひろってギャラリーに登録するようにした。" />
39613961 <MESSAGE value="デジタル水準器のデータをとれるようにした。（まだログだけ）&#10;" />
39623962 <MESSAGE value="デジタル水準器を数値で表示するようにした。&#10;" />
@@ -3981,7 +3981,8 @@
39813981 <MESSAGE value="操作パネル搭載のための準備その11。スワイプ入れたのデバック途中。" />
39823982 <MESSAGE value="操作パネル搭載のための準備その12。見た目以外はとりあえず。&#10;" />
39833983 <MESSAGE value="操作パネル搭載のための準備その12。見た目以外の機能は完成。&#10;" />
3984- <option name="LAST_COMMIT_MESSAGE" value="操作パネル搭載のための準備その12。見た目以外の機能は完成。&#10;" />
3984+ <MESSAGE value="操作パネル搭載のための準備その13。見た目を変えてみた。作例表示モードへのインパクトを治す必要あり。&#10;&#10;" />
3985+ <option name="LAST_COMMIT_MESSAGE" value="操作パネル搭載のための準備その13。見た目を変えてみた。作例表示モードへのインパクトを治す必要あり。&#10;&#10;" />
39853986 </component>
39863987 <component name="XDebuggerManager">
39873988 <breakpoint-manager>
@@ -4210,14 +4211,6 @@
42104211 </state>
42114212 </provider>
42124213 </entry>
4213- <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
4214- <provider selected="true" editor-type-id="text-editor">
4215- <state relative-caret-position="17">
4216- <caret line="27" column="81" selection-start-line="27" selection-start-column="81" selection-end-line="27" selection-end-column="81" />
4217- <folding />
4218- </state>
4219- </provider>
4220- </entry>
42214214 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraLiveImageView.java">
42224215 <provider selected="true" editor-type-id="text-editor">
42234216 <state relative-caret-position="986">
@@ -4357,8 +4350,8 @@
43574350 </entry>
43584351 <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java">
43594352 <provider selected="true" editor-type-id="text-editor">
4360- <state relative-caret-position="544">
4361- <caret line="318" column="38" selection-start-line="318" selection-start-column="38" selection-end-line="318" selection-end-column="38" />
4353+ <state relative-caret-position="646">
4354+ <caret line="261" column="31" selection-start-line="261" selection-start-column="31" selection-end-line="261" selection-end-column="31" />
43624355 <folding>
43634356 <element signature="imports" expanded="true" />
43644357 <element signature="method#onScroll#0;class#CameraControlPanel#0" expanded="false" />
@@ -4367,5 +4360,15 @@
43674360 </state>
43684361 </provider>
43694362 </entry>
4363+ <entry file="file://$PROJECT_DIR$/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java">
4364+ <provider selected="true" editor-type-id="text-editor">
4365+ <state relative-caret-position="2788">
4366+ <caret line="264" column="56" selection-start-line="264" selection-start-column="56" selection-end-line="264" selection-end-column="56" />
4367+ <folding>
4368+ <element signature="imports" expanded="true" />
4369+ </folding>
4370+ </state>
4371+ </provider>
4372+ </entry>
43704373 </component>
43714374 </project>
\ No newline at end of file
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java (revision 346)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/CameraControlPanel.java (revision 347)
@@ -1,5 +1,6 @@
11 package jp.osdn.gokigen.aira01b.liveview;
22
3+import android.content.SharedPreferences;
34 import android.graphics.Canvas;
45 import android.graphics.Color;
56 import android.graphics.Paint;
@@ -73,6 +74,7 @@
7374 {
7475 boolean ret = true;
7576 Log.v(TAG, "onTouch() : [" + event.getX() + "," + event.getY() + "] ");
77+
7678 if (event.getActionMasked() == MotionEvent.ACTION_UP)
7779 {
7880 Log.v(TAG, "onTouch() UP : [" + event.getX() + "," + event.getY() + "] ");
@@ -257,20 +259,16 @@
257259 drawConsolePanel(canvas, width_unit, height_unit);
258260 }
259261
260- ///// 動作インジケータ /////
262+ ///// 動作インジケータ(5回に1回、色を更新) /////
261263 if (value % 5 == 0)
262264 {
263- if (currentColor == Color.WHITE)
265+ if (currentColor == Color.LTGRAY)
264266 {
265- currentColor = Color.LTGRAY;
266- }
267- else if (currentColor == Color.LTGRAY)
268- {
269267 currentColor = Color.DKGRAY;
270268 }
271269 else
272270 {
273- currentColor = Color.WHITE;
271+ currentColor = Color.LTGRAY;
274272 }
275273 }
276274 rectPaint.setColor(currentColor);
--- android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java (revision 346)
+++ android/AirA01b/trunk/app/src/main/java/jp/osdn/gokigen/aira01b/liveview/LiveViewFragment.java (revision 347)
@@ -247,6 +247,9 @@
247247 }
248248
249249 statusListener.setDelegateListener(null);
250+ sampleImageView.setOnClickListener(null);
251+ sampleImageView.setOnTouchListener(null);
252+ sampleImageView.setOnLongClickListener(null);
250253 sampleImageView.setCameraPanelDrawer(false, null);
251254
252255 Uri uri = null;
Afficher sur ancien navigateur de dépôt.