Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
6217dc8a
Commit
6217dc8a
authored
Apr 12, 2017
by
Martin Schultz
Browse files
removed double parameter from selectionfloodfill function in selection interface,
core, pluginloader and communication files
parent
bb172b2f
Changes
4
Hide whitespace changes
Inline
Side-by-side
BasePlugin/SelectionInterface.hh
View file @
6217dc8a
...
...
@@ -814,11 +814,10 @@ class SelectionInterface {
* the specified angle.
*
* @param _event The mouse event that currently is performed
* @param _maxAngle The maximum angle used for flood filling
* @param _currentType The currently active primitive type
* @param _deselect True if entities should be deselected
*/
virtual
void
slotFloodFillSelection
(
QMouseEvent
*
_event
,
double
_maxAngle
,
PrimitiveType
_currentType
,
bool
_deselect
)
{};
virtual
void
slotFloodFillSelection
(
QMouseEvent
*
_event
,
PrimitiveType
_currentType
,
bool
_deselect
)
{};
/** \brief Called whenever the user performs a connected components selection
*
...
...
@@ -942,11 +941,10 @@ class SelectionInterface {
* by each type selection plugin if this interactive selection mode should be provided.
*
* @param _event The mouse event that currently is performed
* @param _maxAngle The maximum angle used for flood filling
* @param _currentType The currently active primitive type
* @param _deselect True if entities should be deselected
*/
virtual
void
floodFillSelection
(
QMouseEvent
*
_event
,
double
_maxAngle
,
PrimitiveType
_currentType
,
bool
_deselect
)
{};
virtual
void
floodFillSelection
(
QMouseEvent
*
_event
,
PrimitiveType
_currentType
,
bool
_deselect
)
{};
/** \brief Emitted by selection base plugin whenever the user performs a connected components selection
*
...
...
Core/Core.hh
View file @
6217dc8a
...
...
@@ -324,7 +324,7 @@ signals:
void
closestBoundarySelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
/// SelectionInterface: This signal is emitted when standard flood fill selection has been performed
void
floodFillSelection
(
QMouseEvent
*
_event
,
double
_maxAngle
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
void
floodFillSelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
/// SelectionInterface: This signal is emitted when standard connected components selection has been performed
void
componentsSelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
...
...
@@ -591,7 +591,7 @@ signals:
void
slotClosestBoundarySelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
/// SelectionInterface: Called when flood fill selection operation has been performed
void
slotFloodFillSelection
(
QMouseEvent
*
_event
,
double
_maxAngle
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
void
slotFloodFillSelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
/// SelectionInterface: Called when connected components selection operation has been performed
void
slotComponentsSelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
);
...
...
Core/PluginLoader.cc
View file @
6217dc8a
...
...
@@ -1489,13 +1489,13 @@ void Core::loadPlugin(const QString& _filename,const bool _silent, QString& _lic
connect
(
this
,
SIGNAL
(
closestBoundarySelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
plugin
,
SLOT
(
slotClosestBoundarySelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
Qt
::
DirectConnection
);
if
(
checkSignal
(
plugin
,
"floodFillSelection(QMouseEvent*,
double,
SelectionInterface::PrimitiveType,bool)"
)
)
connect
(
plugin
,
SIGNAL
(
floodFillSelection
(
QMouseEvent
*
,
double
,
SelectionInterface
::
PrimitiveType
,
bool
)),
this
,
SLOT
(
slotFloodFillSelection
(
QMouseEvent
*
,
double
,
SelectionInterface
::
PrimitiveType
,
bool
)),
Qt
::
DirectConnection
);
if
(
checkSignal
(
plugin
,
"floodFillSelection(QMouseEvent*,SelectionInterface::PrimitiveType,bool)"
)
)
connect
(
plugin
,
SIGNAL
(
floodFillSelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
this
,
SLOT
(
slotFloodFillSelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
Qt
::
DirectConnection
);
if
(
checkSlot
(
plugin
,
"slotFloodFillSelection(QMouseEvent*,
double,
SelectionInterface::PrimitiveType,bool)"
)
)
connect
(
this
,
SIGNAL
(
floodFillSelection
(
QMouseEvent
*
,
double
,
SelectionInterface
::
PrimitiveType
,
bool
)),
plugin
,
SLOT
(
slotFloodFillSelection
(
QMouseEvent
*
,
double
,
SelectionInterface
::
PrimitiveType
,
bool
)),
Qt
::
DirectConnection
);
if
(
checkSlot
(
plugin
,
"slotFloodFillSelection(QMouseEvent*,SelectionInterface::PrimitiveType,bool)"
)
)
connect
(
this
,
SIGNAL
(
floodFillSelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
plugin
,
SLOT
(
slotFloodFillSelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
Qt
::
DirectConnection
);
if
(
checkSignal
(
plugin
,
"componentsSelection(QMouseEvent*,SelectionInterface::PrimitiveType,bool)"
)
)
connect
(
plugin
,
SIGNAL
(
componentsSelection
(
QMouseEvent
*
,
SelectionInterface
::
PrimitiveType
,
bool
)),
...
...
Core/SelectionCommunication.cc
View file @
6217dc8a
...
...
@@ -154,8 +154,8 @@ void Core::slotClosestBoundarySelection(QMouseEvent* _event, SelectionInterface:
emit
closestBoundarySelection
(
_event
,
_currentType
,
_deselect
);
}
void
Core
::
slotFloodFillSelection
(
QMouseEvent
*
_event
,
double
_maxAngle
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
)
{
emit
floodFillSelection
(
_event
,
_maxAngle
,
_currentType
,
_deselect
);
void
Core
::
slotFloodFillSelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
)
{
emit
floodFillSelection
(
_event
,
_currentType
,
_deselect
);
}
void
Core
::
slotComponentsSelection
(
QMouseEvent
*
_event
,
SelectionInterface
::
PrimitiveType
_currentType
,
bool
_deselect
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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