From c4b6811d9bffff3e2c285391ba132db25a80ff09 Mon Sep 17 00:00:00 2001 From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch> Date: Thu, 19 May 2016 13:00:59 +0200 Subject: [PATCH] in CMakeLists.txt, I replaced 'atlas_install_scripts' with 'atlas_install_runtime' to fix teh installation of the ATLAS logo PNG file in the share/ folder (VP1Gui-00-08-10) 2016-05-19 Riccardo.Maria.Bianchi@cern.ch * replaced in CMakeLists.txt 'atlas_install_scripts' with 'atlas_install_runtime' to fix teh installation of the ATLAS logo PNG file in the share/ folder. * new tag: VP1Gui-00-08-10 2016-05-18 Riccardo.Maria.Bianchi@cern.ch * saving the name of the latest image produced in a cache file, for the batch production. More details here: https://its.cern.ch/jira/browse/ATLASVPONE-220 * tag: VP1Gui-00-08-09 2016-03-01 Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> * Copied the UI files from the header directory back to src/. As the CMT build can't pick them up from the header directory. Just like how CMake can't pick them up from src/. So for now let's just keep two copies of them. Once the CMT build is no longer an issue, the files should be removed from src/. * Tagging as VP1Gui-00-08-08 ... (Long ChangeLog diff - truncated) --- graphics/VP1/VP1Gui/CMakeLists.txt | 41 + graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h | 2 +- .../VP1/VP1Gui/VP1Gui/VP1ChannelManager.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1DockWidget.h | 0 .../VP1/VP1Gui/VP1Gui/VP1ExecutionScheduler.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1Gui.h | 0 .../VP1Gui/VP1Gui/VP1IncomingMessageDialog.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1MainWindow.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1PluginDialog.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1Prioritiser.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1TabManager.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1TcpServer.h | 0 graphics/VP1/VP1Gui/VP1Gui/VP1TextBrowser.h | 0 .../vp1authenticator.ui} | 0 graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui | 853 ++++++++++++++++++ graphics/VP1/VP1Gui/cmt/requirements | 5 +- .../VP1Gui/share/ATLAS-Logo-New_300pixels.png | Bin 0 -> 11082 bytes graphics/VP1/VP1Gui/src/VP1ChannelManager.cxx | 0 graphics/VP1/VP1Gui/src/VP1DockWidget.cxx | 0 .../VP1/VP1Gui/src/VP1EventDisplayEditor.cxx | 2 +- .../VP1/VP1Gui/src/VP1ExecutionScheduler.cxx | 27 +- graphics/VP1/VP1Gui/src/VP1Gui.cxx | 0 .../VP1Gui/src/VP1IncomingMessageDialog.cxx | 2 +- graphics/VP1/VP1Gui/src/VP1MainWindow.cxx | 0 graphics/VP1/VP1Gui/src/VP1PluginDialog.cxx | 0 graphics/VP1/VP1Gui/src/VP1Prioritiser.cxx | 0 graphics/VP1/VP1Gui/src/VP1TabManager.cxx | 0 graphics/VP1/VP1Gui/src/VP1TcpServer.cxx | 0 graphics/VP1/VP1Gui/src/VP1TextBrowser.cxx | 0 graphics/VP1/VP1Gui/src/icons/3d_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/back_32x32.png | Bin .../VP1Gui/src/icons/button_cancel_32x32.png | Bin .../VP1/VP1Gui/src/icons/button_ok_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/camera.png | Bin graphics/VP1/VP1Gui/src/icons/down_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/edit_32x32.png | Bin .../VP1/VP1Gui/src/icons/editcopy_32x32.png | Bin .../VP1/VP1Gui/src/icons/fileclose_32x32.png | Bin .../VP1/VP1Gui/src/icons/filefind_32x32.png | Bin .../VP1/VP1Gui/src/icons/filenew_32x32.png | Bin .../VP1/VP1Gui/src/icons/fileopen_32x32.png | Bin .../VP1/VP1Gui/src/icons/fileprint_32x32.png | Bin .../VP1Gui/src/icons/filequickprint_32x32.png | Bin .../VP1/VP1Gui/src/icons/filesave_32x32.png | Bin .../VP1/VP1Gui/src/icons/filesaveas_32x32.png | Bin .../VP1/VP1Gui/src/icons/forward_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/help_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/info_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/kcalc_32x32.png | Bin .../VP1/VP1Gui/src/icons/kchart_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/kivio_32x32.png | Bin .../VP1/VP1Gui/src/icons/launch_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/log_32x32.png | Bin .../VP1/VP1Gui/src/icons/network_64x64.png | Bin .../src/icons/network_disconnect_64x64.png | Bin graphics/VP1/VP1Gui/src/icons/no3D_32x32.png | Bin .../src/icons/package_settings_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/redo_32x32.png | Bin graphics/VP1/VP1Gui/src/icons/undo_32x32.png | Bin .../src/icons/window_fullscreen_32x32.png | Bin .../VP1Gui/src/icons/window_list_32x32.png | Bin .../src/icons/window_nofullscreen_32x32.png | Bin .../VP1/VP1Gui/src/icons/yast_route_32x32.png | Bin graphics/VP1/VP1Gui/src/vp1.qrc | 0 graphics/VP1/VP1Gui/src/vp1authenticator.ui | 209 +++++ ...playwidget.ui => vp1eventdisplayeditor.ui} | 0 ...ageform.ui => vp1incomingmessagedialog.ui} | 0 graphics/VP1/VP1Gui/src/vp1mainwindow.ui | 0 graphics/VP1/VP1Gui/src/vp1plugindialog.ui | 0 69 files changed, 1135 insertions(+), 6 deletions(-) create mode 100644 graphics/VP1/VP1Gui/CMakeLists.txt mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1ChannelManager.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1DockWidget.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1ExecutionScheduler.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1Gui.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1IncomingMessageDialog.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1MainWindow.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1PluginDialog.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1Prioritiser.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1TabManager.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1TcpServer.h mode change 100755 => 100644 graphics/VP1/VP1Gui/VP1Gui/VP1TextBrowser.h rename graphics/VP1/VP1Gui/{src/vp1authentication.ui => VP1Gui/vp1authenticator.ui} (100%) create mode 100644 graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui mode change 100755 => 100644 graphics/VP1/VP1Gui/cmt/requirements create mode 100644 graphics/VP1/VP1Gui/share/ATLAS-Logo-New_300pixels.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1ChannelManager.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1DockWidget.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1Gui.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1MainWindow.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1PluginDialog.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1Prioritiser.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1TabManager.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1TcpServer.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/VP1TextBrowser.cxx mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/3d_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/back_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/button_cancel_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/button_ok_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/camera.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/down_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/edit_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/editcopy_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/fileclose_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/filefind_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/filenew_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/fileopen_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/fileprint_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/filequickprint_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/filesave_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/filesaveas_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/forward_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/help_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/info_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/kcalc_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/kchart_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/kivio_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/launch_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/log_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/network_64x64.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/network_disconnect_64x64.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/no3D_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/package_settings_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/redo_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/undo_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/window_fullscreen_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/window_list_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/window_nofullscreen_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/icons/yast_route_32x32.png mode change 100755 => 100644 graphics/VP1/VP1Gui/src/vp1.qrc create mode 100644 graphics/VP1/VP1Gui/src/vp1authenticator.ui rename graphics/VP1/VP1Gui/src/{vp1eventdisplaywidget.ui => vp1eventdisplayeditor.ui} (100%) rename graphics/VP1/VP1Gui/src/{vp1incomingmessageform.ui => vp1incomingmessagedialog.ui} (100%) mode change 100755 => 100644 mode change 100755 => 100644 graphics/VP1/VP1Gui/src/vp1mainwindow.ui mode change 100755 => 100644 graphics/VP1/VP1Gui/src/vp1plugindialog.ui diff --git a/graphics/VP1/VP1Gui/CMakeLists.txt b/graphics/VP1/VP1Gui/CMakeLists.txt new file mode 100644 index 00000000000..c2b5f7ffa47 --- /dev/null +++ b/graphics/VP1/VP1Gui/CMakeLists.txt @@ -0,0 +1,41 @@ +################################################################################ +# Package: VP1Gui +################################################################################ +# Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch> +# Author: Riccardo Maria BIANCHI <rbianchi@cern.ch> +################################################################################ + +# Declare the package name: +atlas_subdir( VP1Gui ) + +# Declare the package's dependencies: +atlas_depends_on_subdirs( + PUBLIC graphics/VP1/VP1Base + PRIVATE graphics/VP1/VP1UtilsBase ) + +# External dependencies: +find_package( Coin3D ) +find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui QtWebKit QtNetwork ) +find_package( SoQt ) + +# Generate UI files automatically: +set( CMAKE_AUTOUIC TRUE ) +# Generate MOC files automatically: +set( CMAKE_AUTOMOC TRUE ) +# Generate resource files automatically: +set( CMAKE_AUTORCC TRUE ) + +# Component(s) in the package: +atlas_add_library( VP1Gui VP1Gui/*.h src/*.h src/*.cxx src/*.qrc + PUBLIC_HEADERS VP1Gui + PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${SOQT_INCLUDE_DIRS} + ${CMAKE_CURRENT_BINARY_DIR} + LINK_LIBRARIES VP1Base Qt4::QtCore Qt4::QtOpenGL Qt4::QtGui Qt4::QtWebKit + Qt4::QtNetwork + PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${SOQT_LIBRARIES} VP1UtilsBase ) + + +# Install files from the package: +##atlas_install_scripts( share/* ) # installs into bin/ +atlas_install_runtime( share/* ) # install into share/ + \ No newline at end of file diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h b/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h index 95a69baa94d..13d7241d5d9 100644 --- a/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h +++ b/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h @@ -16,7 +16,7 @@ #include <QtCore/QObject> #include <QtGui/QDialog> -#include "ui_vp1authentication.h" +#include "ui_vp1authenticator.h" #include <QtNetwork/QNetworkReply> class QNetworkAccessManager; diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1ChannelManager.h b/graphics/VP1/VP1Gui/VP1Gui/VP1ChannelManager.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1DockWidget.h b/graphics/VP1/VP1Gui/VP1Gui/VP1DockWidget.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1ExecutionScheduler.h b/graphics/VP1/VP1Gui/VP1Gui/VP1ExecutionScheduler.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1Gui.h b/graphics/VP1/VP1Gui/VP1Gui/VP1Gui.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1IncomingMessageDialog.h b/graphics/VP1/VP1Gui/VP1Gui/VP1IncomingMessageDialog.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1MainWindow.h b/graphics/VP1/VP1Gui/VP1Gui/VP1MainWindow.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1PluginDialog.h b/graphics/VP1/VP1Gui/VP1Gui/VP1PluginDialog.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1Prioritiser.h b/graphics/VP1/VP1Gui/VP1Gui/VP1Prioritiser.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1TabManager.h b/graphics/VP1/VP1Gui/VP1Gui/VP1TabManager.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1TcpServer.h b/graphics/VP1/VP1Gui/VP1Gui/VP1TcpServer.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1TextBrowser.h b/graphics/VP1/VP1Gui/VP1Gui/VP1TextBrowser.h old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/vp1authentication.ui b/graphics/VP1/VP1Gui/VP1Gui/vp1authenticator.ui similarity index 100% rename from graphics/VP1/VP1Gui/src/vp1authentication.ui rename to graphics/VP1/VP1Gui/VP1Gui/vp1authenticator.ui diff --git a/graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui b/graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui new file mode 100644 index 00000000000..16e2408a785 --- /dev/null +++ b/graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui @@ -0,0 +1,853 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>VP1MainWindow</class> + <widget class="QMainWindow" name="VP1MainWindow"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1002</width> + <height>650</height> + </rect> + </property> + <property name="windowTitle"> + <string>Virtual Point 1</string> + </property> + <property name="windowIcon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/3d_32x32.png</normaloff>:/vp1/icons/icons/3d_32x32.png</iconset> + </property> + <widget class="QWidget" name="centralwidget"> + <layout class="QVBoxLayout"> + <property name="leftMargin"> + <number>6</number> + </property> + <property name="topMargin"> + <number>5</number> + </property> + <property name="rightMargin"> + <number>7</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QSplitter" name="splitter_leftright"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QWidget" name="widget_controlsContainer" native="true"> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>4</number> + </property> + <property name="leftMargin"> + <number>0</number> + </property> + <property name="topMargin"> + <number>3</number> + </property> + <property name="rightMargin"> + <number>0</number> + </property> + <property name="bottomMargin"> + <number>0</number> + </property> + <item> + <widget class="QGroupBox" name="groupBox_channelcontrols"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Controls - No channel selected</string> + </property> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>4</number> + </property> + <item> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QPushButton" name="pushButton_channelfullscreen"> + <property name="toolTip"> + <string>Show current channel fullscreen</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/window_fullscreen_32x32.png</normaloff>:/vp1/icons/icons/window_fullscreen_32x32.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_channelinformation"> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/info_32x32.png</normaloff>:/vp1/icons/icons/info_32x32.png</iconset> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>1</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton_printchannel"> + <property name="toolTip"> + <string>Print channel snapshot</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/fileprint_32x32.png</normaloff>:/vp1/icons/icons/fileprint_32x32.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_savesnapshotchannel"> + <property name="toolTip"> + <string>Save channel snapshot to image file</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/camera.png</normaloff>:/vp1/icons/icons/camera.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_saveAllChannels"> + <property name="toolTip"> + <string>Save all tabs/channels as images in different files</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/window_list_32x32.png</normaloff>:/vp1/icons/icons/window_list_32x32.png</iconset> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton_makeEventDisplay"> + <property name="toolTip"> + <string>Combine current tabs/channels into a single event display</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/event_display_32x32.png</normaloff>:/vp1/icons/icons/event_display_32x32.png</iconset> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_3D"> + <property name="toolTip"> + <string>Open the 3D Stereo tools</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/3D_mode_24x24.png</normaloff>:/vp1/icons/icons/3D_mode_24x24.png</iconset> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QStackedWidget" name="stackedWidget_customcontrols"> + <widget class="QWidget" name="page"/> + <widget class="QWidget" name="page_2"/> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_cruise"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="title"> + <string>Cruise Mode [off]</string> + </property> + <layout class="QHBoxLayout"> + <item> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <widget class="QRadioButton" name="radioButton_cruise_event"> + <property name="text"> + <string>Evt</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButton_cruise_tab"> + <property name="text"> + <string>Tab</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButton_cruise_both"> + <property name="text"> + <string>Both</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>1</width> + <height>10</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_event"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="title"> + <string>Event [No event loaded]</string> + </property> + <layout class="QHBoxLayout"> + <property name="spacing"> + <number>6</number> + </property> + <property name="margin"> + <number>4</number> + </property> + <item> + <widget class="QPushButton" name="pushButton_eventseek"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Seek</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="spinBox_cruise"> + <property name="alignment"> + <set>Qt::AlignRight</set> + </property> + <property name="suffix"> + <string> s</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999</number> + </property> + <property name="value"> + <number>10</number> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_cruise"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/redo_32x32.png</normaloff>:/vp1/icons/icons/redo_32x32.png</iconset> + </property> + <property name="checkable"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_nextevent"> + <property name="toolTip"> + <string>Proceed to next event [Ctrl-N]</string> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="vp1.qrc"> + <normaloff>:/vp1/icons/icons/forward_32x32.png</normaloff>:/vp1/icons/icons/forward_32x32.png</iconset> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <widget class="QSplitter" name="splitter_tabwidget_messagebox"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="lineWidth"> + <number>0</number> + </property> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QStackedWidget" name="stackedWidget_central"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> + </property> + <property name="lineWidth"> + <number>0</number> + </property> + <property name="currentIndex"> + <number>1</number> + </property> + <widget class="QWidget" name="page_tabwidget"> + <layout class="QVBoxLayout"> + <item> + <widget class="VP1TabWidget" name="tabWidget_central"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Ignored" vsizetype="Ignored"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>200</width> + <height>200</height> + </size> + </property> + <property name="currentIndex"> + <number>-1</number> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="page_instructions"> + <layout class="QVBoxLayout"> + <item> + <widget class="QFrame" name="frame_instructions"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>1</height> + </size> + </property> + </spacer> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>1</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout"> + <property name="spacing"> + <number>13</number> + </property> + <item> + <widget class="QLabel" name="label"> + <property name="maximumSize"> + <size> + <width>500</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <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"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600; font-style:italic;">Welcome to Virtual Point 1</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; font-style:italic;"> </span><a href="[http://cern.ch/atlas-vp1]"><span style=" text-decoration: underline; color:#0000ff;">[http://cern.ch/atlas-vp1]</span></a></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">VP1 is now uses plugins to process and present the data and</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">detector information which is available in the ATHENA process it runs on top of.</p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Most users should proceed by selecting one of these modes:</p></body></html></string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <property name="spacing"> + <number>0</number> + </property> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>1</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <layout class="QGridLayout" name="gridLayout"> + <property name="spacing"> + <number>2</number> + </property> + <item row="0" column="0" colspan="3"> + <widget class="QPushButton" name="pushButton_quicksetup_3dcocktail"> + <property name="toolTip"> + <string>Launch the VP13DCocktailPlugin within a new tab</string> + </property> + <property name="text"> + <string>All studies</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QPushButton" name="pushButton_quicksetup_trackingstudies"> + <property name="toolTip"> + <string>Launch the VP1TrackPlugin within a new tab</string> + </property> + <property name="text"> + <string>Tracking only studies</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="pushButton_quicksetup_calostudies"> + <property name="toolTip"> + <string>Launch the VP1CaloPlugin within a new tab</string> + </property> + <property name="text"> + <string>Calo only studies</string> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QPushButton" name="pushButton_quicksetup_geometrystudies"> + <property name="toolTip"> + <string>Launch the VP1GeometryPlugin within a new tab</string> + </property> + <property name="text"> + <string>Geometry studies</string> + </property> + </widget> + </item> + <item row="2" column="0" colspan="3"> + <widget class="QPushButton" name="pushButton_quicksetup_analysisstudies"> + <property name="toolTip"> + <string><html><head/><body><p>Launch the Analysis Object (AOD) plugin within a new tab.</p></body></html></string> + </property> + <property name="text"> + <string>Analysis Object (AOD) only studies</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>1</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="maximumSize"> + <size> + <width>500</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <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"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Advanced users might wish to take full advantage of the flexible configuration</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">capabilities of VP1 by loading and configuring plugins via the &quot;Quick Launch&quot;</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">and &quot;Configuration&quot; menus, and by right-clicking tabs.</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Note that it is possible </span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">to save and load configurations </span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">from the &quot;Configuration&quot; menu.</span></p></td></tr></table></body></html></string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType"> + <enum>QSizePolicy::Expanding</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>1</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>1</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + </widget> + <widget class="VP1TextBrowser" name="textBrowser_channelmessages"> + <property name="toolTip"> + <string>Message box. Displays messages from channels and systems.</string> + </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"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;"> +<tr> +<td style="border: none;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></td></tr></table></body></html></string> + </property> + <property name="textInteractionFlags"> + <set>Qt::TextSelectableByMouse</set> + </property> + </widget> + </widget> + </widget> + </item> + </layout> + </widget> + <widget class="QMenuBar" name="menubar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1002</width> + <height>25</height> + </rect> + </property> + <widget class="QMenu" name="menuConfiguration"> + <property name="title"> + <string>&Configuration</string> + </property> + <addaction name="separator"/> + </widget> + <widget class="QMenu" name="menu_Style"> + <property name="title"> + <string>&Style</string> + </property> + </widget> + <widget class="QMenu" name="menuQuick_Launch"> + <property name="title"> + <string>&Quick Launch</string> + </property> + <addaction name="action_quicklaunch_3dcocktail"/> + <addaction name="action_quicklaunch_Tracking_studies"/> + <addaction name="action_quicklaunch_Calo_studies"/> + <addaction name="action_quicklaunch_Geometry_studies"/> + <addaction name="action_quicklaunch_trackcalo_commis"/> + <addaction name="action_quicklaunch_Storegate_browser"/> + <addaction name="separator"/> + <addaction name="action_exit_VP1"/> + </widget> + <addaction name="menuQuick_Launch"/> + <addaction name="menuConfiguration"/> + <addaction name="menu_Style"/> + </widget> + <widget class="QStatusBar" name="statusbar"/> + <action name="actionLoad_plugin"> + <property name="text"> + <string>Load plugin</string> + </property> + </action> + <action name="actionAdd_empty_tab2"> + <property name="text"> + <string>&Add empty tab</string> + </property> + </action> + <action name="actionInfo_about_loaded_plugins"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>&Info about loaded plugins</string> + </property> + </action> + <action name="actionLaunch_config_dialog"> + <property name="text"> + <string>Launch &config dialog</string> + </property> + </action> + <action name="actionLoad_tab_configuration_from_file"> + <property name="text"> + <string>&Load tab configuration from file</string> + </property> + </action> + <action name="actionSave_current_tabs2"> + <property name="text"> + <string>&Save current tab configuration to file</string> + </property> + </action> + <action name="actionDummyLoadPlugSubMenu"> + <property name="text"> + <string>DummyLoadPlugSubMenu</string> + </property> + </action> + <action name="actionLoad_Plugin"> + <property name="text"> + <string>Load Plugin</string> + </property> + </action> + <action name="action_quicklaunch_Tracking_studies"> + <property name="text"> + <string>&Tracking only studies</string> + </property> + <property name="statusTip"> + <string>Launch a tab with a track channel</string> + </property> + </action> + <action name="action_quicklaunch_Calo_studies"> + <property name="text"> + <string>&Calo only studies</string> + </property> + <property name="statusTip"> + <string>Launch a tab with a calo cells channel</string> + </property> + </action> + <action name="action_quicklaunch_Geometry_studies"> + <property name="text"> + <string>&Geometry studies</string> + </property> + <property name="statusTip"> + <string>Launch a tab with a geometry channel</string> + </property> + </action> + <action name="action_exit_VP1"> + <property name="text"> + <string>E&xit VP1</string> + </property> + <property name="statusTip"> + <string>Close down VP1</string> + </property> + </action> + <action name="action_quicklaunch_Storegate_browser"> + <property name="text"> + <string>&Storegate browser</string> + </property> + <property name="statusTip"> + <string>Launch a tab with a banks channel</string> + </property> + </action> + <action name="action_quicklaunch_3dcocktail"> + <property name="text"> + <string>&All studies (3D cocktail)</string> + </property> + </action> + <action name="action_quicklaunch_trackcalo_commis"> + <property name="text"> + <string>T&rack/Calo commis. studies</string> + </property> + </action> + <action name="action_file_Add_event_file"> + <property name="text"> + <string>&Add event file ...</string> + </property> + </action> + </widget> + <customwidgets> + <customwidget> + <class>VP1TabWidget</class> + <extends>QTabWidget</extends> + <header>VP1Base/VP1TabWidget.h</header> + <container>1</container> + </customwidget> + <customwidget> + <class>VP1TextBrowser</class> + <extends>QTextBrowser</extends> + <header>VP1Gui/VP1TextBrowser.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>pushButton_channelfullscreen</tabstop> + <tabstop>pushButton_channelinformation</tabstop> + <tabstop>radioButton_cruise_event</tabstop> + <tabstop>radioButton_cruise_tab</tabstop> + <tabstop>radioButton_cruise_both</tabstop> + <tabstop>spinBox_cruise</tabstop> + <tabstop>pushButton_nextevent</tabstop> + <tabstop>pushButton_eventseek</tabstop> + <tabstop>tabWidget_central</tabstop> + <tabstop>textBrowser_channelmessages</tabstop> + </tabstops> + <resources> + <include location="vp1.qrc"/> + </resources> + <connections/> +</ui> diff --git a/graphics/VP1/VP1Gui/cmt/requirements b/graphics/VP1/VP1Gui/cmt/requirements old mode 100755 new mode 100644 index a713da1afa6..891025ff05b --- a/graphics/VP1/VP1Gui/cmt/requirements +++ b/graphics/VP1/VP1Gui/cmt/requirements @@ -1,8 +1,10 @@ package VP1Gui author Thomas Kittelmann <Thomas.Kittelmann@cern.ch> +author Riccardo Maria BIANCHI <rbianchi@cern.ch> manager Riccardo Maria BIANCHI <rbianchi@cern.ch> + public use AtlasPolicy AtlasPolicy-* use VP1Base VP1Base-* graphics/VP1 @@ -24,6 +26,7 @@ macro_remove cppflags "-pedantic" # pedantic makes GCC complain about a non C89 public apply_pattern qt4based_library - +# install to InstallArea the ATLAS logo image stored in share/ +apply_pattern declare_runtime_extras extras="ATLAS-Logo-New_300pixels.png" ; diff --git a/graphics/VP1/VP1Gui/share/ATLAS-Logo-New_300pixels.png b/graphics/VP1/VP1Gui/share/ATLAS-Logo-New_300pixels.png new file mode 100644 index 0000000000000000000000000000000000000000..04f5d2fe22cd907316457b671645c22a133f1537 GIT binary patch literal 11082 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 QI{*Lx07*qoM6N<$f>ZQBIRF3v literal 0 HcmV?d00001 diff --git a/graphics/VP1/VP1Gui/src/VP1ChannelManager.cxx b/graphics/VP1/VP1Gui/src/VP1ChannelManager.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1DockWidget.cxx b/graphics/VP1/VP1Gui/src/VP1DockWidget.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx b/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx index 9013acf3ffe..e2d4176a16a 100644 --- a/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx +++ b/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx @@ -15,7 +15,7 @@ //////////////////////////////////////////////////////////////// #include "VP1Gui/VP1EventDisplayEditor.h" -#include "ui_vp1eventdisplaywidget.h" +#include "ui_vp1eventdisplayeditor.h" #include "VP1Base/VP1ExaminerViewer.h" #include "VP1Base/VP1QtInventorUtils.h" diff --git a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx old mode 100755 new mode 100644 index 1ab4a1680f3..477b7cfe8dd --- a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx +++ b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx @@ -66,6 +66,7 @@ #include <QtCore/QSet> #include <QtGui/QMessageBox> +#include <Inventor/C/errors/debugerror.h> #include <Inventor/Qt/SoQt.h> #include <set> @@ -73,6 +74,8 @@ #include <iostream> //For "widgetcount" output #include <sstream> // std::ostringstream #include <ctime> +#include <stdexcept> + //___________________________________________________________________ class VP1ExecutionScheduler::Imp { @@ -772,8 +775,16 @@ QString VP1ExecutionScheduler::saveSnaphsotToFile(IVP1System* s, bool batch) // A FOLDER CONTAINER + QString folderName = ""; - QString folderName = "vp1_batch_images"; + // check if use specified an output folder for the batch job + QString batchOutFolder = VP1QtUtils::environmentVariableValue("VP1_BATCHMODE_OUT_FOLDER"); // ::getenv("VP1_BATCHMODE"); + if ( ! (batchOutFolder == "") ) { + VP1Msg::messageDebug("Setting 'batch' output folder from user's settings"); + folderName = batchOutFolder; + } + else + folderName = "atlas_vp1_batch_images"; // check if the folder already exists, if not make a new folder QDir dir(folderName); @@ -781,8 +792,9 @@ QString VP1ExecutionScheduler::saveSnaphsotToFile(IVP1System* s, bool batch) dir.mkpath("."); } - QString folder = currentsaveimagepath + QDir::separator() + folderName + QDir::separator(); + QString folder = currentsaveimagepath + folderName + QDir::separator(); + VP1Msg::messageDebug("folder set."); // EVENT INFO AND TIMESTAMP @@ -848,6 +860,17 @@ QString VP1ExecutionScheduler::saveSnaphsotToFile(IVP1System* s, bool batch) // saving to file pm.save(filename); + // save last-saved image filename to working dir + QString latestImageFileName = currentsaveimagepath + QString("latest_vp1image"); + QFile latestImage(latestImageFileName); + if(latestImage.exists() && !latestImage.remove()) + throw std::runtime_error("Unable to overwrite the existing latest image file"); + if(!latestImage.open(QIODevice::WriteOnly | QIODevice::Text)) + throw std::runtime_error("Unable to create new latest image file"); + latestImage.write(filename.toStdString().c_str()); + latestImage.close(); + + return filename; } diff --git a/graphics/VP1/VP1Gui/src/VP1Gui.cxx b/graphics/VP1/VP1Gui/src/VP1Gui.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx b/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx old mode 100755 new mode 100644 index 16b4429a982..3b0b2eec8ac --- a/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx +++ b/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx @@ -13,7 +13,7 @@ ///////////////////////////////////////////////////////////// #include "VP1Gui/VP1IncomingMessageDialog.h" -#include "ui_vp1incomingmessageform.h" +#include "ui_vp1incomingmessagedialog.h" #include "VP1Gui/VP1TabManager.h" #include "VP1Gui/VP1ChannelManager.h" #include <QtCore/QList> diff --git a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1PluginDialog.cxx b/graphics/VP1/VP1Gui/src/VP1PluginDialog.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1Prioritiser.cxx b/graphics/VP1/VP1Gui/src/VP1Prioritiser.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1TabManager.cxx b/graphics/VP1/VP1Gui/src/VP1TabManager.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1TcpServer.cxx b/graphics/VP1/VP1Gui/src/VP1TcpServer.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/VP1TextBrowser.cxx b/graphics/VP1/VP1Gui/src/VP1TextBrowser.cxx old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/3d_32x32.png b/graphics/VP1/VP1Gui/src/icons/3d_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/back_32x32.png b/graphics/VP1/VP1Gui/src/icons/back_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/button_cancel_32x32.png b/graphics/VP1/VP1Gui/src/icons/button_cancel_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/button_ok_32x32.png b/graphics/VP1/VP1Gui/src/icons/button_ok_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/camera.png b/graphics/VP1/VP1Gui/src/icons/camera.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/down_32x32.png b/graphics/VP1/VP1Gui/src/icons/down_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/edit_32x32.png b/graphics/VP1/VP1Gui/src/icons/edit_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/editcopy_32x32.png b/graphics/VP1/VP1Gui/src/icons/editcopy_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/fileclose_32x32.png b/graphics/VP1/VP1Gui/src/icons/fileclose_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/filefind_32x32.png b/graphics/VP1/VP1Gui/src/icons/filefind_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/filenew_32x32.png b/graphics/VP1/VP1Gui/src/icons/filenew_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/fileopen_32x32.png b/graphics/VP1/VP1Gui/src/icons/fileopen_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/fileprint_32x32.png b/graphics/VP1/VP1Gui/src/icons/fileprint_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/filequickprint_32x32.png b/graphics/VP1/VP1Gui/src/icons/filequickprint_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/filesave_32x32.png b/graphics/VP1/VP1Gui/src/icons/filesave_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/filesaveas_32x32.png b/graphics/VP1/VP1Gui/src/icons/filesaveas_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/forward_32x32.png b/graphics/VP1/VP1Gui/src/icons/forward_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/help_32x32.png b/graphics/VP1/VP1Gui/src/icons/help_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/info_32x32.png b/graphics/VP1/VP1Gui/src/icons/info_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/kcalc_32x32.png b/graphics/VP1/VP1Gui/src/icons/kcalc_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/kchart_32x32.png b/graphics/VP1/VP1Gui/src/icons/kchart_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/kivio_32x32.png b/graphics/VP1/VP1Gui/src/icons/kivio_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/launch_32x32.png b/graphics/VP1/VP1Gui/src/icons/launch_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/log_32x32.png b/graphics/VP1/VP1Gui/src/icons/log_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/network_64x64.png b/graphics/VP1/VP1Gui/src/icons/network_64x64.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/network_disconnect_64x64.png b/graphics/VP1/VP1Gui/src/icons/network_disconnect_64x64.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/no3D_32x32.png b/graphics/VP1/VP1Gui/src/icons/no3D_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/package_settings_32x32.png b/graphics/VP1/VP1Gui/src/icons/package_settings_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/redo_32x32.png b/graphics/VP1/VP1Gui/src/icons/redo_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/undo_32x32.png b/graphics/VP1/VP1Gui/src/icons/undo_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/window_fullscreen_32x32.png b/graphics/VP1/VP1Gui/src/icons/window_fullscreen_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/window_list_32x32.png b/graphics/VP1/VP1Gui/src/icons/window_list_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/window_nofullscreen_32x32.png b/graphics/VP1/VP1Gui/src/icons/window_nofullscreen_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/icons/yast_route_32x32.png b/graphics/VP1/VP1Gui/src/icons/yast_route_32x32.png old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/vp1.qrc b/graphics/VP1/VP1Gui/src/vp1.qrc old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/vp1authenticator.ui b/graphics/VP1/VP1Gui/src/vp1authenticator.ui new file mode 100644 index 00000000000..21c8e392025 --- /dev/null +++ b/graphics/VP1/VP1Gui/src/vp1authenticator.ui @@ -0,0 +1,209 @@ +<ui version="4.0" > + <class>dlgAuthentication</class> + <widget class="QDialog" name="dlgAuthentication" > + <property name="windowModality" > + <enum>Qt::ApplicationModal</enum> + </property> + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>380</width> + <height>447</height> + </rect> + </property> + <property name="windowTitle" > + <string>Login</string> + </property> + <property name="sizeGripEnabled" > + <bool>false</bool> + </property> + <property name="modal" > + <bool>false</bool> + </property> + <layout class="QGridLayout" name="gridLayout_3" > + <item row="0" column="0" colspan="3" > + <widget class="QLabel" name="lblTitle" > + <property name="font" > + <font> + <pointsize>12</pointsize> + </font> + </property> + <property name="text" > + <string>Please enter your NICE login and password</string> + </property> + <property name="alignment" > + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item row="1" column="0" > + <spacer name="horizontalSpacer_5" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>32</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="1" > + <widget class="QWidget" native="1" name="wdgBackground" > + <layout class="QGridLayout" name="gridLayout_2" > + <item row="0" column="0" > + <spacer name="horizontalSpacer" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>18</width> + <height>52</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="1" colspan="2" > + <layout class="QGridLayout" name="gridLayout" > + <item row="0" column="0" > + <widget class="QLabel" name="lblPers" > + <property name="text" > + <string>Login</string> + </property> + </widget> + </item> + <item row="0" column="1" > + <widget class="QLineEdit" name="inpPers" /> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="lblPhr" > + <property name="text" > + <string>Password</string> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QLineEdit" name="inpPhr" > + <property name="echoMode" > + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + </layout> + </item> + <item row="0" column="3" > + <spacer name="horizontalSpacer_2" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>28</width> + <height>52</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" > + <spacer name="horizontalSpacer_3" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>18</width> + <height>24</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="1" > + <widget class="QPushButton" name="pbtnLogin" > + <property name="text" > + <string>Login</string> + </property> + </widget> + </item> + <item row="1" column="2" > + <widget class="QPushButton" name="pbtnCancel" > + <property name="text" > + <string>Cancel</string> + </property> + </widget> + </item> + <item row="1" column="3" > + <spacer name="horizontalSpacer_4" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>28</width> + <height>24</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="0" colspan="4" > + <widget class="QTextEdit" name="teditError" > + <property name="enabled" > + <bool>true</bool> + </property> + <property name="autoFillBackground" > + <bool>false</bool> + </property> + <property name="readOnly" > + <bool>true</bool> + </property> + </widget> + </item> + <item row="3" column="2" > + <spacer name="verticalSpacer_2" > + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </item> + <item row="1" column="2" > + <spacer name="horizontalSpacer_6" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>31</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="2" column="1" > + <spacer name="verticalSpacer" > + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0" > + <size> + <width>20</width> + <height>35</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/graphics/VP1/VP1Gui/src/vp1eventdisplaywidget.ui b/graphics/VP1/VP1Gui/src/vp1eventdisplayeditor.ui similarity index 100% rename from graphics/VP1/VP1Gui/src/vp1eventdisplaywidget.ui rename to graphics/VP1/VP1Gui/src/vp1eventdisplayeditor.ui diff --git a/graphics/VP1/VP1Gui/src/vp1incomingmessageform.ui b/graphics/VP1/VP1Gui/src/vp1incomingmessagedialog.ui old mode 100755 new mode 100644 similarity index 100% rename from graphics/VP1/VP1Gui/src/vp1incomingmessageform.ui rename to graphics/VP1/VP1Gui/src/vp1incomingmessagedialog.ui diff --git a/graphics/VP1/VP1Gui/src/vp1mainwindow.ui b/graphics/VP1/VP1Gui/src/vp1mainwindow.ui old mode 100755 new mode 100644 diff --git a/graphics/VP1/VP1Gui/src/vp1plugindialog.ui b/graphics/VP1/VP1Gui/src/vp1plugindialog.ui old mode 100755 new mode 100644 -- GitLab