Merge pull request #2 from ashishsingh18/changesForv2021.02

modifications for v2021.02

Author: ashishsingh18

Modules/CaPTkInteractiveSegmentation/CMakeLists.txt

@@ -1,6 +1,6 @@
 mitk_create_module(
   INCLUDE_DIRS PUBLIC include third_party/jsoncpp/include
-  PACKAGE_DEPENDS ITK Qt5|Core+Widgets PRIVATE yaml-cpp
+  PACKAGE_DEPENDS ITK Qt5|Core+Widgets OpenCV PRIVATE yaml-cpp
   DEPENDS PUBLIC MitkCore MitkMultilabel #MitkCaPTkCommon
 )
 

Modules/CaPTkInteractiveSegmentation/src/SvmSuiteManager.cpp

@@ -70,7 +70,7 @@ void SvmSuite::Manager::Train()
 				);
 				message("", false, true);
 			}
-			catch (cv::Exception ex) {
+			catch (cv::Exception& ex) {
 				errorOccured(ex.what());
 			}
 

Plugins/upenn.cbica.captk.interactivesegmentation/src/internal/QmitkCaPTkInteractiveSegmentationControls.ui

@@ -6,37 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>459</width>
-    <height>857</height>
+    <width>460</width>
+    <height>853</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="font">
-   <font>
-    <family>MS Shell Dlg 2</family>
-    <pointsize>8</pointsize>
-    <weight>50</weight>
-    <italic>false</italic>
-    <bold>false</bold>
-    <underline>false</underline>
-    <strikeout>false</strikeout>
-   </font>
-  </property>
   <property name="windowTitle">
-   <string>QmitkCaPTkInteractiveSegmentation</string>
+   <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_5">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBoxInstructions">
      <property name="sizePolicy">
@@ -124,7 +101,7 @@
          <string>...</string>
         </property>
         <property name="icon">
-         <iconset resource="../../resources/captkinteractivesegmentation.qrc">
+         <iconset resource="../../../../../InteractiveSegmentation/Plugins/upenn.cbica.captk.interactivesegmentation/resources/captkinteractivesegmentation.qrc">
           <normaloff>:/captkinteractivesegmentation/NewSegmentationSession_48x48.png</normaloff>:/captkinteractivesegmentation/NewSegmentationSession_48x48.png</iconset>
         </property>
         <property name="iconSize">
@@ -201,31 +178,22 @@
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
-       <height>40</height>
+       <height>466</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
-  <zorder>groupBox_DataSelection</zorder>
-  <zorder>groupBox_Run</zorder>
-  <zorder>groupBoxInstructions</zorder>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="global">QmitkToolReferenceDataSelectionBox.h</include>
-  <include location="global">QmitkToolGUIArea.h</include>
-  <include location="global">QmitkToolSelectionBox.h</include>
- </includes>
  <resources>
-  <include location="../../resources/captkinteractivesegmentation.qrc"/>
+  <include location="../../../../../InteractiveSegmentation/Plugins/upenn.cbica.captk.interactivesegmentation/resources/captkinteractivesegmentation.qrc"/>
  </resources>
  <connections/>
 </ui>

Plugins/upenn.cbica.captk.interactivesegmentation/src/internal/QmitkCaPTkInteractiveSegmentationView.cpp

@@ -20,7 +20,6 @@
 #include <usGetModuleContext.h>
 #include <usModule.h>
 #include <usModuleContext.h>
-#include <usModuleResource.h>
 #include <usModuleResourceStream.h>
 
 // Qt
@@ -32,8 +31,6 @@
 // CaPTk
 #include "CaPTkInteractiveSegmentation.h"
 
-#include "tinyxml.h"
-
 #include <itksys/SystemTools.hxx>
 
 #include <regex>

Plugins/upenn.cbica.captk.interactivesegmentation/src/internal/QmitkCaPTkInteractiveSegmentationView.h

@@ -7,6 +7,11 @@
 
 #include "ui_QmitkCaPTkInteractiveSegmentationControls.h"
 
+// us
+#include <usModuleResource.h>
+
+#include <mitkNodePredicateAnd.h>
+
 class CaPTkInteractiveSegmentation;
 
 // berry