Skip to content
Snippets Groups Projects
Commit 563ef7f5 authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny: Committed by Graeme Stewart
Browse files

fixing negative event numbers. Details:... 

fixing negative event numbers. Details: https://its.cern.ch/jira/browse/ATLASVPONE-287. (VP1Base-00-23-12)

    * fixing negative event numbers.
	  Details: https://its.cern.ch/jira/browse/ATLASVPONE-287.
	* new tag: VP1Base-00-23-12


Former-commit-id: 9a6cf6caaa3dadb7721ab80fdf5673b893393ae9
parent 29891bed
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
graphics/VP1/VP1Base/VP1Base/IVP13DStandardChannelWidget.h
+ 1
− 0
View file @ 563ef7f5
......@@ -73,6 +73,7 @@ private:
private slots:
void toggleSystemActive();
void updateSnapshotDim();
void setImageFromPresets();
protected slots:
void showControlsForSystem();
......
graphics/VP1/VP1Base/VP1Base/IVP1ChannelWidget.h
+ 2
− 2
View file @ 563ef7f5
......@@ -48,7 +48,7 @@ public:
virtual bool isAccumulator() const;
void setRunEvtNumber(int runnumber, int eventnumber);
void setRunEvtNumber(int runnumber, unsigned long long eventnumber);
protected:
virtual void create();//Fixme: Abstract!
......@@ -65,7 +65,7 @@ protected:
void turnOn(IVP1System*);
void turnOff(IVP1System*,const bool& immediateErase=true);
void getRunEvtNumber(int& runnumber, int& eventnumber);
void getRunEvtNumber(int& runnumber, unsigned long long& eventnumber);
void setEvtTimestamp(unsigned timestamp);
void getEvtTimestamp(unsigned& timestamp);
......
graphics/VP1/VP1Base/src/IVP13DStandardChannelWidget.cxx
+ 427
− 143
View file @ 563ef7f5
This diff is collapsed.
graphics/VP1/VP1Base/src/IVP1ChannelWidget.cxx
+ 3
− 3
View file @ 563ef7f5
......@@ -38,7 +38,7 @@ public:
bool canregistercontroller;
bool canregistersystem;
int runnumber;
int eventnumber;
unsigned long long eventnumber;
unsigned timestamp;
};
......@@ -86,7 +86,7 @@ bool IVP1ChannelWidget::isAccumulator() const
}
//_______________________________________________________
void IVP1ChannelWidget::setRunEvtNumber(int runnumber, int eventnumber)
void IVP1ChannelWidget::setRunEvtNumber(int runnumber, unsigned long long eventnumber)
{
d->runnumber = runnumber;
d->eventnumber = eventnumber;
......@@ -252,7 +252,7 @@ void IVP1ChannelWidget::turnOff(IVP1System*s,const bool& immediateErase)
}
//_______________________________________________________
void IVP1ChannelWidget::getRunEvtNumber(int& runnumber, int& eventnumber)
void IVP1ChannelWidget::getRunEvtNumber(int& runnumber, unsigned long long& eventnumber)
{
runnumber = d->runnumber;
eventnumber = d->eventnumber;
......
graphics/VP1/VP1Base/src/vp13dstandardchannelsnapshotgroupbox.ui
+ 112
− 8
View file @ 563ef7f5
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>242</width>
<height>113</height>
<width>412</width>
<height>257</height>
</rect>
</property>
<property name="windowTitle">
......@@ -18,12 +18,12 @@
<number>0</number>
</property>
<item>
<layout class="QVBoxLayout">
<layout class="QVBoxLayout" name="layout_main">
<property name="spacing">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout">
<layout class="QHBoxLayout" name="layout_top_label">
<item>
<widget class="QLabel" name="label">
<property name="text">
......@@ -47,7 +47,7 @@
</layout>
</item>
<item>
<layout class="QHBoxLayout">
<layout class="QHBoxLayout" name="layout_snapshot_options">
<property name="spacing">
<number>0</number>
</property>
......@@ -153,7 +153,7 @@
<number>10</number>
</property>
<property name="maximum">
<number>30000</number>
<number>16000</number>
</property>
<property name="singleStep">
<number>50</number>
......@@ -188,13 +188,27 @@
<number>10</number>
</property>
<property name="maximum">
<number>30000</number>
<number>16000</number>
</property>
<property name="singleStep">
<number>50</number>
</property>
<property name="value">
<number>800</number>
<number>4320</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_lockOption">
<item>
<widget class="QCheckBox" name="checkBox_lockRatio">
<property name="text">
<string>Lock ratio</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
......@@ -219,6 +233,93 @@
</item>
</layout>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox_imagePresets">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Image Presets:</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QRadioButton" name="radioButton_1080p">
<property name="toolTip">
<string>1920 x 1080 pixels (16:9 aspect ratio) - 2.1 Mpixels</string>
</property>
<property name="text">
<string>1080p Full HD</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_imagePresets</string>
</attribute>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="radioButton_4K">
<property name="toolTip">
<string>4096 x 2160 pixels (1.9:1 aspect ratio) - 8.85 Mpixels</string>
</property>
<property name="text">
<string>4K DCI</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_imagePresets</string>
</attribute>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="radioButton_720p">
<property name="toolTip">
<string>1280 x 720 pixels - 16:9 aspect ratio - 0.9 Mpixels</string>
</property>
<property name="text">
<string>720p HD</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_imagePresets</string>
</attribute>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="radioButton_8K">
<property name="toolTip">
<string>8192 × 4320 pixels (17:9 aspect ratio) - 35.4 Mpixels</string>
</property>
<property name="text">
<string>8K</string>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup_imagePresets</string>
</attribute>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
......@@ -306,4 +407,7 @@
</hints>
</connection>
</connections>
<buttongroups>
<buttongroup name="buttonGroup_imagePresets"/>
</buttongroups>
</ui>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment