Skip to content

Commit

Permalink
Minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
oktomus committed Jun 25, 2018
1 parent 09cd53f commit 4562cd3
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 36 deletions.
8 changes: 4 additions & 4 deletions src/appleseed.python/bindrenderercontroller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,31 @@ namespace
}
}

void on_rendering_paused() override
void on_rendering_pause() override
{
// Lock Python's global interpreter lock (GIL),
// it was released in MasterRenderer.render.
ScopedGILLock lock;

try
{
get_override("on_rendering_paused")();
get_override("on_rendering_pause")();
}
catch (bpy::error_already_set)
{
PyErr_Print();
}
}

void on_rendering_resumed() override
void on_rendering_resume() override
{
// Lock Python's global interpreter lock (GIL),
// it was released in MasterRenderer.render.
ScopedGILLock lock;

try
{
get_override("on_rendering_resumed")();
get_override("on_rendering_resume")();
}
catch (bpy::error_already_set)
{
Expand Down
2 changes: 1 addition & 1 deletion src/appleseed.studio/mainwindow/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
</action>
<action name="action_rendering_pause_rendering">
<property name="text">
<string>Pause &amp;Rendering</string>
<string>&amp;Pause Rendering</string>
</property>
<property name="shortcut">
<string>Ctrl+F5</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ void QtRendererController::on_rendering_abort()
emit signal_rendering_abort();
}

void QtRendererController::on_rendering_paused()
void QtRendererController::on_rendering_pause()
{
emit signal_rendering_paused();
emit signal_rendering_pause();
}

void QtRendererController::on_rendering_resumed()
void QtRendererController::on_rendering_resume()
{
emit signal_rendering_resumed();
emit signal_rendering_resume();
}

void QtRendererController::on_frame_begin()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ class QtRendererController
void on_rendering_abort() override;

// This method is called after rendering was paused.
void on_rendering_paused() override;
void on_rendering_pause() override;

// This method is called after rendering was resumed.
void on_rendering_resumed() override;
void on_rendering_resume() override;

// This method is called before rendering a single frame.
void on_frame_begin() override;
Expand All @@ -84,8 +84,8 @@ class QtRendererController
void signal_rendering_begin();
void signal_rendering_success();
void signal_rendering_abort();
void signal_rendering_paused();
void signal_rendering_resumed();
void signal_rendering_pause();
void signal_rendering_resume();
void signal_frame_begin();
void signal_frame_end();

Expand Down
12 changes: 6 additions & 6 deletions src/appleseed.studio/mainwindow/rendering/renderingmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ RenderingManager::RenderingManager(StatusBar& status_bar)
Qt::BlockingQueuedConnection);

connect(
&m_renderer_controller, SIGNAL(signal_rendering_paused()),
SLOT(slot_rendering_paused()),
&m_renderer_controller, SIGNAL(signal_rendering_pause()),
SLOT(slot_rendering_pause()),
Qt::BlockingQueuedConnection);

connect(
&m_renderer_controller, SIGNAL(signal_rendering_resumed()),
SLOT(slot_rendering_resumed()),
&m_renderer_controller, SIGNAL(signal_rendering_resume()),
SLOT(slot_rendering_resume()),
Qt::BlockingQueuedConnection);

connect(
Expand Down Expand Up @@ -402,14 +402,14 @@ void RenderingManager::slot_rendering_begin()
m_has_camera_changed = false;
}

void RenderingManager::slot_rendering_paused()
void RenderingManager::slot_rendering_pause()
{
assert(m_master_renderer.get());

m_rendering_timer.pause();
}

void RenderingManager::slot_rendering_resumed()
void RenderingManager::slot_rendering_resume()
{
assert(m_master_renderer.get());

Expand Down
4 changes: 2 additions & 2 deletions src/appleseed.studio/mainwindow/rendering/renderingmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ class RenderingManager

private slots:
void slot_rendering_begin();
void slot_rendering_paused();
void slot_rendering_resumed();
void slot_rendering_pause();
void slot_rendering_resume();
void slot_rendering_end();
void slot_rendering_failed();
void slot_frame_begin();
Expand Down
2 changes: 1 addition & 1 deletion src/appleseed/foundation/utility/stopwatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ inline void Stopwatch<Timer>::resume()
{
assert(m_paused);

// Update comitted time.
// Update committed time.
const uint64 end = m_timer.read_end();
m_commited += end >= m_start ? end - m_start : 0;
m_commited -= end >= m_pause_time ? end - m_pause_time : 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ void DefaultRendererController::on_rendering_abort()
{
}

void DefaultRendererController::on_rendering_paused()
void DefaultRendererController::on_rendering_pause()
{
}

void DefaultRendererController::on_rendering_resumed()
void DefaultRendererController::on_rendering_resume()
{
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ class APPLESEED_DLLSYMBOL DefaultRendererController
void on_rendering_abort() override;

// This method is called after rendering was paused.
void on_rendering_paused() override;
void on_rendering_pause() override;

// This method is called after rendering was resumed.
void on_rendering_resumed() override;
void on_rendering_resume() override;

// This method is called before rendering a single frame.
void on_frame_begin() override;
Expand Down
4 changes: 2 additions & 2 deletions src/appleseed/renderer/kernel/rendering/irenderercontroller.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ class APPLESEED_DLLSYMBOL IRendererController
virtual void on_rendering_abort() = 0;

// This method is called after rendering was paused.
virtual void on_rendering_paused() = 0;
virtual void on_rendering_pause() = 0;

// This method is called after rendering was resumed.
virtual void on_rendering_resumed() = 0;
virtual void on_rendering_resume() = 0;

// This method is called before rendering a single frame.
virtual void on_frame_begin() = 0;
Expand Down
4 changes: 2 additions & 2 deletions src/appleseed/renderer/kernel/rendering/masterrenderer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ struct MasterRenderer::Impl
if (is_paused)
{
frame_renderer.resume_rendering();
m_renderer_controller->on_rendering_resumed();
m_renderer_controller->on_rendering_resume();
is_paused = false;
}
break;
Expand All @@ -547,7 +547,7 @@ struct MasterRenderer::Impl
if (!is_paused)
{
frame_renderer.pause_rendering();
m_renderer_controller->on_rendering_paused();
m_renderer_controller->on_rendering_pause();
is_paused = true;
}
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,14 @@ void SerialRendererController::on_rendering_abort()
m_controller->on_rendering_abort();
}

void SerialRendererController::on_rendering_paused()
void SerialRendererController::on_rendering_pause()
{
m_controller->on_rendering_paused();
m_controller->on_rendering_pause();
}

void SerialRendererController::on_rendering_resumed()
void SerialRendererController::on_rendering_resume()
{
m_controller->on_rendering_resumed();
m_controller->on_rendering_resume();
}

void SerialRendererController::on_frame_begin()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ class SerialRendererController
void on_rendering_begin() override;
void on_rendering_success() override;
void on_rendering_abort() override;
void on_rendering_paused() override;
void on_rendering_resumed() override;
void on_rendering_pause() override;
void on_rendering_resume() override;
void on_frame_begin() override;
void on_frame_end() override;
void on_progress() override;
Expand Down

0 comments on commit 4562cd3

Please sign in to comment.