Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 4b9b4ad6 authored by schultezub's avatar schultezub
Browse files

resolved issue #16

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@428 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent da01f3cb
...@@ -159,8 +159,10 @@ namespace campvis { ...@@ -159,8 +159,10 @@ namespace campvis {
tbb::mutex::scoped_lock lock(_localMutex); tbb::mutex::scoped_lock lock(_localMutex);
// render selected geometry // render selected geometry
if (_selectedGeometry != 0) { WholeTFGeometryManipulator* selectedGeometry = _selectedGeometry;
const std::vector<tgt::vec2>& helperPoints = _selectedGeometry->getHelperPoints(); if (selectedGeometry != 0) {
// the copy is deliberate for improved thread safety (the whole design is a little messy here...)
std::vector<tgt::vec2> helperPoints = selectedGeometry->getHelperPoints();
glColor4ub(0, 0, 0, 196); glColor4ub(0, 0, 0, 196);
glEnable(GL_LINE_STIPPLE); glEnable(GL_LINE_STIPPLE);
glLineStipple(1, 0xFAFA); glLineStipple(1, 0xFAFA);
...@@ -198,6 +200,7 @@ namespace campvis { ...@@ -198,6 +200,7 @@ namespace campvis {
void Geometry1DTransferFunctionEditor::mousePressEvent(tgt::MouseEvent* e) { void Geometry1DTransferFunctionEditor::mousePressEvent(tgt::MouseEvent* e) {
if (_selectedGeometry != 0 && e->modifiers() & tgt::Event::CTRL) { if (_selectedGeometry != 0 && e->modifiers() & tgt::Event::CTRL) {
// add a control point on CTRL+Click
TFGeometry1D* g = _selectedGeometry->getGeometry(); TFGeometry1D* g = _selectedGeometry->getGeometry();
std::vector<TFGeometry1D::KeyPoint>& kpts = g->getKeyPoints(); std::vector<TFGeometry1D::KeyPoint>& kpts = g->getKeyPoints();
TFGeometry1D::KeyPoint kp(static_cast<float>(e->x()) / static_cast<float>(_canvas->width()), tgt::col4(255)); TFGeometry1D::KeyPoint kp(static_cast<float>(e->x()) / static_cast<float>(_canvas->width()), tgt::col4(255));
......
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