Upstream R6246

Cardiac-MR-Group-Lund · Mar 19, 2018 · 4b46fe8 · 4b46fe8
1 parent a448411
commit 4b46fe8
Show file tree

Hide file tree

Showing 144 changed files with 4,703 additions and 1,031 deletions.
diff --git a/source/+bruker/brukerreader.p b/source/+bruker/brukerreader.p
diff --git a/source/+corelab/corelab.p b/source/+corelab/corelab.p
diff --git a/source/+ct/CTBoneSegmentation.p b/source/+ct/CTBoneSegmentation.p
diff --git a/source/+ct/CTLVSegmentation.p b/source/+ct/CTLVSegmentation.p
diff --git a/source/+ct/CTWholeHeartSegmentation.p b/source/+ct/CTWholeHeartSegmentation.p
diff --git a/source/+ct/coronaryOstiaSearch.p b/source/+ct/coronaryOstiaSearch.p
diff --git a/source/+ct/ctlicensecheck.p b/source/+ct/ctlicensecheck.p
diff --git a/source/+ct/ctperfusion.p b/source/+ct/ctperfusion.p
diff --git a/source/+ct/imagestacksct.p b/source/+ct/imagestacksct.p
diff --git a/source/+perfusion/perfusion.p b/source/+perfusion/perfusion.p
diff --git a/source/+perfusion/perfusionscoring.fig b/source/+perfusion/perfusionscoring.fig
diff --git a/source/+perfusion/perfusionscoring.m b/source/+perfusion/perfusionscoring.m
diff --git a/source/+pwv/pulsewavevelocity.p b/source/+pwv/pulsewavevelocity.p
diff --git a/source/+reporter/htmlgenerator.m b/source/+reporter/htmlgenerator.m
@@ -53,35 +53,54 @@
     end
 
     %-------------
-    function stri = table(hg, content, boldcells, width)
+    function stri = table(hg, content, boldcells, width, bgcolors)
     %-------------
     %TABLE Method to insert a table with content specified by a cell.
-
-      if nargin < 4
+    if nargin <5
+      bgcolors = zeros(size(content));
+      if nargin < 4 
         width = round(0.625*hg.pagewidth);
-        if nargin < 3
+        if nargin < 3 
           boldcells = zeros(size(content));
-          if nargin < 2
+          if nargin < 2 
             myfailed('Too few input arguments.');
           end
         end
       end
-
+    end
+      tdstring='<td>';
       stri = sprintf('<table frame=box rules=all width=%d>\n', width);
       for i = 1:size(content, 1)
         stri = [stri sprintf('<tr>\n')]; %#ok<AGROW>
         for j = 1:size(content, 2)
+          if bgcolors(i,j) == 2
+            tdstring='<td bgcolor=#ff0000>';
+          elseif bgcolors(i,j) == 3
+           tdstring='<td bgcolor=#ffff00>';
+          elseif bgcolors(i,j) == 4
+            tdstring='<td bgcolor=#33ccff>';
+          else
+             tdstring='<td>';
+          end 
+
           if boldcells(i, j) == 2
             b1 = '<font color="red">';
+            b2 = '</font>';          
+          elseif boldcells(i, j) == 3
+            b1 = '<font color="yellow">';
+            b2 = '</font>';            
+          elseif boldcells(i, j) == 4
+            b1 = '<font color="blue">';
             b2 = '</font>';
+
           elseif boldcells(i, j)
             b1 = '<b>';
             b2 = '</b>';
           else
             b1 = '';
             b2 = '';
           end
-          stri = [stri sprintf('<td>%s%s%s</td>\n', b1, content{i,j}, b2)]; %#ok<AGROW>
+          stri = [stri sprintf('%s%s%s%s</td>\n',tdstring, b1, content{i,j}, b2)]; %#ok<AGROW>
         end
         stri = [stri sprintf('</tr>\n')]; %#ok<AGROW>
       end

