From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Tue, 17 Jan 2017 14:15:25 +0000 (+0100)
Subject: Merge branch 'master' into wipe
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=00f0cf9c85ed7ed21404d851c07cf02e4ccfa5ab;p=clitk.git

Merge branch 'master' into wipe

Conflicts:
	vv/qt_ui/vvMainWindow.ui
	vv/vvIcons.qrc
---

00f0cf9c85ed7ed21404d851c07cf02e4ccfa5ab
diff --cc vv/qt_ui/vvMainWindow.ui
index 91774e8,ec4051a..10c8400
--- a/vv/qt_ui/vvMainWindow.ui
+++ b/vv/qt_ui/vvMainWindow.ui
@@@ -1277,18 -1277,11 +1278,25 @@@
      <bool>true</bool>
     </property>
    </action>
 +  <action name="actionAdd_wipe_image">
 +   <property name="icon">
 +    <iconset resource="../vvIcons.qrc">
 +     <normaloff>:/common/icons/wipe.png</normaloff>:/common/icons/wipe.png</iconset>
 +   </property>
 +   <property name="text">
 +    <string>Add wipe Image</string>
 +   </property>
 +   <property name="iconVisibleInMenu">
 +    <bool>true</bool>
 +   </property>
 +  </action>
+   <action name="actionConnect_Pacs">
+    <property name="text">
+     <string>Connect Pacs</string>
+    </property>
+   </action>
++   </property>
++  </action>
   </widget>
   <customwidgets>
    <customwidget>
diff --cc vv/vvIcons.qrc
index 8c8d0a5,a5e31cc..dba9116
--- a/vv/vvIcons.qrc
+++ b/vv/vvIcons.qrc
@@@ -41,6 -41,8 +41,9 @@@
      <file>icons/standardbutton-apply-16.png</file>
      <file>icons/standardbutton-cancel-16.png</file>
      <file>icons/identity.png</file>
 +    <file>icons/wipe.png</file>
+ 	<file>icons/basket_download.png</file>
+ 	<file>icons/edit.png</file>
+ 	<file>icons/bullet_info.png</file>
    </qresource>
  </RCC>
diff --cc vv/vvMainWindow.h
index d587a7f,8908b24..81bc7c4
--- a/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@@ -197,9 -199,11 +203,13 @@@ private
    vvHelpDialog *help_dialog;
    vvDocumentation *documentation;
    vvDicomSeriesSelector *dicomSeriesSelector;
 +  
 +  vvWipeImage::Pointer mWipeImage;
  
+ #if CLITK_USE_PACS_CONNECTION
+   vvQPacsConnection *PacsConnection;
+ #endif
+ 
    bool viewMode;
    bool playMode;