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
Kdenlive
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
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
Multimedia
Kdenlive
Commits
4f783848
Commit
4f783848
authored
May 24, 2013
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Const'ref
parent
bc478539
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
64 additions
and
39 deletions
+64
-39
src/scopes/colorscopes/abstractgfxscopewidget.cpp
src/scopes/colorscopes/abstractgfxscopewidget.cpp
+1
-1
src/scopes/colorscopes/abstractgfxscopewidget.h
src/scopes/colorscopes/abstractgfxscopewidget.h
+3
-3
src/scopes/colorscopes/histogram.cpp
src/scopes/colorscopes/histogram.cpp
+1
-1
src/scopes/colorscopes/histogram.h
src/scopes/colorscopes/histogram.h
+1
-1
src/scopes/colorscopes/rgbparade.cpp
src/scopes/colorscopes/rgbparade.cpp
+20
-5
src/scopes/colorscopes/rgbparade.h
src/scopes/colorscopes/rgbparade.h
+1
-1
src/scopes/colorscopes/vectorscope.cpp
src/scopes/colorscopes/vectorscope.cpp
+5
-2
src/scopes/colorscopes/vectorscope.h
src/scopes/colorscopes/vectorscope.h
+1
-1
src/scopes/colorscopes/waveform.cpp
src/scopes/colorscopes/waveform.cpp
+1
-1
src/scopes/colorscopes/waveform.h
src/scopes/colorscopes/waveform.h
+1
-1
src/simplekeyframes/simpletimelinewidget.h
src/simplekeyframes/simpletimelinewidget.h
+6
-6
src/stopmotion/stopmotion.cpp
src/stopmotion/stopmotion.cpp
+22
-15
src/stopmotion/stopmotion.h
src/stopmotion/stopmotion.h
+1
-1
No files found.
src/scopes/colorscopes/abstractgfxscopewidget.cpp
View file @
4f783848
...
...
@@ -51,7 +51,7 @@ void AbstractGfxScopeWidget::mouseReleaseEvent(QMouseEvent *event)
///// Slots /////
void
AbstractGfxScopeWidget
::
slotRenderZoneUpdated
(
const
QImage
frame
)
void
AbstractGfxScopeWidget
::
slotRenderZoneUpdated
(
const
QImage
&
frame
)
{
QMutexLocker
lock
(
&
m_mutex
);
m_scopeImage
=
frame
.
rgbSwapped
();
...
...
src/scopes/colorscopes/abstractgfxscopewidget.h
View file @
4f783848
...
...
@@ -36,7 +36,7 @@ protected:
/** @brief Scope renderer. Must emit signalScopeRenderingFinished()
when calculation has finished, to allow multi-threading.
accelerationFactor hints how much faster than usual the calculation should be accomplished, if possible. */
virtual
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
)
=
0
;
virtual
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
&
)
=
0
;
virtual
QImage
renderScope
(
uint
accelerationFactor
);
...
...
@@ -50,13 +50,13 @@ public slots:
/** @brief Must be called when the active monitor has shown a new frame.
This slot must be connected in the implementing class, it is *not*
done in this abstract class. */
void
slotRenderZoneUpdated
(
const
QImage
);
void
slotRenderZoneUpdated
(
const
QImage
&
);
protected
slots
:
virtual
void
slotAutoRefreshToggled
(
bool
autoRefresh
);
signals:
void
signalFrameRequest
(
const
QString
widgetName
);
void
signalFrameRequest
(
const
QString
&
widgetName
);
};
...
...
src/scopes/colorscopes/histogram.cpp
View file @
4f783848
...
...
@@ -109,7 +109,7 @@ QImage Histogram::renderHUD(uint)
emit
signalHUDRenderingFinished
(
0
,
1
);
return
QImage
();
}
QImage
Histogram
::
renderGfxScope
(
uint
accelFactor
,
const
QImage
qimage
)
QImage
Histogram
::
renderGfxScope
(
uint
accelFactor
,
const
QImage
&
qimage
)
{
QTime
start
=
QTime
::
currentTime
();
start
.
start
();
...
...
src/scopes/colorscopes/histogram.h
View file @
4f783848
...
...
@@ -43,7 +43,7 @@ private:
bool
isScopeDependingOnInput
()
const
;
bool
isBackgroundDependingOnInput
()
const
;
QImage
renderHUD
(
uint
accelerationFactor
);
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
);
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
&
);
QImage
renderBackground
(
uint
accelerationFactor
);
Ui
::
Histogram_UI
*
ui
;
...
...
src/scopes/colorscopes/rgbparade.cpp
View file @
4f783848
...
...
@@ -123,7 +123,7 @@ QImage RGBParade::renderHUD(uint)
return
hud
;
}
QImage
RGBParade
::
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
qimage
)
QImage
RGBParade
::
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
&
qimage
)
{
QTime
start
=
QTime
::
currentTime
();
start
.
start
();
...
...
@@ -135,8 +135,23 @@ QImage RGBParade::renderGfxScope(uint accelerationFactor, const QImage qimage)
return
parade
;
}
QImage
RGBParade
::
renderBackground
(
uint
)
{
return
QImage
();
}
QImage
RGBParade
::
renderBackground
(
uint
)
{
return
QImage
();
}
bool
RGBParade
::
isHUDDependingOnInput
()
const
{
return
false
;
}
bool
RGBParade
::
isScopeDependingOnInput
()
const
{
return
true
;
}
bool
RGBParade
::
isBackgroundDependingOnInput
()
const
{
return
false
;
}
bool
RGBParade
::
isHUDDependingOnInput
()
const
{
return
false
;
}
bool
RGBParade
::
isScopeDependingOnInput
()
const
{
return
true
;
}
bool
RGBParade
::
isBackgroundDependingOnInput
()
const
{
return
false
;
}
src/scopes/colorscopes/rgbparade.h
View file @
4f783848
...
...
@@ -47,7 +47,7 @@ private:
bool
isBackgroundDependingOnInput
()
const
;
QImage
renderHUD
(
uint
accelerationFactor
);
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
);
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
&
);
QImage
renderBackground
(
uint
accelerationFactor
);
};
...
...
src/scopes/colorscopes/vectorscope.cpp
View file @
4f783848
...
...
@@ -138,7 +138,10 @@ Vectorscope::~Vectorscope()
delete
ui
;
}
QString
Vectorscope
::
widgetName
()
const
{
return
QString
(
"Vectorscope"
);
}
QString
Vectorscope
::
widgetName
()
const
{
return
QLatin1String
(
"Vectorscope"
);
}
void
Vectorscope
::
readConfig
()
{
...
...
@@ -259,7 +262,7 @@ QImage Vectorscope::renderHUD(uint)
return
hud
;
}
QImage
Vectorscope
::
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
qimage
)
QImage
Vectorscope
::
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
&
qimage
)
{
QTime
start
=
QTime
::
currentTime
();
QImage
scope
;
...
...
src/scopes/colorscopes/vectorscope.h
View file @
4f783848
...
...
@@ -41,7 +41,7 @@ protected:
///// Implemented methods /////
QRect
scopeRect
();
QImage
renderHUD
(
uint
accelerationFactor
);
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
);
QImage
renderGfxScope
(
uint
accelerationFactor
,
const
QImage
&
);
QImage
renderBackground
(
uint
accelerationFactor
);
bool
isHUDDependingOnInput
()
const
;
bool
isScopeDependingOnInput
()
const
;
...
...
src/scopes/colorscopes/waveform.cpp
View file @
4f783848
...
...
@@ -170,7 +170,7 @@ QImage Waveform::renderHUD(uint)
return
hud
;
}
QImage
Waveform
::
renderGfxScope
(
uint
accelFactor
,
const
QImage
qimage
)
QImage
Waveform
::
renderGfxScope
(
uint
accelFactor
,
const
QImage
&
qimage
)
{
QTime
start
=
QTime
::
currentTime
();
start
.
start
();
...
...
src/scopes/colorscopes/waveform.h
View file @
4f783848
...
...
@@ -52,7 +52,7 @@ private:
/// Implemented methods ///
QRect
scopeRect
();
QImage
renderHUD
(
uint
);
QImage
renderGfxScope
(
uint
,
const
QImage
);
QImage
renderGfxScope
(
uint
,
const
QImage
&
);
QImage
renderBackground
(
uint
);
bool
isHUDDependingOnInput
()
const
;
bool
isScopeDependingOnInput
()
const
;
...
...
src/simplekeyframes/simpletimelinewidget.h
View file @
4f783848
...
...
@@ -40,12 +40,12 @@ public slots:
void
slotGoToPrev
();
protected:
v
irtual
v
oid
paintEvent
(
QPaintEvent
*
event
);
v
irtual
v
oid
mousePressEvent
(
QMouseEvent
*
event
);
v
irtual
v
oid
mouseReleaseEvent
(
QMouseEvent
*
event
);
v
irtual
v
oid
mouseMoveEvent
(
QMouseEvent
*
event
);
v
irtual
v
oid
mouseDoubleClickEvent
(
QMouseEvent
*
event
);
v
irtual
v
oid
wheelEvent
(
QWheelEvent
*
event
);
void
paintEvent
(
QPaintEvent
*
event
);
void
mousePressEvent
(
QMouseEvent
*
event
);
void
mouseReleaseEvent
(
QMouseEvent
*
event
);
void
mouseMoveEvent
(
QMouseEvent
*
event
);
void
mouseDoubleClickEvent
(
QMouseEvent
*
event
);
void
wheelEvent
(
QWheelEvent
*
event
);
private:
int
m_duration
;
...
...
src/stopmotion/stopmotion.cpp
View file @
4f783848
...
...
@@ -58,8 +58,10 @@ void MyLabel::setImage(const QImage& img)
//virtual
void
MyLabel
::
wheelEvent
(
QWheelEvent
*
event
)
{
if
(
event
->
delta
()
>
0
)
emit
seek
(
true
);
else
emit
seek
(
false
);
if
(
event
->
delta
()
>
0
)
emit
seek
(
true
);
else
emit
seek
(
false
);
}
//virtual
...
...
@@ -141,14 +143,14 @@ void StopmotionMonitor::slotMouseSeek(int /*eventDelta*/, bool /*fast*/)
StopmotionWidget
::
StopmotionWidget
(
MonitorManager
*
manager
,
const
KUrl
&
projectFolder
,
const
QList
<
QAction
*>
&
actions
,
QWidget
*
parent
)
:
QDialog
(
parent
)
,
Ui
::
Stopmotion_UI
()
,
m_projectFolder
(
projectFolder
)
,
m_captureDevice
(
NULL
)
,
m_sequenceFrame
(
0
)
,
m_animatedIndex
(
-
1
)
,
m_animate
(
false
)
,
m_manager
(
manager
)
,
m_monitor
(
new
StopmotionMonitor
(
manager
,
this
))
,
Ui
::
Stopmotion_UI
()
,
m_projectFolder
(
projectFolder
)
,
m_captureDevice
(
NULL
)
,
m_sequenceFrame
(
0
)
,
m_animatedIndex
(
-
1
)
,
m_animate
(
false
)
,
m_manager
(
manager
)
,
m_monitor
(
new
StopmotionMonitor
(
manager
,
this
))
{
//setAttribute(Qt::WA_DeleteOnClose);
//HACK: the monitor widget is hidden, it is just used to control the capturedevice from monitormanager
...
...
@@ -707,8 +709,9 @@ void StopmotionWidget::slotCreateThumbs(const QImage &img, int ix)
QString
StopmotionWidget
::
getPathForFrame
(
int
ix
,
QString
seqName
)
{
if
(
seqName
.
isEmpty
())
seqName
=
m_sequenceName
;
return
m_projectFolder
.
path
(
KUrl
::
AddTrailingSlash
)
+
seqName
+
'_'
+
QString
::
number
(
ix
).
rightJustified
(
4
,
'0'
,
false
)
+
".png"
;
if
(
seqName
.
isEmpty
())
seqName
=
m_sequenceName
;
return
m_projectFolder
.
path
(
KUrl
::
AddTrailingSlash
)
+
seqName
+
QLatin1Char
(
'_'
)
+
QString
::
number
(
ix
).
rightJustified
(
4
,
'0'
,
false
)
+
QLatin1String
(
".png"
);
}
void
StopmotionWidget
::
slotShowFrame
(
const
QString
&
path
)
...
...
@@ -835,7 +838,8 @@ void StopmotionWidget::selectFrame(int ix)
{
frame_list
->
blockSignals
(
true
);
QListWidgetItem
*
item
=
getFrameFromIndex
(
ix
);
if
(
!
item
)
return
;
if
(
!
item
)
return
;
frame_list
->
setCurrentItem
(
item
);
frame_list
->
blockSignals
(
false
);
}
...
...
@@ -852,7 +856,9 @@ void StopmotionWidget::slotRemoveFrame()
{
if
(
frame_list
->
currentItem
()
==
NULL
)
return
;
QString
path
=
frame_list
->
currentItem
()
->
toolTip
();
if
(
KMessageBox
::
questionYesNo
(
this
,
i18n
(
"Delete frame %1 from disk?"
,
path
),
i18n
(
"Delete Frame"
))
!=
KMessageBox
::
Yes
)
return
;
if
(
KMessageBox
::
questionYesNo
(
this
,
i18n
(
"Delete frame %1 from disk?"
,
path
),
i18n
(
"Delete Frame"
))
!=
KMessageBox
::
Yes
)
return
;
QFile
f
(
path
);
if
(
f
.
remove
())
{
QListWidgetItem
*
item
=
frame_list
->
takeItem
(
frame_list
->
currentRow
());
...
...
@@ -875,7 +881,8 @@ void StopmotionWidget::slotSwitchAnalyse(bool isOn)
void
StopmotionWidget
::
slotSwitchMirror
(
bool
isOn
)
{
//KdenliveSettings::setAnalyse_stopmotion(isOn);
if
(
m_captureDevice
)
m_captureDevice
->
mirror
(
isOn
);
if
(
m_captureDevice
)
m_captureDevice
->
mirror
(
isOn
);
}
...
...
src/stopmotion/stopmotion.h
View file @
4f783848
...
...
@@ -36,7 +36,7 @@ class MyLabel : public QLabel
{
Q_OBJECT
public:
MyLabel
(
QWidget
*
parent
=
0
);
explicit
MyLabel
(
QWidget
*
parent
=
0
);
void
setImage
(
const
QImage
&
img
);
protected:
...
...
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