Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit e0d7594
Author: Scott Pearse <[email protected]>
Date:   Thu Jul 30 09:32:48 2020 -0600

    write warning test failure to circle output upon failure

commit bb53927
Merge: 43aa394 805f7e2
Author: Stanislaw Jaroszynski <[email protected]>
Date:   Mon Jul 27 12:05:04 2020 -0600

    Merge branch 'master' of https://github.com/NCAR/VAPOR

commit 43aa394
Author: Samuel Li <[email protected]>
Date:   Mon Jul 27 12:00:03 2020 -0600

    fix git blame

commit 805f7e2
Author: StasJ <[email protected]>
Date:   Mon Jul 27 07:40:00 2020 -0600

    Fix GUI coloring (#2320)

commit f4bc6c5
Author: StasJ <[email protected]>
Date:   Sat Jul 25 13:25:22 2020 -0600

    Fix misc qt cmake issues (#2319)

commit a442ed0
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 09:00:55 2020 -0600

    Fix unguarded if clauses

commit 94b1708
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 08:41:28 2020 -0600

    re-enable warning/smoke tests on master

commit 05ebe5b
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 08:31:18 2020 -0600

    Disable manual release builds on master

commit eed3605
Author: Scott Pearse <[email protected]>
Date:   Wed Jul 8 08:15:12 2020 -0600

    turn off weekly builds on master branch, which causes them to trigger on each PR

commit 59c3322
Author: sgpearse <[email protected]>
Date:   Fri Jun 26 16:46:11 2020 -0600

    Fix unused function warning (#2302)

    * Fix unused function warning

    * ifdef unused function instead of deleting it

commit 27e10f5
Author: Scott Pearse <[email protected]>
Date:   Fri Jun 26 06:00:25 2020 -0600

    rerun weekly build

commit ed79f29
Author: Scott Pearse <[email protected]>
Date:   Fri Jun 26 05:57:48 2020 -0600

    Fix osx library link

commit 8a44bb9
Author: sgpearse <[email protected]>
Date:   Wed Jun 24 17:17:53 2020 -0600

    Issue1701 (#2304)

    * incremental

    * Undo clearing of VaporTable

commit 54db3b7
Merge: 669a896 a9d19c5
Author: Scott Pearse <[email protected]>
Date:   Wed Jun 24 08:42:20 2020 -0600

    Merge branch 'master' of https://github.com/NCAR/VAPOR

commit 669a896
Author: Scott Pearse <[email protected]>
Date:   Wed Jun 24 08:31:08 2020 -0600

    update circle config

commit a9d19c5
Author: StasJ <[email protected]>
Date:   Tue Jun 23 08:43:52 2020 -0600

    Flow rendering refactor (#2280)

    * Flow rendering refactor

    * fix

    * Address GUI review comments

    * changes from second gui review meeting

    * Added documentation to shaders

    * Made var private

    * misc

    * misc

    * Line width

    * remove goto

commit 961ce70
Author: Stanislaw Jaroszynski <[email protected]>
Date:   Mon Jun 22 16:48:00 2020 -0600

    Casper fix

commit ac1c64b
Author: sgpearse <[email protected]>
Date:   Sat Jun 6 08:13:46 2020 -0600

    Fix dbus (#2300)

    * Fix dbus problem on CentOS

    * Fix dbus

commit 9f6636d
Author: sgpearse <[email protected]>
Date:   Fri May 29 13:02:40 2020 -0600

    fix #2295: wrong linker symbol in libvdc (#2296)

commit 8a1fef8
Author: clyne <[email protected]>
Date:   Tue May 19 14:56:12 2020 -0600

    Fixed #2276 - Add support for deriving zonal and meridional winds for MPAS model outputs (#2290)

    * Fixed #2276

    * Fixed memory leak

    * Check return code

commit 77f5869
Author: Scott Pearse <[email protected]>
Date:   Wed May 13 08:00:58 2020 -0600

    Point users to discourse forum

commit dc160bb
Merge: 8be32f5 661a966
Author: Scott Pearse <[email protected]>
Date:   Tue May 12 09:05:01 2020 -0600

    Merge branch 'master' of https://github.com/NCAR/VAPOR

commit 8be32f5
Author: Scott Pearse <[email protected]>
Date:   Tue May 12 09:04:55 2020 -0600

    added space to circle

commit 661a966
Author: Orhan Eroglu <[email protected]>
Date:   Tue May 12 06:22:22 2020 -0600

    game the system (#2293)

commit 15734b4
Author: Kevin Hallock <[email protected]>
Date:   Fri May 8 11:06:19 2020 -0600

    Add weekly build info to downloads.html (#2292)

commit e0592a5
Author: Scott Pearse <[email protected]>
Date:   Fri May 8 06:57:16 2020 -0600

    gameTheSystem

commit ff7640f
Author: sgpearse <[email protected]>
Date:   Sat May 2 10:03:13 2020 -0600

    Removed static_cast in c file (#2291)

commit 8dfa913
Author: sgpearse <[email protected]>
Date:   Thu Apr 30 14:18:13 2020 -0600

    Ubuntu warnings (#2289)

    * Fix warnings

    * fix warnings

commit 2e2dcfe
Author: sgpearse <[email protected]>
Date:   Wed Apr 22 15:33:00 2020 -0600

    Smoke tests (#2238)

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * ghr test

    * fix

    * test

    * save to workspace

    * save to workspace

    * save to workspace

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * osx test

    * osx test

    * Hopefully fixed CPack on OSX

    * test

    * test

    * open floodgates

    * adding cron

    * adding cron

    * adding cron

    * modified cron

    * modified cron

    * Vapor3 nightly build for installers

    * Vapor3 nightly build for installers

    * Vapor3 nightly build for installers

    * fixed timing of cron job to correspond to UTC

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * valgrind test

    * Updated nightly-release description

    * Clang tidy

    * fix schema

    * remove sudo

    * tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * osx test for clang-tidy

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * clang-tidy on ubuntu

    * osx cache test

    * osx cache test

    * osx cache test

    * osx cache test

    * osx cache test

    * osx cache test

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * Added script for osx

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * OSX and win10 test

    * installer cache test

    * installer cache test

    * installer cache test

    * installer cache test

    * installer cache test

    * installer cache test

    * increase timeout

    * Windows10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * first commit

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * win10 test

    * windows10 persist to workspace

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * win10 workspace test

    * test

    * test

    * manual run of weekly build

    * reinstate weekly buildsw

    * reinstate weekly builds

    * update

    * Removed caching on OSX

    * Test synthetic grids

    * Changed names of nightly builds to weekly

    * incremental

    * test

    * test

    * incremental

    * manual weekly build

    * manual weekly build

    * ready for PR

    * Removed files

    * Removed files

    * Removed comments

    * Removed comment

    * Win10 test

    * Added descriptions

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * ghr test

    * test

    * test

    * test

    * save dockerfile before stash

    * updates for clarifying nudge bug

    * removed diagnostic

    * smokeTest+Circle test

    * Fixed #2252

    * intermediate

    * added default baseline file generation

    * Added baseline files

    * updated baseline files, but there's a new bug

    * update dockerfile

    * test

    * Incremental

    * test

    * test

    * test

    * test

    * Remove grid test baseline files

    * Added python to ubuntu18 docker image

    * Add python

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * test

    * incremental

    * updates

    * Added ConstCoordItr and ConstNodeItr tests

    * test

    * indexing fix

    * Added margin of error to iterator tests

    * updates for code review

    * Added guards to if() statements

    * Change from AccessIJK to GetValueAtIndex

    * moved t0 up with other initializers

    * update baseline files

    Co-authored-by: John Clyne <[email protected]>

commit da1cb4d
Author: clyne <[email protected]>
Date:   Tue Apr 21 08:03:53 2020 -0600

    Fixed #2285 (#2286)

commit 00ac696
Author: StasJ <[email protected]>
Date:   Sun Apr 19 14:22:43 2020 -0600

    Change extension from .nc to .vdc (#2262)

    * Change extension from .nc to .vdc

    * warning

    * Change message output to stderr

    * Vapor command line arguments

    * Help message

    * Automatically determine dataset format

    * Change from return code to boolean

commit 2612810
Author: Scott Pearse <[email protected]>
Date:   Fri Apr 17 08:34:01 2020 -0600

    Update third party libraries

commit 744ee14
Author: clyne <[email protected]>
Date:   Wed Apr 15 20:07:58 2020 -0600

    Fixed #2273 - jsmall no longer opens (#2282)

    * Fixed #2273

    * Accidentally omitted changes to .h file.

commit abf3388
Author: sgpearse <[email protected]>
Date:   Wed Apr 15 18:20:21 2020 -0600

    Upgrade to Qt 5.13.2 - Issue 2247 (#2271)

    * initial commit

    * added build3rdParty.py

    * Ubuntu mods

    * CentOS updates

    * OSX updates

    * OSX updates

    * updates

    * Ubuntu update

    * Removed script

    * windows update

    * Fix PRegionSelector warning

commit 76a878a
Author: clyne <[email protected]>
Date:   Tue Apr 14 08:45:14 2020 -0600

    Fixed #2274 (#2275)
  • Loading branch information
@StasJ
StasJ committed Jul 30, 2020
1 parent 1212870 commit 62a79ba
Show file tree
Hide file tree
Showing 165 changed files with 5,168 additions and 579 deletions.
434 changes: 411 additions & 23 deletions .circleci/config.yml
View file

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .circleci/downloadWin3rdParty.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import gdown
url = "https://drive.google.com/a/ucar.edu/uc?id=1sRlE06jSVrCScrt546G4UtI3hj93xV2W"
output = "2019-Aug-Win32.zip"
gdown.download(url, output, quiet=False)

import zipfile
with zipfile.ZipFile("2019-Aug-Win32.zip", 'r') as zip_ref:
zip_ref.extractall('C:\\')
13 changes: 13 additions & 0 deletions .circleci/getOSXDeps.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash

set -eo pipefail

pip3 install gdown
sudo mkdir -p /usr/local/VAPOR-Deps
sudo chmod 777 /usr/local/VAPOR-Deps
cd /usr/local/VAPOR-Deps
gdown https://drive.google.com/uc?id=1p47yeyjyUfxlc7-eglsXkjCGYJLqqtEs
cd /usr/local/VAPOR-Deps
tar xf 2019-Aug-Darwin.tar.xz -C /usr/local/VAPOR-Deps
chmod -R 777 /usr/local/VAPOR-Deps
brew install cmake
8 changes: 3 additions & 5 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ endif()

# compiler warning flags
if (NOT WIN32)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-sign-compare -Wno-overloaded-virtual")
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-sign-compare -Wno-overloaded-virtual -Wno-parentheses")
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-sign-compare")
else ()
# Enable multithread compiling on Visual Studio
Expand Down Expand Up @@ -96,8 +96,6 @@ include_directories (${THIRD_PARTY_INC_DIR}/freetype2)
link_directories (${THIRD_PARTY_LIB_DIR})
link_directories (${PYTHONPATH})
list (APPEND CMAKE_PREFIX_PATH ${THIRD_PARTY_LIB_DIR})
list (APPEND CMAKE_PREFIX_PATH ${QTDIR}/lib/cmake)
list (APPEND CMAKE_PROGRAM_PATH ${QTDIR}/bin)

if (WIN32)
include_directories (${THIRD_PARTY_DIR}/Python${PYTHONVERSION}/include)
Expand All @@ -114,7 +112,6 @@ if (BUILD_VDC)
link_directories (${PYTHONPATH}/lib-dynload)
endif ()

find_package(Qt5 COMPONENTS Core Widgets REQUIRED)
find_library(NETCDF netcdf)
find_library(UDUNITS2 udunits2)
find_library(FREETYPE freetype)
Expand Down Expand Up @@ -203,6 +200,7 @@ set (CPACK_PACKAGE_EXECUTABLES vapor;vapor)
set (CPACK_BINARY_STGZ OFF)
set (CPACK_BINARY_TGZ OFF)
set (CPACK_BINARY_TZ OFF)
set (CPACK_BINARY_DRAGNDROP OFF)

if (WIN32)
set (PRE_INSTALL_LOCAL_PATH "buildutils/NSIS.preInstall.ini")
Expand Down Expand Up @@ -256,6 +254,7 @@ if (WIN32)
endif (WIN32)

if (APPLE)
set (CPACK_BINARY_DRAGNDROP ON)
if (DIST_INSTALLER AND GENERATE_FULL_INSTALLER)
file (GLOB INSTALL_LIBS ${THIRD_PARTY_LIB_DIR}/*.dylib)
file (GLOB INSTALL_FRAMEWORKS ${THIRD_PARTY_LIB_DIR}/*.framework ${PYTHONPATH} ${QTDIR}/lib/*.framework)
Expand All @@ -282,7 +281,6 @@ if (APPLE)
COMPONENT Dependencies
)
endif ()
set (CPACK_BINARY_DRAGNDROP ON)
endif (APPLE)

if (UNIX AND NOT APPLE)
Expand Down
4 changes: 2 additions & 2 deletions apps/cf2vdc/cf2vdc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,14 @@ int main(int argc, char **argv) {
}

if (argc < 3) {
cerr << "Usage: " << ProgName << " cffiles... master.nc" << endl;
cerr << "Usage: " << ProgName << " cffiles... master.vdc" << endl;
op.PrintOptionHelp(stderr, 80, false);
return(1);
}


if (opt.help) {
cerr << "Usage: " << ProgName << " master.nc" << endl;
cerr << "Usage: " << ProgName << " master.vdc" << endl;
op.PrintOptionHelp(stderr, 80, false);
return(0);
}
Expand Down
8 changes: 6 additions & 2 deletions apps/cfvdccreate/cfvdccreate.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,14 @@ int main(int argc, char **argv) {
}

if (argc < 3) {
cerr << "Usage: " << ProgName << " cf_files... master.nc" << endl;
cerr << "Usage: " << ProgName << " cf_files... master.vdc" << endl;
op.PrintOptionHelp(stderr, 80, false);
return(1);
}


if (opt.help) {
cerr << "Usage: " << ProgName << " cf_files... master.nc" << endl;
cerr << "Usage: " << ProgName << " cf_files... master.vdc" << endl;
op.PrintOptionHelp(stderr, 80, false);
return(0);
}
Expand All @@ -215,6 +215,10 @@ int main(int argc, char **argv) {
for (int i=0; i<argc-1; i++) cffiles.push_back(argv[i]);
string master = argv[argc-1];

if (FileUtils::Extension(master) != "vdc") {
fprintf(stderr, "Warning: VDC files should the extension .vdc\n");
}

VDCNetCDF vdc(opt.nthreads);

if (vdc.DataDirExists(master) && !opt.force) {
Expand Down
4 changes: 3 additions & 1 deletion apps/linuxlauncher/launcher.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
int main(int argc, char **argv)
{
char path[PATH_MAX];
readlink("/proc/self/exe", path, PATH_MAX);
ssize_t rc = readlink("/proc/self/exe", path, PATH_MAX);
(void)(rc); // Remove warning

char *p = &path[strlen(path)-1];
int up = 2;
while (p != path && up) {
Expand Down
3 changes: 2 additions & 1 deletion apps/vapor_check_udunits/vapor_check_udunits.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ int main(int argc, char **argv) {
if (rc < 0)
return 1;

if (!opt.quiet)
if (!opt.quiet) {
printf("UDUnits passed\n");
}

return 0;
}
6 changes: 5 additions & 1 deletion apps/vaporgui/BannerGUI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#include <qdesktopwidget.h>
#include <QDesktopServices>
#include <QUrl>
#include <QScreen>
#include <vapor/ResourcePath.h>
#include <vapor/VAssert.h>
#include "BannerGUI.h"

BannerGUI::BannerGUI(
Expand Down Expand Up @@ -67,7 +69,9 @@ BannerGUI::BannerGUI(
}
else
{
QRect screenGeometry = QApplication::desktop()->screenGeometry();
QScreen* screen = QGuiApplication::primaryScreen();
QRect screenGeometry = screen->geometry();

int x = (screenGeometry.width()-image.size().width()) / 2;
int y = (screenGeometry.height()-image.size().height()) / 2;
move(x, y);
Expand Down
4 changes: 3 additions & 1 deletion apps/vaporgui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,11 @@ set (SRCS
QPaintUtils.cpp
QPaintUtils.h
VSection.cpp
VSection.h
VSubGroup.cpp
VSubGroup.h
VFrame.h
VFrame.cpp
VSection.h
VLineItem.cpp
VLineItem.h
VContainer.cpp
Expand Down
62 changes: 61 additions & 1 deletion apps/vaporgui/FlowSubtabs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "vapor/DataMgrUtils.h"
#include "vapor/Box.h"
#include "ErrorReporter.h"
#include <cfloat>

#include "VFrame.h"
#include "VIntSpinBox.h"
Expand All @@ -17,11 +18,17 @@
#include "PGroup.h"
#include "PSection.h"
#include "PVariablesWidget.h"
#include "PSliderEdit.h"
#include "PEnumDropdown.h"
#include "PCheckbox.h"
#include "PDoubleInput.h"

#include <QScrollArea>

#define verbose 1

using VAPoR::FlowParams;

namespace {
const std::string UNSTEADY_STRING = "Pathlines";
const std::string STEADY_STRING = "Streamlines";
Expand Down Expand Up @@ -139,9 +146,61 @@ void FlowVariablesSubtab::_dimensionalityChanged( int nDims ) const {
FlowAppearanceSubtab::FlowAppearanceSubtab(QWidget* parent) : QVaporSubtab(parent)
{
_TFEditor = new TFEditor(true);
_pw = new PGroup;

_layout->addWidget( _TFEditor, 0, 0 );

_layout->addWidget(_pw);

PSection *ps;

_pw->Add(ps = new PSection("Appearance"));
ps->Add(new PEnumDropdown(FlowParams::RenderTypeTag, {"Tubes", "Samples"}, {FlowParams::RenderTypeStream, FlowParams::RenderTypeSamples}, "Render Type"));
ps->Add((new PEnumDropdown(FlowParams::RenderGlyphTypeTag, {"Circle", "Arrow"}, {FlowParams::GlpyhTypeSphere, FlowParams::GlpyhTypeArrow}, "Glyph Type"))->ShowBasedOnParam(FlowParams::RenderTypeTag, FlowParams::RenderTypeSamples));
ps->Add(new PCheckbox(FlowParams::RenderGeom3DTag, "3D Geometry"));
// ps->Add((new PCheckbox(FlowParams::RenderLightAtCameraTag, "Light From Camera"))->ShowBasedOnParam(FlowParams::RenderGeom3DTag));
// ps->Add((new PDoubleInput(FlowParams::RenderRadiusBaseTag, "Radius")));
ps->Add((new PDoubleSliderEdit(FlowParams::RenderRadiusScalarTag, "Radius Scalar"))->SetRange(0.1, 5)->EnableDynamicUpdate());


PGroup *streamGroup = new PGroup;
streamGroup->ShowBasedOnParam(FlowParams::RenderTypeTag, FlowParams::RenderTypeStream);
ps->Add(streamGroup);

streamGroup->Add((new PCheckbox(FlowParams::RenderShowStreamDirTag, "Show Stream Direction"))->ShowBasedOnParam(FlowParams::RenderTypeTag, FlowParams::RenderTypeStream));
PGroup *showDirGroup = new PSubGroup;
showDirGroup->ShowBasedOnParam(FlowParams::RenderShowStreamDirTag);
streamGroup->Add(showDirGroup);
showDirGroup->Add((new PIntegerSliderEdit(FlowParams::RenderGlyphStrideTag, "Every N Samples"))->SetRange(1, 20)->EnableDynamicUpdate());

streamGroup->Add((new PCheckbox(FlowParams::RenderFadeTailTag, "Fade Flow Tails")));
PGroup *fadeGroup = new PSubGroup;
fadeGroup->ShowBasedOnParam(FlowParams::RenderFadeTailTag);
streamGroup->Add(fadeGroup);
fadeGroup->Add((new PIntegerSliderEdit(FlowParams::RenderFadeTailStartTag, "Fade Start Sample"))->SetRange(0, 100)->EnableDynamicUpdate()->SetTooltip("How far behind leading sample fade begins."));
fadeGroup->Add((new PIntegerSliderEdit(FlowParams::RenderFadeTailLengthTag, "Fade Over N Samples"))->SetRange(1, 100)->EnableDynamicUpdate()->SetTooltip("Number of samples from opaque to transparent."));
fadeGroup->Add((new PIntegerSliderEdit(FlowParams::RenderFadeTailStopTag, "Animate Steady"))->SetRange(0, 200)->EnableDynamicUpdate()->SetTooltip("Temporary solution for animating steady flow particles."));

PGroup *sampleGroup = new PGroup;
sampleGroup->ShowBasedOnParam(FlowParams::RenderTypeTag, FlowParams::RenderTypeSamples);
ps->Add(sampleGroup);
sampleGroup->Add((new PIntegerSliderEdit(FlowParams::RenderGlyphStrideTag, "Every N Samples"))->SetRange(1, 20)->EnableDynamicUpdate()->EnableBasedOnParam(FlowParams::RenderGlyphOnlyLeadingTag, false));
sampleGroup->Add(new PCheckbox(FlowParams::RenderGlyphOnlyLeadingTag, "Only Show Leading Sample"));


_pw->Add(ps = new PSection("Lighting"));
ps->ShowBasedOnParam(FlowParams::RenderGeom3DTag);
ps->Add((new PDoubleSliderEdit(FlowParams::PhongAmbientTag, "Ambient" ))->EnableDynamicUpdate());
ps->Add((new PDoubleSliderEdit(FlowParams::PhongDiffuseTag, "Diffuse" ))->EnableDynamicUpdate());
ps->Add((new PDoubleSliderEdit(FlowParams::PhongSpecularTag, "Specular"))->EnableDynamicUpdate());
ps->Add((new PDoubleSliderEdit(FlowParams::PhongShininessTag, "Specular"))->SetRange(1, 100)->EnableDynamicUpdate());



#ifndef NDEBUG
_pw->Add((ps = new PSection("Debug"))->SetTooltip("Only accessible in debug build."));
ps->Add((new PCheckbox("old_render", "Old Render Code (Regressing Testing)")));
#endif

_params = NULL;
}

Expand All @@ -152,6 +211,7 @@ void FlowAppearanceSubtab::Update( VAPoR::DataMgr *dataMgr,
_params = dynamic_cast<VAPoR::FlowParams*>(rParams);
assert(_params);
_TFEditor->Update(dataMgr, paramsMgr, rParams);
_pw->Update(rParams, paramsMgr, dataMgr);
}


Expand Down
1 change: 1 addition & 0 deletions apps/vaporgui/FlowSubtabs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ class FlowAppearanceSubtab : public QVaporSubtab {
private:
VAPoR::FlowParams* _params;
TFEditor* _TFEditor;
PGroup *_pw;
};

//
Expand Down
Loading

0 comments on commit 62a79ba

Please sign in to comment.