Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dtk-visualization
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
11
Issues
11
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dtk
dtk-visualization
Commits
b3404b86
Commit
b3404b86
authored
Feb 04, 2020
by
LACROIX Romain
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/2.19.0'
parents
6176bb21
254673e1
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
26 additions
and
6 deletions
+26
-6
CHANGELOG.md
CHANGELOG.md
+4
-0
CMakeLists.txt
CMakeLists.txt
+2
-2
src/dtkVisualization/dtkVisualizationCanvas.cpp
src/dtkVisualization/dtkVisualizationCanvas.cpp
+1
-1
src/dtkVisualization/dtkVisualizationDecoratorVectorStreamTracer.cpp
...alization/dtkVisualizationDecoratorVectorStreamTracer.cpp
+1
-0
src/dtkVisualization/dtkVisualizationDecoratorWithClut.cpp
src/dtkVisualization/dtkVisualizationDecoratorWithClut.cpp
+12
-1
src/dtkVisualization/dtkVisualizationDecoratorWithClut.h
src/dtkVisualization/dtkVisualizationDecoratorWithClut.h
+3
-0
src/dtkVisualization/dtkVisualizationDecoratorWithClut_p.h
src/dtkVisualization/dtkVisualizationDecoratorWithClut_p.h
+1
-0
src/dtkVisualizationWidgets/dtkVisualizationWidgetsCategory.cpp
...kVisualizationWidgets/dtkVisualizationWidgetsCategory.cpp
+2
-2
No files found.
CHANGELOG.md
View file @
b3404b86
# Change Log:
# 2.19.0 04-Feb-2020
-
raise maximum values for spin boxes
-
optionally do not include class name in scalar bar title
# 2.18.2 28-Jan-2020
-
Fix set visibility for Streamlines decorator when source sphere widget doesn't have an interactor
...
...
CMakeLists.txt
View file @
b3404b86
...
...
@@ -23,8 +23,8 @@ project(dtkVisualization)
## ###################################################################
set
(
${
PROJECT_NAME
}
_VERSION_MAJOR 2
)
set
(
${
PROJECT_NAME
}
_VERSION_MINOR 1
8
)
set
(
${
PROJECT_NAME
}
_VERSION_PATCH
2
)
set
(
${
PROJECT_NAME
}
_VERSION_MINOR 1
9
)
set
(
${
PROJECT_NAME
}
_VERSION_PATCH
0
)
set
(
${
PROJECT_NAME
}
_VERSION
${${
PROJECT_NAME
}
_VERSION_MAJOR
}
.
${${
PROJECT_NAME
}
_VERSION_MINOR
}
.
${${
PROJECT_NAME
}
_VERSION_PATCH
}
)
...
...
src/dtkVisualization/dtkVisualizationCanvas.cpp
View file @
b3404b86
...
...
@@ -221,7 +221,7 @@ void dtkVisualizationCanvas::addScalarBar(vtkScalarBarActor *scalar_bar)
++
d
->
nb_scalar_bars
;
std
::
size_t
orientation
=
d
->
nb_scalar_bars
%
2
;
// 0: horizontal, 1: vertical
std
::
size_t
side
=
(
d
->
nb_scalar_bars
%
4
)
<
2
;
// 0: right, 1: left
std
::
size_t
side
=
(
d
->
nb_scalar_bars
%
4
)
>=
2
;
// 0: right/top, 1: left/bottom
scalar_bar
->
SetOrientation
(
orientation
);
...
...
src/dtkVisualization/dtkVisualizationDecoratorVectorStreamTracer.cpp
View file @
b3404b86
...
...
@@ -302,6 +302,7 @@ dtkVisualizationDecoratorVectorStreamTracer::dtkVisualizationDecoratorVectorStre
d
->
sp_integrator_max_lengths
->
setObjectName
(
"Max Stream Length"
);
d
->
sp_radius
=
new
QDoubleSpinBox
;
d
->
sp_radius
->
setMaximum
(
99999999
);
d
->
sp_radius
->
setValue
(
1.0
);
d
->
sp_radius
->
setSingleStep
(
0.1
);
d
->
sp_radius
->
setDecimals
(
4
);
...
...
src/dtkVisualization/dtkVisualizationDecoratorWithClut.cpp
View file @
b3404b86
...
...
@@ -53,6 +53,7 @@ dtkVisualizationDecoratorWithClutPrivate::dtkVisualizationDecoratorWithClutPriva
this
->
scalar_bar
->
SetWidth
(
0.08
);
this
->
scalar_bar
->
SetHeight
(
0.6
);
this
->
scalar_bar
->
SetVisibility
(
false
);
this
->
scalar_bar_label_includes_decorator_name
=
true
;
// Fields
...
...
@@ -672,12 +673,22 @@ bool dtkVisualizationDecoratorWithClut::setCurrentFieldName(const QString& field
d
->
fields_box
->
blockSignals
(
false
);
d
->
scalar_bar
->
UnconstrainedFontSizeOn
();
d
->
scalar_bar
->
SetTitle
(
qPrintable
(
this
->
objectName
()
+
"/"
+
d
->
current_field_name
));
const
QString
title_prefix
=
d
->
scalar_bar_label_includes_decorator_name
?
(
this
->
objectName
()
+
"/"
)
:
""
;
d
->
scalar_bar
->
SetTitle
(
qPrintable
(
title_prefix
+
d
->
current_field_name
));
d
->
scalar_bar
->
Modified
();
return
true
;
}
void
dtkVisualizationDecoratorWithClut
::
setScalarBarLabelIncludesDecoratorName
(
bool
value
)
{
d
->
scalar_bar_label_includes_decorator_name
=
value
;
}
void
dtkVisualizationDecoratorWithClut
::
setCurrentRange
(
double
min
,
double
max
)
{
if
(
d
->
current_field_name
.
isEmpty
()
&&
d
->
default_field_name
.
isEmpty
())
{
...
...
src/dtkVisualization/dtkVisualizationDecoratorWithClut.h
View file @
b3404b86
...
...
@@ -60,6 +60,9 @@ public:
public:
QString
fieldName
(
void
)
const
;
public:
virtual
void
setScalarBarLabelIncludesDecoratorName
(
bool
);
protected:
void
restoreSettings
(
void
)
override
;
...
...
src/dtkVisualization/dtkVisualizationDecoratorWithClut_p.h
View file @
b3404b86
...
...
@@ -99,6 +99,7 @@ public:
QString
default_color_map
;
bool
default_visibility
;
bool
default_show_scalar_bar
;
bool
scalar_bar_label_includes_decorator_name
;
public:
vtkSmartPointer
<
vtkColorTransferFunction
>
color_function
;
...
...
src/dtkVisualizationWidgets/dtkVisualizationWidgetsCategory.cpp
View file @
b3404b86
...
...
@@ -73,8 +73,8 @@ dtkVisualizationWidgetsScalarControl::dtkVisualizationWidgetsScalarControl(const
d
->
reset_value
=
reset
;
QLayout
*
layout
=
new
QHBoxLayout
;
d
->
spbox
->
setMinimum
(
-
100000
);
d
->
spbox
->
setMaximum
(
100000
);
d
->
spbox
->
setMinimum
(
-
999999999
);
d
->
spbox
->
setMaximum
(
999999999
);
d
->
spbox
->
setDecimals
(
5
);
d
->
spbox
->
setKeyboardTracking
(
false
);
d
->
breset
->
setToolTip
(
"Reset"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment