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
b94b8629
Commit
b94b8629
authored
Aug 21, 2012
by
Yimgo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shutted down warnings.
parent
cae2caec
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
46 deletions
+43
-46
UBCFFAdaptor.cpp
plugins/cffadaptor/src/UBCFFAdaptor.cpp
+17
-21
UBImportImage.cpp
src/adaptors/UBImportImage.cpp
+24
-23
UBMessagesDialog.h
src/gui/UBMessagesDialog.h
+1
-1
UBRubberBand.cpp
src/gui/UBRubberBand.cpp
+1
-1
No files found.
plugins/cffadaptor/src/UBCFFAdaptor.cpp
View file @
b94b8629
...
...
@@ -654,29 +654,25 @@ QDomElement UBCFFAdaptor::UBToCFFConverter::parseSvgPageSection(const QDomElemen
void
UBCFFAdaptor
::
UBToCFFConverter
::
writeQDomElementToXML
(
const
QDomNode
&
node
)
{
if
(
!
node
.
isNull
())
if
(
node
.
isText
())
{
mIWBContentWriter
->
writeCharacters
(
node
.
nodeValue
());
}
else
{
mIWBContentWriter
->
writeStartElement
(
node
.
namespaceURI
(),
node
.
toElement
().
tagName
());
if
(
!
node
.
isNull
())
{
if
(
node
.
isText
())
mIWBContentWriter
->
writeCharacters
(
node
.
nodeValue
());
else
{
mIWBContentWriter
->
writeStartElement
(
node
.
namespaceURI
(),
node
.
toElement
().
tagName
());
for
(
int
i
=
0
;
i
<
node
.
toElement
().
attributes
().
count
();
i
++
)
{
QDomAttr
attr
=
node
.
toElement
().
attributes
().
item
(
i
).
toAttr
();
mIWBContentWriter
->
writeAttribute
(
attr
.
name
(),
attr
.
value
());
}
QDomNode
child
=
node
.
firstChild
();
while
(
!
child
.
isNull
())
{
writeQDomElementToXML
(
child
);
child
=
child
.
nextSibling
();
}
for
(
int
i
=
0
;
i
<
node
.
toElement
().
attributes
().
count
();
i
++
)
{
QDomAttr
attr
=
node
.
toElement
().
attributes
().
item
(
i
).
toAttr
();
mIWBContentWriter
->
writeAttribute
(
attr
.
name
(),
attr
.
value
());
mIWBContentWriter
->
writeEndElement
();
}
QDomNode
child
=
node
.
firstChild
();
while
(
!
child
.
isNull
())
{
writeQDomElementToXML
(
child
);
child
=
child
.
nextSibling
();
}
mIWBContentWriter
->
writeEndElement
();
}
}
}
bool
UBCFFAdaptor
::
UBToCFFConverter
::
writeExtendedIwbSection
()
...
...
src/adaptors/UBImportImage.cpp
View file @
b94b8629
...
...
@@ -74,31 +74,32 @@ QString UBImportImage::importFileFilter()
return
filter
;
}
QList
<
UBGraphicsItem
*>
UBImportImage
::
import
(
const
QUuid
&
uuid
,
const
QString
&
filePath
)
{
QList
<
UBGraphicsItem
*>
result
;
QPixmap
pix
(
filePath
);
if
(
pix
.
isNull
())
return
result
;
QList
<
UBGraphicsItem
*>
UBImportImage
::
import
(
const
QUuid
&
uuid
,
const
QString
&
filePath
)
{
Q_UNUSED
(
uuid
);
QList
<
UBGraphicsItem
*>
result
;
QPixmap
pix
(
filePath
);
if
(
pix
.
isNull
())
return
result
;
UBGraphicsPixmapItem
*
pixmapItem
=
new
UBGraphicsPixmapItem
();
pixmapItem
->
setPixmap
(
pix
);
result
<<
pixmapItem
;
return
result
;
}
void
UBImportImage
::
placeImportedItemToScene
(
UBGraphicsScene
*
scene
,
UBGraphicsItem
*
item
)
{
UBGraphicsPixmapItem
*
pixmapItem
=
(
UBGraphicsPixmapItem
*
)
item
;
UBGraphicsPixmapItem
*
sceneItem
=
scene
->
addPixmap
(
pixmapItem
->
pixmap
(),
NULL
,
QPointF
(
0
,
0
));
scene
->
setAsBackgroundObject
(
sceneItem
,
true
);
// Only stored pixmap, should be deleted now
delete
pixmapItem
;
}
result
<<
pixmapItem
;
return
result
;
}
void
UBImportImage
::
placeImportedItemToScene
(
UBGraphicsScene
*
scene
,
UBGraphicsItem
*
item
)
{
UBGraphicsPixmapItem
*
pixmapItem
=
(
UBGraphicsPixmapItem
*
)
item
;
UBGraphicsPixmapItem
*
sceneItem
=
scene
->
addPixmap
(
pixmapItem
->
pixmap
(),
NULL
,
QPointF
(
0
,
0
));
scene
->
setAsBackgroundObject
(
sceneItem
,
true
);
// Only stored pixmap, should be deleted now
delete
pixmapItem
;
}
const
QString
&
UBImportImage
::
folderToCopy
()
{
static
QString
f
(
""
);
...
...
src/gui/UBMessagesDialog.h
View file @
b94b8629
...
...
@@ -34,4 +34,4 @@ private:
int
mMessagesFontSize
;
};
#endif UB_MESSAGES_DIALOG_H_
\ No newline at end of file
#endif
/* UB_MESSAGES_DIALOG_H_ */
\ No newline at end of file
src/gui/UBRubberBand.cpp
View file @
b94b8629
...
...
@@ -32,8 +32,8 @@
UBRubberBand
::
UBRubberBand
(
Shape
s
,
QWidget
*
p
)
:
QRubberBand
(
s
,
p
)
,
mResizingMode
(
None
)
,
mMouseIsPressed
(
false
)
,
mResizingBorderHeight
(
20
)
,
mMouseIsPressed
(
false
)
,
mLastPressedPoint
(
QPoint
())
{
customStyle
=
NULL
;
...
...
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