Changeset 29212

Timestamp:

01/29/09 11:19:47 (4 years ago)

Author:

isaisstillalive

Message:

• 論理文字列、物理文字列を取得するメソッドをそれぞれ追加。
  
• 論理文字数、物理文字数を取得するメソッドをそれぞれ追加。
  
• ちょっと混乱してきたので、とにかくテストを通らせて一旦コミット。要整理。
  

Location:

lang/ruby/ruwin

Files:

• lib/ruwin/edit_field.rb (modified) (7 diffs)
• lib/ruwin/edit_field/rich.rb (modified) (2 diffs)
• test/ruwin/testm_edit_field.rb (modified) (6 diffs)

lang/ruby/ruwin/lib/ruwin/edit_field.rb

@@ -6 +6 @@
     module Base
       include Const::EditField
-      STRING_CONVERTER = Proc.new{|string| string }
+      ENABLE_MULTILINE = false
       
       attr_reader :selection
@@ -19 +19 @@
       
       def string
-        self.class::STRING_CONVERTER.call(caption.kconv(Kconv::UTF8, Kconv::SJIS)) || ""
-      end
-      alias to_s string
+        physical_string
+      end
       
       def string= string
-        self.caption = self.class::STRING_CONVERTER.call(string).kconv(Kconv::SJIS, Kconv::UTF8)
-      end
+        self.caption = convert_string(string, "\r\n").kconv(Kconv::SJIS, Kconv::UTF8)
+      end
+      
+      def length
+        physical_length
+      end
+      
+      
+      def physical_string
+        return "" if caption.empty?
+        convert_string(caption.kconv(Kconv::UTF8, Kconv::SJIS))
+      end
+      
+      def logical_string
+        return "" if caption.empty?
+        convert_string(caption.kconv(Kconv::UTF8, Kconv::SJIS), "\r")
+      end
+      
+      def convert_string string, rs = "\r\n"
+        if self.class::ENABLE_MULTILINE
+          string.gsub(/\r\n|\r|\n/u, rs)
+        else
+          string.split(/\r\n|\r|\n/, 2)[0]
+        end
+      end
+      
+      def physical_length
+        physical_string.length
+      end
+      
+      def logical_length
+        logical_string.length
+      end
+      
       
       def substring logical_first, logical_last