diff --git a/source/+reporter/reportsheet.fig b/source/+reporter/reportsheet.fig
diff --git a/source/+reporter/reportsheet.p b/source/+reporter/reportsheet.p
diff --git a/source/+spect/spectlvsegmentation.p b/source/+spect/spectlvsegmentation.p
diff --git a/source/+spect/spectmarsegmentation.p b/source/+spect/spectmarsegmentation.p
diff --git a/source/+spect/spectperfusionsegmentation.p b/source/+spect/spectperfusionsegmentation.p
diff --git a/source/+spect/spectregistration.p b/source/+spect/spectregistration.p
diff --git a/source/+strain/strain.p b/source/+strain/strain.p
diff --git a/source/+straintagging/cm_readMhdData.p b/source/+straintagging/cm_readMhdData.p
diff --git a/source/+straintagging/cm_readVTKData.p b/source/+straintagging/cm_readVTKData.p
diff --git a/source/+straintagging/cm_writeMhdData.p b/source/+straintagging/cm_writeMhdData.p
diff --git a/source/+straintagging/cm_writeVTKData.p b/source/+straintagging/cm_writeVTKData.p
diff --git a/source/+straintagging/dyssynchrony.m b/source/+straintagging/dyssynchrony.m
@@ -213,6 +213,12 @@ function init(taggroup,type)
 
 radio_Callback;
 
+%unclick apex after initiation
+if strcmp(type,'SAX')
+  set(gui.handles.radiobutton17,'Value',0)
+  radio_Callback
+end
+
 
 function setpeak_Callback(type,ind)
 global DATA

diff --git a/source/+straintagging/runexe.p b/source/+straintagging/runexe.p
diff --git a/source/+straintagging/strainselectslices.p b/source/+straintagging/strainselectslices.p
diff --git a/source/+straintagging/straintagging.p b/source/+straintagging/straintagging.p
diff --git a/source/+t2star/t2star.p b/source/+t2star/t2star.p
diff --git a/source/+t2star/t2star_ADAPTS5.p b/source/+t2star/t2star_ADAPTS5.p
diff --git a/source/+translation/dictionary.mat b/source/+translation/dictionary.mat
diff --git a/source/Docs/segmentcmrinstallation.pdf → source/Docs/installationmanual.pdf b/source/Docs/segmentcmrinstallation.pdf → source/Docs/installationmanual.pdf
diff --git a/source/Docs/segmentcmrmanual.pdf → source/Docs/manual.pdf b/source/Docs/segmentcmrmanual.pdf → source/Docs/manual.pdf
diff --git a/source/Docs/segmentcmrinstructionsforuse.pdf b/source/Docs/segmentcmrinstructionsforuse.pdf
diff --git a/source/Docs/segmentcmrinstructionsforuse_Czech.pdf b/source/Docs/segmentcmrinstructionsforuse_Czech.pdf
diff --git a/source/Docs/segmentcmrinstructionsforuse_German.pdf b/source/Docs/segmentcmrinstructionsforuse_German.pdf
diff --git a/source/Docs/segmentcmrinstructionsforuse_Italiano.pdf b/source/Docs/segmentcmrinstructionsforuse_Italiano.pdf
diff --git a/source/Docs/segmentcmrinstructionsforuse_Svenska.pdf b/source/Docs/segmentcmrinstructionsforuse_Svenska.pdf
diff --git a/source/Docs/segmentcmrinstructionsforuse_US.pdf b/source/Docs/segmentcmrinstructionsforuse_US.pdf
diff --git a/source/S.p b/source/S.p
diff --git a/source/alignment2D.p b/source/alignment2D.p
diff --git a/source/alignment3D.p b/source/alignment3D.p
diff --git a/source/autocrop.p b/source/autocrop.p
diff --git a/source/autocropall.p b/source/autocropall.p
diff --git a/source/avplane.p b/source/avplane.p
diff --git a/source/axestable.m b/source/axestable.m
@@ -206,23 +206,27 @@ function draw(obj)
         return;
       end
 
+      set(obj.axes,'Color',obj.backgroundcolor);
+      set(obj.linex,'color',obj.backgroundcolor)
+      set(obj.liney,'color',obj.backgroundcolor)
+
       for loop=1:length(obj.Table) %Update all titles
         stri = translation.dictionary(obj.Table{loop}.Title);
