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
ecf7c7b7
Commit
ecf7c7b7
authored
May 03, 2013
by
Claudio Valerio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed issue with lost of transform for strokes
parent
f4ccb269
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
23 deletions
+13
-23
UBSvgSubsetAdaptor.cpp
src/adaptors/UBSvgSubsetAdaptor.cpp
+4
-14
UBApplicationController.cpp
src/core/UBApplicationController.cpp
+9
-9
No files found.
src/adaptors/UBSvgSubsetAdaptor.cpp
View file @
ecf7c7b7
...
...
@@ -574,7 +574,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
else
group
=
mStrokesList
.
value
(
parentId
);
polygonItem
->
setTransform
(
group
->
transform
());
if
(
polygonItem
->
transform
().
isIdentity
())
polygonItem
->
setTransform
(
group
->
transform
());
group
->
addToGroup
(
polygonItem
);
polygonItem
->
setStrokesGroup
(
group
);
polygonItem
->
setStroke
(
currentStroke
);
...
...
@@ -604,7 +605,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
else
group
=
mStrokesList
.
value
(
parentId
);
polygonItem
->
setTransform
(
group
->
transform
());
if
(
polygonItem
->
transform
().
isIdentity
())
polygonItem
->
setTransform
(
group
->
transform
());
group
->
addToGroup
(
polygonItem
);
polygonItem
->
setStrokesGroup
(
group
);
polygonItem
->
setStroke
(
currentStroke
);
...
...
@@ -1700,18 +1702,6 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol
if
(
!
svgPoints
.
isNull
())
{
// int lenght = strlen(svgPoints.toUtf8().constData()) + 1;
// char pippo[lenght];
// memcpy(pippo,svgPoints.toUtf8().constData(),lenght);
// char* localPosition = (char*) &pippo[0];
// do{
// float x = atof(localPosition);
// localPosition = strchr(localPosition,',') + 1;
// float y = atof(localPosition);
// localPosition = strchrnul(localPosition,' ');
// polygon << QPointF(x,y);
// }while(localPosition - pippo > lenght - 5);
QStringList
ts
=
svgPoints
.
toString
().
split
(
QLatin1Char
(
' '
),
QString
::
SkipEmptyParts
);
...
...
src/core/UBApplicationController.cpp
View file @
ecf7c7b7
...
...
@@ -68,9 +68,9 @@
#include "core/memcheck.h"
UBApplicationController
::
UBApplicationController
(
UBBoardView
*
pControlView
,
UBApplicationController
::
UBApplicationController
(
UBBoardView
*
pControlView
,
UBBoardView
*
pDisplayView
,
UBMainWindow
*
pMainWindow
,
UBMainWindow
*
pMainWindow
,
QObject
*
parent
,
UBRightPalette
*
rightPalette
)
:
QObject
(
parent
)
...
...
@@ -371,7 +371,7 @@ void UBApplicationController::showBoard()
UBPlatformUtils
::
setDesktopMode
(
false
);
mUninoteController
->
hideWindow
();
mMainWindow
->
show
();
emit
mainModeChanged
(
Board
);
...
...
@@ -543,12 +543,12 @@ void UBApplicationController::showSankoreEditor()
void
UBApplicationController
::
checkUpdate
()
{
if
(
mHttp
)
delete
mHttp
;
QUrl
url
(
"http://ftp.open-sankore.org/update.json"
);
mHttp
=
new
QHttp
(
url
.
host
());
connect
(
mHttp
,
SIGNAL
(
requestFinished
(
int
,
bool
)),
this
,
SLOT
(
updateRequestFinished
(
int
,
bool
)));
mHttp
->
get
(
url
.
path
());
//
if(mHttp)
//
delete mHttp;
//
QUrl url("http://ftp.open-sankore.org/update.json");
//
mHttp = new QHttp(url.host());
//
connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool)));
//
mHttp->get(url.path());
}
void
UBApplicationController
::
updateRequestFinished
(
int
id
,
bool
error
)
...
...
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