Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenBoard
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lifo
Nicolas Ollinger
OpenBoard
Commits
5cea797e
Commit
5cea797e
authored
Feb 28, 2014
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Scene is copied before being queued to avoid concurrence
parent
bea07404
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
10 deletions
+9
-10
UBPersistenceManager.cpp
src/core/UBPersistenceManager.cpp
+5
-1
UBPersistenceWorker.cpp
src/core/UBPersistenceWorker.cpp
+4
-1
UBGraphicsScene.cpp
src/domain/UBGraphicsScene.cpp
+0
-8
No files found.
src/core/UBPersistenceManager.cpp
View file @
5cea797e
...
...
@@ -738,7 +738,11 @@ void UBPersistenceManager::persistDocumentScene(UBDocumentProxy* pDocumentProxy,
if
(
pScene
->
isModified
())
{
UBThumbnailAdaptor
::
persistScene
(
pDocumentProxy
,
pScene
,
pSceneIndex
);
mWorker
->
saveScene
(
pDocumentProxy
,
pScene
,
pSceneIndex
);
QTime
time
;
time
.
start
();
UBGraphicsScene
*
copiedScene
=
pScene
->
sceneDeepCopy
();
qDebug
()
<<
"time to duplicate scene "
<<
time
.
elapsed
()
<<
" ms"
;
mWorker
->
saveScene
(
pDocumentProxy
,
copiedScene
,
pSceneIndex
);
pScene
->
setModified
(
false
);
}
...
...
src/core/UBPersistenceWorker.cpp
View file @
5cea797e
...
...
@@ -57,8 +57,11 @@ void UBPersistenceWorker::process()
mSemaphore
.
acquire
();
do
{
PersistenceInformation
info
=
saves
.
takeFirst
();
if
(
info
.
action
==
WriteScene
)
if
(
info
.
action
==
WriteScene
)
{
UBSvgSubsetAdaptor
::
persistScene
(
info
.
proxy
,
info
.
scene
,
info
.
sceneIndex
);
delete
info
.
scene
;
info
.
scene
=
NULL
;
}
else
{
emit
sceneLoaded
(
UBSvgSubsetAdaptor
::
loadSceneAsText
(
info
.
proxy
,
info
.
sceneIndex
),
info
.
proxy
,
info
.
sceneIndex
);
}
...
...
src/domain/UBGraphicsScene.cpp
View file @
5cea797e
...
...
@@ -665,14 +665,6 @@ void UBGraphicsScene::DisposeMagnifierQWidgets()
magniferControlViewWidget
=
NULL
;
}
if
(
magniferDisplayViewWidget
)
{
magniferDisplayViewWidget
->
hide
();
magniferDisplayViewWidget
->
setParent
(
0
);
delete
magniferDisplayViewWidget
;
magniferDisplayViewWidget
=
NULL
;
}
// some time have crash here on access to app (when call from destructor when close OpenBoard app)
// so i just add try/catch section here
try
...
...
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