-        to_physical_string(to_logical_string(physical_string).split(//u)[logical_first...logical_last].join(""))
+        to_physical_string(logical_string.split(//u)[logical_first...logical_last].join(""))
       end
       
@@ -44 +75 @@
         physical_string[first...last]
       end
-      
-      
-      alias physical_string string
-      private :physical_string
       
       def to_logical_string physical_string
@@ -151 +178 @@
     STYLE = Control::STYLE | ES_AUTOHSCROLL
     EXSTYLE = WS_EX_CLIENTEDGE
-    STRING_CONVERTER = Proc.new{|string| string.split(/\r\n|\r|\n/, 2)[0] }
     
     property_accessor :writable => true
@@ -169 +195 @@
     class Multiline < EditField
       STYLE = Control::STYLE | ES_MULTILINE | ES_AUTOVSCROLL
-      STRING_CONVERTER = Proc.new{|string| string.gsub(/\r\n|\r|\n/u, "\r\n") }
+      ENABLE_MULTILINE = true
       
       private
-      def return_count physical_first, physical_length
+      def count_rs physical_first, physical_length
         string[physical_first, physical_length].split("\r\n").size-1
       end
@@ -180 +206 @@
         len = logical_length
         until len == 0
-          return_count = return_count(pos, len)
+          count_rs = count_rs(pos, len)
           pos += len
-          len = return_count
+          len = count_rs
         end
         pos
       end
       
-      def logical_length physical_first, physical_length
-        physical_length - return_count(physical_first, physical_length)
+      def logical_diff physical_first, physical_length
+        physical_length - count_rs(physical_first, physical_length)
       end
       
@@ -203 +229 @@
         physical_length = physical_last-physical_first
         
-        logical_length = logical_length(physical_first, physical_length)
-        logical_first  = logical_length(0,              physical_first)
+        logical_length = logical_diff(physical_first, physical_length)
+        logical_first  = logical_diff(0,              physical_first)
         
         return logical_first, logical_first+logical_length

lang/ruby/ruwin/lib/ruwin/edit_field/rich.rb

@@ -25 +25 @@
         CLASS_NAME = "RICHEDIT"
       end
-      STRING_CONVERTER = Proc.new{|string| string }
       
       property_accessor :background_color => nil, :color => nil
@@ -108 +107 @@
       class Multiline < Rich
         STYLE = EditField::Multiline::STYLE
-        RETURN_CODE = "\r\n"
+        ENABLE_MULTILINE = true
       end
     end

lang/ruby/ruwin/test/ruwin/testm_edit_field.rb

@@ -13 +13 @@
   
   
+  def test_string_setter
+    @control.string = "caption"
+    assert_equal "caption", @control.__send__(:caption)
+  end
+  
   def test_string_setter_should_encode_utf8_to_sjis
     @control.string = "あいう"
@@ -18 +23 @@
   end
   
+  def test_string_getter_empty
+    @control.__send__ :caption=, ""
+    assert_equal "", @control.string
+  end
+  
+  def test_string_getter
+    @control.__send__ :caption=, "caption"
+    assert_equal "caption", @control.string
+  end
+  
   def test_string_getter_should_encode_sjis_to_utf8
     @control.__send__ :caption=, "あいう".tosjis
@@ -23 +38 @@
   end
   
-  def test_string_setter
-    @control.string = "caption"
-    assert_equal "caption", @control.__send__(:caption)
-  end
-  
-  def test_string_getter_empty
-    @control.__send__ :caption=, ""
-    assert_equal "", @control.string
-  end
-  
-  def test_string_getter
-    @control.__send__ :caption=, "caption"
-    assert_equal "caption", @control.string
+  
+  def test_logical_string
+    @control.__send__ :caption=, "caption"
+    assert_equal "caption", @control.logical_string
+  end
+  
+  def test_physical_string
+    @control.__send__ :caption=, "caption"
+    assert_equal "caption", @control.physical_string
+  end
+  
+  
+  def test_length
+    @control.__send__ :caption=, "caption"
+    assert_equal 7, @control.length
+  end
+  
+  def test_logical_length
+    @control.__send__ :caption=, "caption"
+    assert_equal 7, @control.logical_length
+  end
+  
+  def test_physical_length
+    @control.__send__ :caption=, "caption"
+    assert_equal 7, @control.physical_length
   end
   
@@ -257 +284 @@
   
   def test_string_setter_should_deny_return
-    klass = Class.new(self.class::TARGET_CLASS)
-    control = klass.new(@window)
-    control.string = "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "caption", control.__send__(:caption)
+    @control.string = "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption", @control.__send__(:caption)
   end
   
   def test_string_getter_should_deny_return
-    klass = Class.new(self.class::TARGET_CLASS)
-    control = klass.new(@window)
-    control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "caption", control.string
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption", @control.string
   end
 end
@@ -284 +307 @@
   
   def test_string_setter_should_allow_return_and_convert_to_crlf
-    klass = Class.new(self.class::TARGET_CLASS)
-    control = klass.new(@window)
-    control.string = "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", control.__send__(:caption)
+    @control.string = "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", @control.__send__(:caption)
   end
   
   def test_string_getter_should_allow_return_and_convert_to_crlf
-    klass = Class.new(self.class::TARGET_CLASS)
-    control = klass.new(@window)
-    control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", control.string
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", @control.string
+  end
+  
+  
+  def test_logical_string
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption\rcaption\rcaption\rcaption", @control.logical_string
+  end
+  
+  def test_physical_string
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "caption\r\ncaption\r\ncaption\r\ncaption", @control.physical_string
+  end
+  
+  
+  def test_length
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal 28+6, @control.length
+  end
+  
+  def test_logical_length
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal 28+3, @control.logical_length
+  end
+  
+  def test_physical_length
+    @control.__send__ :caption=, "caption\r\ncaption\rcaption\ncaption"
+    assert_equal 28+6, @control.physical_length
+  end
+  
+  
+  def test_substring_multiline
+    @control.string = "caption\r\ncaption\rcaption\ncaption"
+    assert_equal "ion\r\ncap", @control.substring(4, 11)
   end
   
@@ -303 +355 @@
     assert_equal "ion\r\ncap", @control.selection_string
   end
-  
-  def test_substring_multiline
-    @control.string = "caption\r\ncaption\rcaption\ncaption"
-    assert_equal "ion\r\ncap", @control.substring(4, 11)
-  end
 end