Merge pull request #430 from neutronimaging/issue428-releaseissues

Fixed some issues detected during release test
neutronimaging · Mar 23, 2020 · 6526dcc · 6526dcc
2 parents f2a9f79 + 310999d
commit 6526dcc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/applications/muhrec/src/piercingpointdialog.ui b/applications/muhrec/src/piercingpointdialog.ui
@@ -99,8 +99,8 @@
           <widget class="QtAddons::uxROIWidget" name="widgetEstimationROI" native="true">
            <property name="minimumSize">
             <size>
-             <width>160</width>
-             <height>120</height>
+             <width>220</width>
+             <height>145</height>
             </size>
            </property>
           </widget>
@@ -173,6 +173,7 @@
    <container>1</container>
    <slots>
     <signal>valueChanged(int,int,int,int)</signal>
+    <signal>toggled(bool)</signal>
    </slots>
   </customwidget>
  </customwidgets>

diff --git a/core/algorithms/ImagingAlgorithms/src/averageimage.cpp b/core/algorithms/ImagingAlgorithms/src/averageimage.cpp
@@ -224,6 +224,7 @@ void string2enum(std::string str, ImagingAlgorithms::AverageImage::eAverageMetho
 {
     std::map<std::string,ImagingAlgorithms::AverageImage::eAverageMethod> methods;
 
+    methods["ImageSelectSingle"]=ImagingAlgorithms::AverageImage::ImageSelectSingle;
     methods["ImageSum"]=ImagingAlgorithms::AverageImage::ImageSum;
     methods["ImageAverage"]=ImagingAlgorithms::AverageImage::ImageAverage;
     methods["ImageMedian"]=ImagingAlgorithms::AverageImage::ImageMedian;
@@ -242,6 +243,7 @@ std::string enum2string(ImagingAlgorithms::AverageImage::eAverageMethod eam)
     std::string str;
 
     switch (eam) {
+        case ImagingAlgorithms::AverageImage::ImageSelectSingle: str="ImageSelectSingle"; break;
         case ImagingAlgorithms::AverageImage::ImageSum: str="ImageSum"; break;
         case ImagingAlgorithms::AverageImage::ImageAverage: str="ImageAverage"; break;
         case ImagingAlgorithms::AverageImage::ImageMedian: str="ImageMedian"; break;

diff --git a/frameworks/tomography/Preprocessing/StdPreprocModulesGUI/src/FullLogNormDlg.ui b/frameworks/tomography/Preprocessing/StdPreprocModulesGUI/src/FullLogNormDlg.ui
@@ -30,6 +30,11 @@
          <property name="toolTip">
           <string>Selects image combination method</string>
          </property>
+         <item>
+          <property name="text">
+           <string>Single image</string>
+          </property>
+         </item>
          <item>
           <property name="text">
            <string>Sum</string>