Changeset 11125

Timestamp:

03/15/10 10:40:29 (2 years ago)

Author:

zenogantner

Message:

speed up counting of non-whitespace characters by roughly a factor of 5 for typical documents
removed stats for selected text (was not reflected by the GUI anyway)

File:

• trunk/Padre/lib/Padre/Document.pm (modified) (2 diffs)

trunk/Padre/lib/Padre/Document.pm

@@ -1305 +1305 @@
 
     my $editor = $self->editor;
-    my $src    = $editor->GetSelectedText;
-    my $code;
-    if ($src) {
-        $code = $src;
-
-        my $code2 = $code; # it's ugly, need improvement
-        $code2 =~ s/\r\n/\n/g;
-        $lines = 1;        # by default
-        $lines++ while ( $code2 =~ /[\r\n]/g );
-        $chars_with_space = length($code);
-    } else {
-        $code = $self->text_get;
-
-        # I trust editor more
-        $lines            = $editor->GetLineCount();
-        $chars_with_space = $editor->GetTextLength();
-        $is_readonly      = $editor->GetReadOnly();
-    }
+    my $code = $self->text_get;
+
+    $lines            = $editor->GetLineCount();
+    $chars_with_space = $editor->GetTextLength();
+    $is_readonly      = $editor->GetReadOnly();
 
     # avoid slow calculation on large files
-    # TO DO or improve them ?
-    if ( length($code) < 100_000 ) {
+    # TODO or improve them?
+    if ( length($code) < 500_000 ) {
+        my $whitespace_chars = 0;
         $words++               while ( $code =~ /\b\w+\b/g );
-        $chars_without_space++ while ( $code =~ /\S/g );
+        $chars_without_space = $chars_with_space;
+        $chars_without_space-- while ( $code =~ /\s/g );
     } else {
         $words               = Wx::gettext("Skipped for large files");
@@ -1340 +1329 @@
     require Padre::Locale;
     if ( not $self->{encoding} or $self->{encoding} eq 'ascii' ) {
-        $self->{encoding} = Padre::Locale::encoding_from_string($src);
+        $self->{encoding} = Padre::Locale::encoding_from_string($code);
     }
     return (