From bb45f72ff124b0d7cf6b1ad082955db3caa96c0e Mon Sep 17 00:00:00 2001
From: kekee000 <kekee000@gmail.com>
Date: Fri, 3 Apr 2015 18:09:02 +0800
Subject: [PATCH] modify import

---
 css/common/dialog.less                      |  2 +-
 src/fonteditor/dialog/setting-import-pic.js | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/css/common/dialog.less b/css/common/dialog.less
index cd81679..7ac7f81 100644
--- a/css/common/dialog.less
+++ b/css/common/dialog.less
@@ -11,7 +11,7 @@
     }
 
     .panose-inline {
-        margin-bottom: -40px;
+        margin-bottom: -24px;
         .input-group {
             width: 100%;
         }
diff --git a/src/fonteditor/dialog/setting-import-pic.js b/src/fonteditor/dialog/setting-import-pic.js
index fb3aa93..8e1de48 100644
--- a/src/fonteditor/dialog/setting-import-pic.js
+++ b/src/fonteditor/dialog/setting-import-pic.js
@@ -53,6 +53,7 @@ define(
             // 使用ostu来设置灰度阈值
             var histoGram = getHistogram(processor.get());
             getFilter('threshold').val(getThreshold(histoGram, 'ostu'));
+            $('#import-pic-threshold-pre').val('ostu');
 
             processImage();
             binarizeImage();
@@ -218,11 +219,13 @@ define(
                     binarizeImage();
                 }
                 else if (action === 'threshold-pre') {
-                    var histoGram = getHistogram(program.data.imageProcessor.getOrigin());
-                    getFilter('threshold').val(getThreshold(histoGram, $('#import-pic-threshold-pre').val()));
-                    program.data.imageProcessor.restore();
-
-                    binarizeImage();
+                    var val = $('#import-pic-threshold-pre').val();
+                    if (val) {
+                        var histoGram = getHistogram(program.data.imageProcessor.getOrigin());
+                        getFilter('threshold').val(getThreshold(histoGram, $('#import-pic-threshold-pre').val()));
+                        program.data.imageProcessor.restore();
+                        binarizeImage();
+                    }
                 }
                 // 处理图片的情况，需要调用处理图片和二值化函数
                 else if (action === 'restore') {