-        set(obj.Table{loop}.Handle,'String',stri)
+        set(obj.Table{loop}.Handle,'String',stri,'color',obj.fontcolor)
       end
       for loop=1:length(obj.Key) %Update all values.
         for vloop=1:length(obj.Key{loop}.values),
           stri=obj.parseValue(obj.Key{loop}.values{vloop});
           set(obj.Key{loop}.valuesHandle{vloop},...
             'String',stri,...
-            'Position',[obj.Key{loop}.valuesXpos(vloop) obj.FigHeight-obj.Key{loop}.valuesYpos(vloop)]);
+            'Position',[obj.Key{loop}.valuesXpos(vloop) obj.FigHeight-obj.Key{loop}.valuesYpos(vloop)],'color',obj.fontcolor);
 %           stri=obj.parseValue(obj.Key{loop}.Name);
           if ~isempty(obj.Key{loop}.Unit)
             stri=sprintf('%s (%s)',translation.dictionary(obj.Key{loop}.Name),obj.Key{loop}.Unit);
           else
             stri=translation.dictionary(obj.Key{loop}.Name);
           end
-          set(obj.Key{loop}.keyHandle,'String',stri);
+          set(obj.Key{loop}.keyHandle,'String',stri,'color',obj.fontcolor);
         end
       end
     end
@@ -590,6 +594,8 @@ function firstdraw(obj)
             str=obj.defaultclearstring;
           elseif value==round(value)
             str=sprintf('%3d',value);
+          elseif value < 10
+            str=sprintf('%3.2f',value);
           else
             str=sprintf('%3.1f',value);
           end

diff --git a/source/calcfunctions.m b/source/calcfunctions.m
@@ -1093,7 +1093,7 @@ function volume_helper(no)
       elseif SET(no).TSize>2
         %find a corresponding (closest) tf in no, for each tf in noseg
         alltf = (1+((1:40)-1)/(SET(noseg(loop)).TSize-1)*(SET(no).TSize-1));
-        tfs = find(SET(no).CurrentTimeFrame==round(alltf));
+        tfs = max(1,min(SET(noseg(loop)).TSize,find(SET(no).CurrentTimeFrame==round(alltf))));
         tfdiff = abs(alltf(tfs)-SET(no).CurrentTimeFrame);
 %         tf = round(1+(SET(no).CurrentTimeFrame-1)/(SET(no).TSize-1)*(SET(noseg(loop)).TSize-1));
         %[~,tf] = min(abs(SET(noseg(loop)).TimeVector-SET(no).TimeVector(SET(no).CurrentTimeFrame)));
@@ -2812,7 +2812,6 @@ function calcflow(no) %#ok<DEFNU>
 
 global DATA SET
 
-tic
 nom = SET(no).Flow.MagnitudeNo;
 nop = SET(nom).Flow.PhaseNo;
 
@@ -2880,8 +2879,6 @@ function calcflow(no) %#ok<DEFNU>
 SET(nom).Flow.Result(roinbr).regfrac = abs(100*SET(nom).Flow.Result(roinbr).netbackwardvol/SET(nom).Flow.Result(roinbr).netforwardvol);
 SET(nom).Flow.Result(roinbr).sv = SET(nom).Flow.Result(roinbr).nettotvol/hr*60;
 
-toc
-
 
 %---------------------------
 function clearflow(no,roinbr) %#ok<DEFNU>

diff --git a/source/cessfpmarsegmentation.p b/source/cessfpmarsegmentation.p
diff --git a/source/changelog.p b/source/changelog.p
diff --git a/source/checkdatabaselicense.p b/source/checkdatabaselicense.p
diff --git a/source/colormapecv.mat b/source/colormapecv.mat
diff --git a/source/colormapt1.mat b/source/colormapt1.mat
diff --git a/source/communicate.p b/source/communicate.p
diff --git a/source/conquest.con b/source/conquest.con
diff --git a/source/dicomanonymize.p b/source/dicomanonymize.p
diff --git a/source/dicomsorter.p b/source/dicomsorter.p