#if windows gtestLibName=gtest.dll else libgtest.a
set(gtestLibName libgtest.a)
set(GTEST_LIB ${GTEST_DIR}/build/${gtestLibName})
-message(gtestlib name = ${GTEST_LIB})
+#message(gtestlib name = ${GTEST_LIB})
set_property(TARGET gtest PROPERTY IMPORTED_LOCATION "${GTEST_LIB}")
include_directories(${GTEST_DIR}/include/)
FILE(GLOB srcs *.cxx)
ADD_EXECUTABLE(vvTest ${srcs})
-target_link_libraries(vvTest vvLib ${vvExternalLibs} gtest)
+target_link_libraries(vvTest vvLib gtest)
# Add all tests found in the source code, calling the executable to run them
add_google_tests ( ${EXECUTABLE_OUTPUT_PATH}/vvTest ${srcs})
</property>
<addaction name="actionNavigation_Help"/>
<addaction name="actionDocumentation"/>
+ <addaction name="actionRegister_vv"/>
</widget>
<widget class="QMenu" name="menuOverlay">
<property name="title">
<string>Experimental...</string>
</property>
</action>
+ <action name="actionRegister_vv">
+ <property name="text">
+ <string>Register vv</string>
+ </property>
+ </action>
</widget>
<customwidgets>
<customwidget>
<height>121</height>
</rect>
</property>
+ <property name="contextMenuPolicy">
+ <enum>Qt::DefaultContextMenu</enum>
+ </property>
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
<property name="html">
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
connect(actionAdd_VF_to_current_Image,SIGNAL(triggered()),this,SLOT(OpenField()));
connect(actionNavigation_Help,SIGNAL(triggered()),this,SLOT(ShowHelpDialog()));
connect(actionDocumentation,SIGNAL(triggered()),this,SLOT(ShowDocumentation()));
+ connect(actionRegister_vv,SIGNAL(triggered()),this,SLOT(PopupRegisterForm()));
///////////////////////////////////////////////
connect(actionSegmentation,SIGNAL(triggered()),this,SLOT(SegmentationOnCurrentImage()));
void vvMainWindow::show(){
vvMainWindowBase::show();
- vvRegisterForm* registerForm = new vvRegisterForm(QUrl("http://www.creatis.insa-lyon.fr/~dsarrut/vvregister/write.php"), getVVSettingsPath(), getSettingsOptionFormat());
- if(registerForm->canPush()){
- registerForm->show();
- registerForm->acquitPushed();//too bad if there is not internet connection anymore.
- }
+ PopupRegisterForm(true);
}
//------------------------------------------------------------------------------
void vvMainWindow::UpdateMemoryUsage()
{
documentation->show();
}
+//------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------
+void vvMainWindow::PopupRegisterForm(bool checkCanPush)
+{
+ vvRegisterForm* registerForm = new vvRegisterForm(QUrl("http://www.creatis.insa-lyon.fr/~dsarrut/vvregister/write.php"), getVVSettingsPath(), getSettingsOptionFormat());
+ if(!checkCanPush){
+ registerForm->show();
+ }else{
+ if(registerForm->canPush()){
+ registerForm->show();
+ registerForm->acquitPushed();//too bad if there is not internet connection anymore.
+ }
+ }
+}
+//------------------------------------------------------------------------------
+
//------------------------------------------------------------------------------
void vvMainWindow::ShowHelpDialog()
{
void ImageInfoChanged();
void ShowHelpDialog();
void ShowDocumentation();
+ void PopupRegisterForm(bool checkCanPush=false);
void ComputeDeformableRegistration();
void WarpImage();
void ChangeViewMode();
#include "vvRegisterForm.h"
#include <QNetworkRequest>
#include <QDir>
+#include <QPalette>
#include "common/globals.h"
#include "vvCommon.h"
#include "vvUtils.h"
vvRegisterForm::vvRegisterForm(QUrl url, QString path, QSettings::Format format):url(url), settings(path, format){
manager = new QNetworkAccessManager(this);
setupUi(this);
+ textBrowser->viewport()->setAutoFillBackground(false);
}
void vvRegisterForm::sendData(){