From 1854616acc2fe0bdea72fd4c48eb1f438fb2eee9 Mon Sep 17 00:00:00 2001
From: edwinofsakh <edwinofsakh@gmail.com>
Date: Sat, 1 Nov 2014 03:33:06 +0400
Subject: [PATCH] Some changes

---
 func/OR/optimizeOR2.m   |  5 -----
 func/misc/plotRegions.m | 33 ++++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/func/OR/optimizeOR2.m b/func/OR/optimizeOR2.m
index 2d13641..8e7bbe1 100644
--- a/func/OR/optimizeOR2.m
+++ b/func/OR/optimizeOR2.m
@@ -36,11 +36,6 @@
 % 12.04.13  Original implementation?
 % 05.10.14  Add epsilon array.
 
-optORm = 1;
-optOR = [31.903782 9.229378 14.503782];
-
-return;
-
 % Decide start new search or continue old
 if (~check_option(varargin, 'continue'))
     ORname = get_option(varargin, 'start', 'KS', 'char');
diff --git a/func/misc/plotRegions.m b/func/misc/plotRegions.m
index 3d368da..a45a9fe 100644
--- a/func/misc/plotRegions.m
+++ b/func/misc/plotRegions.m
@@ -26,6 +26,9 @@ function plotRegions(samples, regions, rxy)
 % History
 % 12.04.13  Original implementation
 
+saveres = getpref('ebsdam','saveResult');
+comment = getComment();
+
 sid_set = unique(samples);
 
 for sid = sid_set
@@ -34,12 +37,15 @@ function plotRegions(samples, regions, rxy)
     ebsd = checkEBSD(sid{:}, 0,0);
     plot(ebsd, 'antipodal', 'r', zvector); hold all;
     
-    xmax = max(get(ebsd, 'X'));
-    ymax = max(get(ebsd, 'Y'));
-    dx = 10;
-    dy = 12;
-    tx = xmax + dx;
-    ty = ymax - dy;
+
+    OutDir = checkDir(sid{:}, 'maps', saveres);
+
+%     xmax = max(get(ebsd, 'X'));
+%     ymax = max(get(ebsd, 'Y'));
+%     dx = 10;
+%     dy = 12;
+%     tx = xmax + dx;
+%     ty = ymax - dy;
     
     for i = ind
         name = regions{i};
@@ -48,24 +54,25 @@ function plotRegions(samples, regions, rxy)
             case 1
 %                 mtex_text(tx, ty, name);
 %                 line([tx xmax], [ty ymax], 'LineWidth',1.5, 'LineStyle','-', 'Color', 'b');
-                [Xf, Yf] = DS2NFU([tx xmax], [ty ymax]);
-                annotation('textarrow', Xf, Yf, 'String', name);
+%                 [Xf, Yf] = DS2NFU([tx xmax], [ty ymax]);
+%                 annotation('textarrow', Xf, Yf, 'String', name);
             case 4
                 x = xy(1); y = xy(2);
                 w = xy(3); h = xy(4);
                 rectangle('Position',[x,y,w,h],'LineWidth',1.5, 'LineStyle','--','EdgeColor','k');
 %                 mtex_text(tx, ty, name);
-                [Xf, Yf] = DS2NFU([tx x+w], [ty y+h]);
-                annotation('textarrow', Xf, Yf,  'String', name);
+%                 [Xf, Yf] = DS2NFU([tx x+w], [ty y+h]);
+%                 annotation('textarrow', Xf, Yf,  'String', name);
             otherwise
                 line(xy(:,1),xy(:,2), 'LineWidth',1.5,'LineStyle','--', 'Color', 'k');
 %                 mtex_text(tx, ty, name);
 %                 line([tx xy(1,1)], [ty xy(1,2)], 'LineWidth',1.5, 'LineStyle','-', 'Color', 'b');
-                [Xf, Yf] = DS2NFU([tx xy(1,1)], [ty xy(1,2)]);
-                annotation('textarrow', Xf, Yf,  'String', name);
+%                 [Xf, Yf] = DS2NFU([tx xy(1,1)], [ty xy(1,2)]);
+%                 annotation('textarrow', Xf, Yf,  'String', name);
         end
-        ty = ty - dy;
+%         ty = ty - dy;
     end
+    saveimg( saveres, 1, OutDir, sid{:}, 'regions', 'png', comment );
 end
 
 end