近接幅を相対的な値に変更

ta-kon · May 8, 2018 · 6b415d6 · 6b415d6
1 parent 159324c
commit 6b415d6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/Numbering-ExcelAddin.xlam b/Numbering-ExcelAddin.xlam
diff --git a/source/Model.bas b/source/Model.bas
@@ -90,8 +90,8 @@ Public Sub initModel()
   ' リボン起動時に初期化
 
   SELECT_SORT_ORDER = SORT_ORDER_ROW
-  COLLISION_NUM_STRING = "20px (標準)"
-  COLLISION = 20
+  COLLISION_NUM_STRING = "0.50倍 (標準)"
+  COLLISION = 0.50
   START_NUM = 1
   IS_CHANGE_TEXT   = TRUE
   IS_SELECT_FIGURE = TRUE

diff --git a/source/View.bas b/source/View.bas
@@ -132,22 +132,26 @@ Sub onCollisionTextChange(ByRef control As IRibbonControl, ByRef text As String)
   COLLISION_NUM_STRING = text
 
   Select Case text
-    Case "0px"
+    Case "0倍 (非隣接)"
       COLLISION = 0
-    Case "10px"
-      COLLISION = 10
-    Case "20px (標準)"
-      COLLISION = 20
-    Case "30px"
-      COLLISION = 30
+    Case "0.25倍"
+      COLLISION = 0.25
+    Case "0.50倍 (標準)"
+      COLLISION = 0.50
+    Case "0.75倍"
+      COLLISION = 0.75
+    Case "1.00倍"
+      COLLISION = 1.00
     Case Else
-      Dim s As String
-      s = Replace(text, "px", "")
-      If IsNumeric(s) Then
-        COLLISION = CLng(s)
+      Dim strDbl As String
+      strDbl = Trim(text)
+      strDbl = Replace(strDbl, "倍", "")
+      strDbl = Trim(strDbl)
+      If IsNumeric(strDbl) Then
+        COLLISION = CDbl(strDbl)
       Else
         Dim message As String
-        message = "数値を入力してください。(単位: px), 現在の値=" & text
+        message = "数値を入力してください。(単位: 倍), 現在の値=" & text
         Call setMsgAndStatus(message)
       End If
   End Select

diff --git a/source/customUI14.xml b/source/customUI14.xml
@@ -28,13 +28,14 @@
           </dropDown>
 
           <comboBox id="collisionComboBox" label="近接幅：" keytip="C" imageMso="ControlPropertyHeightValue" showItemImage="true" maxLength="10" sizeString="WWWWWWWWWW"
-           supertip="採番する際に、同じ採番範囲の図形だとする範囲を設定します。"
+           supertip="採番する際に、同じ採番範囲の図形だとする範囲を設定します。図形を比較する際に重なる図形の幅の倍率を指定できます。"
            getText="View.getCollisionText"
            onChange="View.onCollisionTextChange">
-            <item id="COLLISION_0px" label="0px" />
-            <item id="COLLISION_10px" label="10px" />
-            <item id="COLLISION_20px" label="20px (標準)" />
-            <item id="COLLISION_30px" label="30px" />
+            <item id="COLLISION.x0.00" label="0倍 (非隣接)" />
+            <item id="COLLISION.x0.25" label="0.25倍" />
+            <item id="COLLISION_x0.50" label="0.50倍 (標準)" />
+            <item id="COLLISION_x0.75" label="0.75倍" />
+            <item id="COLLISION_x1.00" label="1.00倍" />
           </comboBox>
         </group>