Commit bf548248 authored by David E. DeMarle's avatar David E. DeMarle

allow cinema export to make prebaked luts

parent 5135d5b1
Pipeline #44169 running with stage
......@@ -261,7 +261,7 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_4">
<item row="3" column="2">
<item row="5" column="2">
<widget class="QWidget" name="wCameraOptions" native="true">
<property name="enabled">
<bool>true</bool>
......@@ -387,7 +387,7 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<item row="4" column="0">
<widget class="QLabel" name="cinemaLabel">
<property name="enabled">
<bool>true</bool>
......@@ -397,7 +397,7 @@
</property>
</widget>
</item>
<item row="2" column="2">
<item row="4" column="2">
<widget class="QComboBox" name="cinemaExport">
<property name="enabled">
<bool>true</bool>
......@@ -438,7 +438,7 @@
</item>
</widget>
</item>
<item row="4" column="2">
<item row="6" column="2">
<widget class="QLineEdit" name="trackObjectName">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter name from Pipeline Browser for camera to track over time.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
......@@ -448,7 +448,7 @@
</property>
</widget>
</item>
<item row="4" column="0">
<item row="6" column="0">
<widget class="QLabel" name="trackObjectLabel">
<property name="text">
<string>Track Object</string>
......@@ -475,17 +475,17 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="laFloatValue">
<property name="text">
<string>GL Float</string>
<string>Try Direct Float</string>
</property>
</widget>
</item>
<item row="1" column="2">
<item row="2" column="2">
<widget class="QCheckBox" name="cbUseFloatValues">
<property name="toolTip">
<string>Try to render via OpenGL float buffers first.</string>
<string>Render recolorable float value pixels via GL_ARB_texture_float buffers if available.</string>
</property>
<property name="text">
<string/>
......@@ -495,6 +495,23 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="laNoFloat">
<property name="text">
<string>Disable Float</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="cbNoValues">
<property name="toolTip">
<string>Use prebaked lookup table as RGB pixels instead of recolorable float value pixels. </string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
......
......@@ -246,6 +246,16 @@ QString pqExportViewSelection::getSelectionAsString(QString const& scriptFormat)
cinemaCam += "\"floatValues\":False, ";
}
if (viewInfo->getNoValues())
{
cinemaCam += "\"noValues\":True, ";
}
else
{
cinemaCam += "\"noValues\":False, ";
}
cinemaCam += "\"camera\":\"";
cinemaCam += camType;
cinemaCam += "\"";
......
......@@ -80,6 +80,9 @@ void pqImageOutputInfo::initialize(
QObject::connect(
this->Ui->composite, SIGNAL(stateChanged(int)), this, SLOT(updateComposite(int)));
QObject::connect(
this->Ui->cbNoValues, SIGNAL(stateChanged(int)), this, SLOT(endisAbleDirectFloat(int)));
this->setCinemaVisible(false);
this->setupScreenshotInfo();
......@@ -196,6 +199,12 @@ bool pqImageOutputInfo::getUseFloatValues()
return this->Ui->cbUseFloatValues->isChecked();
}
//-----------------------------------------------------------------------------
bool pqImageOutputInfo::getNoValues()
{
return this->Ui->cbNoValues->isChecked();
}
//-----------------------------------------------------------------------------
void pqImageOutputInfo::updateImageFileName()
{
......@@ -312,6 +321,7 @@ void pqImageOutputInfo::updateComposite(int choseComposite)
{
int index = this->Ui->cinemaExport->currentIndex();
this->Ui->cinemaExport->clear();
this->Ui->cbNoValues->setEnabled(choseComposite);
this->Ui->cbUseFloatValues->setEnabled(choseComposite);
if (choseComposite)
{
......@@ -333,6 +343,12 @@ void pqImageOutputInfo::updateComposite(int choseComposite)
}
}
//-----------------------------------------------------------------------------
void pqImageOutputInfo::endisAbleDirectFloat(int choseDisable)
{
this->Ui->cbUseFloatValues->setEnabled(choseDisable==0);
}
//------------------------------------------------------------------------------
void pqImageOutputInfo::updateSpherical()
{
......
......@@ -72,6 +72,7 @@ public:
int getMagnification();
bool getComposite();
bool getUseFloatValues();
bool getNoValues();
/**
* Remove or add options depending on whether cinema is visible.
......@@ -92,6 +93,7 @@ public slots:
void updateImageFileNameExtension(const QString&);
void updateCinemaType(const QString&);
void updateComposite(int);
void endisAbleDirectFloat(int);
private:
void initialize(Qt::WindowFlags parentFlags, pqView* view, QString const& viewName);
......
......@@ -547,6 +547,8 @@ class CoProcessor(object):
view.MaxClipBounds = [minbds, maxbds, minbds, maxbds, minbds, maxbds]
view.LockBounds = 1
disableValues = False if 'noValues' not in co else co['noValues']
if specLevel=="B":
p = pv_introspect.inspect(skip_invisible=True)
else:
......@@ -556,7 +558,8 @@ class CoProcessor(object):
userDefined = self.__CinemaTracks,
specLevel = specLevel,
camType = camType,
extension = extension)
extension = extension,
disableValues = disableValues)
#all nodes participate, but only root can writes out the files
pm = servermanager.vtkProcessModule.GetProcessModule()
......@@ -564,11 +567,14 @@ class CoProcessor(object):
enableFloatVal = False if 'floatValues' not in co else co['floatValues']
pv_introspect.explore(fs, p, iSave = (pid == 0), currentTime = {'time':formatted_time},
pv_introspect.explore(fs, p, iSave = (pid == 0),
currentTime = {'time':formatted_time},
userDefined = self.__CinemaTracks,
specLevel = specLevel,
camType = camType,
tracking = tracking_def, floatValues = enableFloatVal)
tracking = tracking_def,
floatValues = enableFloatVal,
disableValues = disableValues)
if pid == 0:
fs.save()
......
Markdown is supported
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