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
P
Plugin-TextureControl
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Plugin-TextureControl
Commits
0e7c1579
Commit
0e7c1579
authored
Dec 08, 2017
by
Martin Heistermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve ODR violation with PhySim
parent
ee0c4de3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
21 deletions
+21
-21
QwtFunctionPlotTC.cc
QwtFunctionPlotTC.cc
+11
-11
QwtFunctionPlotTC.hh
QwtFunctionPlotTC.hh
+5
-5
QwtFunctionPlotTCBase.ui
QwtFunctionPlotTCBase.ui
+2
-2
textureProperties.cc
textureProperties.cc
+1
-1
textureProperties.hh
textureProperties.hh
+2
-2
No files found.
QwtFunctionPlot.cc
→
QwtFunctionPlot
TC
.cc
View file @
0e7c1579
...
...
@@ -57,7 +57,7 @@
#ifdef WITH_QWT
#include "QwtFunctionPlot.hh"
#include "QwtFunctionPlot
TC
.hh"
#include <iostream>
#include <algorithm>
...
...
@@ -90,9 +90,9 @@ namespace ACG {
/// Default constructor
QwtFunctionPlot
::
QwtFunctionPlot
(
QWidget
*
_parent
)
:
QwtFunctionPlot
TC
::
QwtFunctionPlotTC
(
QWidget
*
_parent
)
:
QDialog
(
_parent
),
Ui
::
QwtFunctionPlotBase
(),
Ui
::
QwtFunctionPlot
TC
Base
(),
plot_zoomer_
(
0
),
clampMinMarker_
(
0
),
minSymbol_
(
0
),
...
...
@@ -126,7 +126,7 @@ QwtFunctionPlot::QwtFunctionPlot(QWidget* _parent) :
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
setFunction
(
std
::
vector
<
double
>&
_values
)
void
QwtFunctionPlot
TC
::
setFunction
(
std
::
vector
<
double
>&
_values
)
{
values_
=
_values
;
...
...
@@ -143,12 +143,12 @@ void QwtFunctionPlot::setFunction( std::vector<double>& _values)
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
setParameters
(
const
TexParameters
&
_parameters
)
void
QwtFunctionPlot
TC
::
setParameters
(
const
TexParameters
&
_parameters
)
{
parameters_
=
_parameters
;
}
void
QwtFunctionPlot
::
setParameters
(
void
QwtFunctionPlot
TC
::
setParameters
(
bool
_repeat
,
double
_repeatMax
,
bool
_clamp
,
...
...
@@ -172,28 +172,28 @@ void QwtFunctionPlot::setParameters(
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
setImage
(
QImage
*
_image
)
void
QwtFunctionPlot
TC
::
setImage
(
QImage
*
_image
)
{
image_
=
_image
;
}
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
zoomIn
()
void
QwtFunctionPlot
TC
::
zoomIn
()
{
emit
plot_zoomer_
->
zoom
(
1
);
}
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
zoomOut
()
void
QwtFunctionPlot
TC
::
zoomOut
()
{
emit
plot_zoomer_
->
zoom
(
-
1
);
}
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
clamp
()
void
QwtFunctionPlot
TC
::
clamp
()
{
QRectF
clamped
=
plot_zoomer_
->
zoomRect
();
clamped
.
setLeft
(
min_
);
...
...
@@ -203,7 +203,7 @@ void QwtFunctionPlot::clamp()
//------------------------------------------------------------------------------
void
QwtFunctionPlot
::
replot
()
void
QwtFunctionPlot
TC
::
replot
()
{
//create intervals
const
int
intervalCount
=
100
;
...
...
QwtFunctionPlot.hh
→
QwtFunctionPlot
TC
.hh
View file @
0e7c1579
...
...
@@ -49,7 +49,7 @@
//=============================================================================
//
// CLASS QwtFunctionPlot
// CLASS QwtFunctionPlot
TC
//
//
// Author: David Bommes <bommes@cs.rwth-aachen.de>
...
...
@@ -82,7 +82,7 @@
#include <QDialog>
// qmake users have to include pc
#include <ui_QwtFunctionPlotBase.hh>
#include <ui_QwtFunctionPlot
TC
Base.hh>
// ACGMake users have to include
// #include "QtFunctionPlotBase.hh"
...
...
@@ -108,16 +108,16 @@ namespace ACG
class
QwtFunctionPlot
:
public
QDialog
,
public
Ui
::
QwtFunctionPlot
Base
class
QwtFunctionPlot
TC
:
public
QDialog
,
public
Ui
::
QwtFunctionPlotTC
Base
{
Q_OBJECT
public:
/// Default constructor
explicit
QwtFunctionPlot
(
QWidget
*
_parent
=
0
);
explicit
QwtFunctionPlot
TC
(
QWidget
*
_parent
=
0
);
/// Destructor
~
QwtFunctionPlot
()
{}
~
QwtFunctionPlot
TC
()
{}
// set the function to plot
void
setFunction
(
std
::
vector
<
double
>&
_values
);
...
...
QwtFunctionPlotBase.ui
→
QwtFunctionPlot
TC
Base.ui
View file @
0e7c1579
<?xml version="1.0" encoding="UTF-8"?>
<ui
version=
"4.0"
>
<class>
QwtFunctionPlotBase
</class>
<widget
class=
"QWidget"
name=
"QwtFunctionPlotBase"
>
<class>
QwtFunctionPlot
TC
Base
</class>
<widget
class=
"QWidget"
name=
"QwtFunctionPlot
TC
Base"
>
<property
name=
"windowModality"
>
<enum>
Qt::NonModal
</enum>
</property>
...
...
textureProperties.cc
View file @
0e7c1579
...
...
@@ -85,7 +85,7 @@ texturePropertiesWidget::texturePropertiesWidget(QWidget *parent)
#ifdef WITH_QWT
QGridLayout
*
layout
=
new
QGridLayout
(
originalData
);
functionPlot_
=
new
ACG
::
QwtFunctionPlot
(
0
);
functionPlot_
=
new
ACG
::
QwtFunctionPlot
TC
(
0
);
layout
->
addWidget
(
functionPlot_
,
0
,
0
);
...
...
textureProperties.hh
View file @
0e7c1579
...
...
@@ -60,7 +60,7 @@
#endif
#ifdef WITH_QWT
#include "QwtFunctionPlot.hh"
#include "QwtFunctionPlot
TC
.hh"
#endif
/** \class texturePropertiesWidget
...
...
@@ -105,7 +105,7 @@ class texturePropertiesWidget : public QDialog, public Ui::Dialog
int
id_
;
#ifdef WITH_QWT
ACG
::
QwtFunctionPlot
*
functionPlot_
;
ACG
::
QwtFunctionPlot
TC
*
functionPlot_
;
#endif
};
...
...
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