").appendTo(img_block);
$("").appendTo(img_block);
@@ -668,4 +667,4 @@ function onDropTarget(obj, event) {
event.cancelBubble = true;
}
return false;
-}
\ No newline at end of file
+}
diff --git a/resources/library/interactivities/etudier.wgt/js/script.js b/resources/library/interactivities/etudier.wgt/js/script.js
index 074b169b..1ce3fb3e 100644
--- a/resources/library/interactivities/etudier.wgt/js/script.js
+++ b/resources/library/interactivities/etudier.wgt/js/script.js
@@ -472,7 +472,6 @@ function onDropTarget(obj, event) {
textData = stringToXML(textData);
var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent;
var tmp_type = textData.getElementsByTagName("type")[0].firstChild.textContent;
- tmp = tmp.substr(1, tmp.length);
if(tmp_type.substr(0, 5) == "audio"){
var audio_block = $("
").draggable().appendTo($(obj));
audio_block.css("position","absolute").css("top",event.clientY).css("left",event.clientX);
@@ -530,4 +529,4 @@ $(window).resize(function(){
$(this).width(slider.width()).height(slider.height());
});
slider.setSize(slider.width(), slider.height());
-})
\ No newline at end of file
+})
diff --git a/resources/library/interactivities/ordonner_des_images.wgt/js/script.js b/resources/library/interactivities/ordonner_des_images.wgt/js/script.js
index 71c0c26f..5f04b2a0 100644
--- a/resources/library/interactivities/ordonner_des_images.wgt/js/script.js
+++ b/resources/library/interactivities/ordonner_des_images.wgt/js/script.js
@@ -399,7 +399,6 @@ function onDropTarget(obj, event) {
}
textData = stringToXML(textData);
var tmp = textData.getElementsByTagName("path")[0].firstChild.textContent;
- tmp = tmp.substr(1, tmp.length);
//alert(textData.getElementsByTagName("type")[0].firstChild.textContent + " | " + textData.getElementsByTagName("path")[0].firstChild.textContent);
var tmp_img = $("![]()
").attr("src", tmp);
//alert(1)
diff --git a/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js b/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js
index 0cfaee8f..25c4c92d 100644
--- a/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js
+++ b/resources/library/interactivities/ordonner_des_letters.wgt/js/script.js
@@ -381,7 +381,6 @@ function onDropAudio(obj, event) {
var tmp_type = textData.getElementsByTagName("type")[0].firstChild.textContent;
if(tmp_type.substr(0, 5) == "audio"){
var audio_block = $(obj).find(".audio_block");
- tmp = tmp.substr(1, tmp.length);
$(obj).find("audio").remove();
audio_block.find(":first-child").removeClass("stop").addClass("play");
var source = $("
").insertBefore($(obj).find(".add_img"));
var audio_block = $("
").appendTo(img_tmp)
diff --git a/resources/library/search/ImgSearch.wgs/config.xml b/resources/library/search/Google images.wgs/config.xml
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/config.xml
rename to resources/library/search/Google images.wgs/config.xml
diff --git a/resources/library/search/ImgSearch.wgs/css/basic.css b/resources/library/search/Google images.wgs/css/basic.css
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/css/basic.css
rename to resources/library/search/Google images.wgs/css/basic.css
diff --git a/resources/library/search/ImgSearch.wgs/icon.png b/resources/library/search/Google images.wgs/icon.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/icon.png
rename to resources/library/search/Google images.wgs/icon.png
diff --git a/resources/library/search/ImgSearch.wgs/icon.thumbnail.png b/resources/library/search/Google images.wgs/icon.thumbnail.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/icon.thumbnail.png
rename to resources/library/search/Google images.wgs/icon.thumbnail.png
diff --git a/resources/library/search/ImgSearch.wgs/images/down.png b/resources/library/search/Google images.wgs/images/down.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/down.png
rename to resources/library/search/Google images.wgs/images/down.png
diff --git a/resources/library/search/ImgSearch.wgs/images/greySquare.png b/resources/library/search/Google images.wgs/images/greySquare.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/greySquare.png
rename to resources/library/search/Google images.wgs/images/greySquare.png
diff --git a/resources/library/search/ImgSearch.wgs/images/icon-close.png b/resources/library/search/Google images.wgs/images/icon-close.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/icon-close.png
rename to resources/library/search/Google images.wgs/images/icon-close.png
diff --git a/resources/library/search/ImgSearch.wgs/images/popupBack.png b/resources/library/search/Google images.wgs/images/popupBack.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/popupBack.png
rename to resources/library/search/Google images.wgs/images/popupBack.png
diff --git a/resources/library/search/ImgSearch.wgs/images/search.png b/resources/library/search/Google images.wgs/images/search.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/search.png
rename to resources/library/search/Google images.wgs/images/search.png
diff --git a/resources/library/search/ImgSearch.wgs/images/trgDown.png b/resources/library/search/Google images.wgs/images/trgDown.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/trgDown.png
rename to resources/library/search/Google images.wgs/images/trgDown.png
diff --git a/resources/library/search/ImgSearch.wgs/images/trgUp.png b/resources/library/search/Google images.wgs/images/trgUp.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/trgUp.png
rename to resources/library/search/Google images.wgs/images/trgUp.png
diff --git a/resources/library/search/ImgSearch.wgs/images/up.png b/resources/library/search/Google images.wgs/images/up.png
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/images/up.png
rename to resources/library/search/Google images.wgs/images/up.png
diff --git a/resources/library/search/ImgSearch.wgs/index.html b/resources/library/search/Google images.wgs/index.html
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/index.html
rename to resources/library/search/Google images.wgs/index.html
diff --git a/resources/library/search/ImgSearch.wgs/scripts/jquery-1.6.2.min.js b/resources/library/search/Google images.wgs/scripts/jquery-1.6.2.min.js
similarity index 100%
rename from resources/library/search/ImgSearch.wgs/scripts/jquery-1.6.2.min.js
rename to resources/library/search/Google images.wgs/scripts/jquery-1.6.2.min.js
diff --git a/resources/library/shape/white_bubble_speak_left.svg b/resources/library/shape/bulle blanche gauche.svg
similarity index 100%
rename from resources/library/shape/white_bubble_speak_left.svg
rename to resources/library/shape/bulle blanche gauche.svg
diff --git a/resources/library/shape/white_bubble_think.svg b/resources/library/shape/bulle blanche idée.svg
similarity index 100%
rename from resources/library/shape/white_bubble_think.svg
rename to resources/library/shape/bulle blanche idée.svg
diff --git a/resources/library/shape/white_bubble_speak.svg b/resources/library/shape/bulle blanche.svg
similarity index 100%
rename from resources/library/shape/white_bubble_speak.svg
rename to resources/library/shape/bulle blanche.svg
diff --git a/resources/library/shape/blue_bubble_speak_left.svg b/resources/library/shape/bulle bleue gauche.svg
similarity index 100%
rename from resources/library/shape/blue_bubble_speak_left.svg
rename to resources/library/shape/bulle bleue gauche.svg
diff --git a/resources/library/shape/blue_bubble_think.svg b/resources/library/shape/bulle bleue idée.svg
similarity index 100%
rename from resources/library/shape/blue_bubble_think.svg
rename to resources/library/shape/bulle bleue idée.svg
diff --git a/resources/library/shape/blue_bubble_speak.svg b/resources/library/shape/bulle bleue.svg
similarity index 100%
rename from resources/library/shape/blue_bubble_speak.svg
rename to resources/library/shape/bulle bleue.svg
diff --git a/resources/library/shape/grey_bubble_speak_left.svg b/resources/library/shape/bulle grise gauche.svg
similarity index 100%
rename from resources/library/shape/grey_bubble_speak_left.svg
rename to resources/library/shape/bulle grise gauche.svg
diff --git a/resources/library/shape/grey_bubble_think.svg b/resources/library/shape/bulle grise idée.svg
similarity index 100%
rename from resources/library/shape/grey_bubble_think.svg
rename to resources/library/shape/bulle grise idée.svg
diff --git a/resources/library/shape/grey_bubble_speak.svg b/resources/library/shape/bulle grise.svg
similarity index 100%
rename from resources/library/shape/grey_bubble_speak.svg
rename to resources/library/shape/bulle grise.svg
diff --git a/resources/library/shape/red_bubble_speak_left.svg b/resources/library/shape/bulle rouge gauche.svg
similarity index 100%
rename from resources/library/shape/red_bubble_speak_left.svg
rename to resources/library/shape/bulle rouge gauche.svg
diff --git a/resources/library/shape/red_bubble_think.svg b/resources/library/shape/bulle rouge idée.svg
similarity index 100%
rename from resources/library/shape/red_bubble_think.svg
rename to resources/library/shape/bulle rouge idée.svg
diff --git a/resources/library/shape/red_bubble_speak.svg b/resources/library/shape/bulle rouge.svg
similarity index 100%
rename from resources/library/shape/red_bubble_speak.svg
rename to resources/library/shape/bulle rouge.svg
diff --git a/resources/library/shape/nofill_bubble_speak_left.svg b/resources/library/shape/bulle vide gauche.svg
similarity index 100%
rename from resources/library/shape/nofill_bubble_speak_left.svg
rename to resources/library/shape/bulle vide gauche.svg
diff --git a/resources/library/shape/nofill_bubble_think.svg b/resources/library/shape/bulle vide idée.svg
similarity index 100%
rename from resources/library/shape/nofill_bubble_think.svg
rename to resources/library/shape/bulle vide idée.svg
diff --git a/resources/library/shape/nofill_bubble_speak.svg b/resources/library/shape/bulle vide.svg
similarity index 100%
rename from resources/library/shape/nofill_bubble_speak.svg
rename to resources/library/shape/bulle vide.svg
diff --git a/resources/library/shape/white_square_rnd.svg b/resources/library/shape/carré blanc arr.svg
similarity index 100%
rename from resources/library/shape/white_square_rnd.svg
rename to resources/library/shape/carré blanc arr.svg
diff --git a/resources/library/shape/white_square.svg b/resources/library/shape/carré blanc.svg
similarity index 100%
rename from resources/library/shape/white_square.svg
rename to resources/library/shape/carré blanc.svg
diff --git a/resources/library/shape/blue_square_rnd.svg b/resources/library/shape/carré bleu arr.svg
similarity index 100%
rename from resources/library/shape/blue_square_rnd.svg
rename to resources/library/shape/carré bleu arr.svg
diff --git a/resources/library/shape/blue_square.svg b/resources/library/shape/carré bleu.svg
similarity index 100%
rename from resources/library/shape/blue_square.svg
rename to resources/library/shape/carré bleu.svg
diff --git a/resources/library/shape/grey_square_rnd.svg b/resources/library/shape/carré gris arr.svg
similarity index 100%
rename from resources/library/shape/grey_square_rnd.svg
rename to resources/library/shape/carré gris arr.svg
diff --git a/resources/library/shape/grey_square.svg b/resources/library/shape/carré gris.svg
similarity index 100%
rename from resources/library/shape/grey_square.svg
rename to resources/library/shape/carré gris.svg
diff --git a/resources/library/shape/red_square_rnd.svg b/resources/library/shape/carré rouge arr.svg
similarity index 100%
rename from resources/library/shape/red_square_rnd.svg
rename to resources/library/shape/carré rouge arr.svg
diff --git a/resources/library/shape/red_square.svg b/resources/library/shape/carré rouge.svg
similarity index 100%
rename from resources/library/shape/red_square.svg
rename to resources/library/shape/carré rouge.svg
diff --git a/resources/library/shape/nofill_square_rnd.svg b/resources/library/shape/carré vide arr.svg
similarity index 100%
rename from resources/library/shape/nofill_square_rnd.svg
rename to resources/library/shape/carré vide arr.svg
diff --git a/resources/library/shape/nofill_square.svg b/resources/library/shape/carré vide.svg
similarity index 100%
rename from resources/library/shape/nofill_square.svg
rename to resources/library/shape/carré vide.svg
diff --git a/resources/library/shape/carré blanc arr.svg b/resources/library/shape/carré blanc arr.svg
new file mode 100644
index 00000000..a1721d4f
--- /dev/null
+++ b/resources/library/shape/carré blanc arr.svg
@@ -0,0 +1,106 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/carré blanc.svg b/resources/library/shape/carré blanc.svg
new file mode 100644
index 00000000..9bbb6959
--- /dev/null
+++ b/resources/library/shape/carré blanc.svg
@@ -0,0 +1,113 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/white_cylinder.svg b/resources/library/shape/cylindre blanc.svg
similarity index 100%
rename from resources/library/shape/white_cylinder.svg
rename to resources/library/shape/cylindre blanc.svg
diff --git a/resources/library/shape/blue_cylinder.svg b/resources/library/shape/cylindre bleu.svg
similarity index 100%
rename from resources/library/shape/blue_cylinder.svg
rename to resources/library/shape/cylindre bleu.svg
diff --git a/resources/library/shape/grey_cylinder.svg b/resources/library/shape/cylindre gris.svg
similarity index 100%
rename from resources/library/shape/grey_cylinder.svg
rename to resources/library/shape/cylindre gris.svg
diff --git a/resources/library/shape/red_cylinder.svg b/resources/library/shape/cylindre rouge.svg
similarity index 100%
rename from resources/library/shape/red_cylinder.svg
rename to resources/library/shape/cylindre rouge.svg
diff --git a/resources/library/shape/nofill_cylinder.svg b/resources/library/shape/cylindre vide.svg
similarity index 100%
rename from resources/library/shape/nofill_cylinder.svg
rename to resources/library/shape/cylindre vide.svg
diff --git a/resources/library/shape/white_disk.svg b/resources/library/shape/disque blanc.svg
similarity index 100%
rename from resources/library/shape/white_disk.svg
rename to resources/library/shape/disque blanc.svg
diff --git a/resources/library/shape/blue_disk.svg b/resources/library/shape/disque bleu.svg
similarity index 100%
rename from resources/library/shape/blue_disk.svg
rename to resources/library/shape/disque bleu.svg
diff --git a/resources/library/shape/grey_disk.svg b/resources/library/shape/disque gris.svg
similarity index 100%
rename from resources/library/shape/grey_disk.svg
rename to resources/library/shape/disque gris.svg
diff --git a/resources/library/shape/red_disk.svg b/resources/library/shape/disque rouge.svg
similarity index 100%
rename from resources/library/shape/red_disk.svg
rename to resources/library/shape/disque rouge.svg
diff --git a/resources/library/shape/nofill_disk.svg b/resources/library/shape/disque vide.svg
similarity index 100%
rename from resources/library/shape/nofill_disk.svg
rename to resources/library/shape/disque vide.svg
diff --git a/resources/library/shape/white_star_rnd.svg b/resources/library/shape/étoile blanche arr.svg
similarity index 100%
rename from resources/library/shape/white_star_rnd.svg
rename to resources/library/shape/étoile blanche arr.svg
diff --git a/resources/library/shape/white_star.svg b/resources/library/shape/étoile blanche.svg
similarity index 100%
rename from resources/library/shape/white_star.svg
rename to resources/library/shape/étoile blanche.svg
diff --git a/resources/library/shape/blue_star_rnd.svg b/resources/library/shape/étoile bleue arr.svg
similarity index 100%
rename from resources/library/shape/blue_star_rnd.svg
rename to resources/library/shape/étoile bleue arr.svg
diff --git a/resources/library/shape/blue_star.svg b/resources/library/shape/étoile bleue.svg
similarity index 100%
rename from resources/library/shape/blue_star.svg
rename to resources/library/shape/étoile bleue.svg
diff --git a/resources/library/shape/grey_star_rnd.svg b/resources/library/shape/étoile grise arr.svg
similarity index 100%
rename from resources/library/shape/grey_star_rnd.svg
rename to resources/library/shape/étoile grise arr.svg
diff --git a/resources/library/shape/grey_star.svg b/resources/library/shape/étoile grise.svg
similarity index 100%
rename from resources/library/shape/grey_star.svg
rename to resources/library/shape/étoile grise.svg
diff --git a/resources/library/shape/red_star_rnd.svg b/resources/library/shape/étoile rouge arr.svg
similarity index 100%
rename from resources/library/shape/red_star_rnd.svg
rename to resources/library/shape/étoile rouge arr.svg
diff --git a/resources/library/shape/red_star.svg b/resources/library/shape/étoile rouge.svg
similarity index 100%
rename from resources/library/shape/red_star.svg
rename to resources/library/shape/étoile rouge.svg
diff --git a/resources/library/shape/nofill_star_rnd.svg b/resources/library/shape/étoile vide arr.svg
similarity index 100%
rename from resources/library/shape/nofill_star_rnd.svg
rename to resources/library/shape/étoile vide arr.svg
diff --git a/resources/library/shape/nofill_star.svg b/resources/library/shape/étoile vide.svg
similarity index 100%
rename from resources/library/shape/nofill_star.svg
rename to resources/library/shape/étoile vide.svg
diff --git a/resources/library/shape/white_arrow_down.svg b/resources/library/shape/flèche blanche bas.svg
similarity index 100%
rename from resources/library/shape/white_arrow_down.svg
rename to resources/library/shape/flèche blanche bas.svg
diff --git a/resources/library/shape/white_arrow_right.svg b/resources/library/shape/flèche blanche droite.svg
similarity index 100%
rename from resources/library/shape/white_arrow_right.svg
rename to resources/library/shape/flèche blanche droite.svg
diff --git a/resources/library/shape/white_arrow_left.svg b/resources/library/shape/flèche blanche gauche.svg
similarity index 100%
rename from resources/library/shape/white_arrow_left.svg
rename to resources/library/shape/flèche blanche gauche.svg
diff --git a/resources/library/shape/white_arrow_up.svg b/resources/library/shape/flèche blanche haut.svg
similarity index 100%
rename from resources/library/shape/white_arrow_up.svg
rename to resources/library/shape/flèche blanche haut.svg
diff --git a/resources/library/shape/blue_arrow_down.svg b/resources/library/shape/flèche bleue bas.svg
similarity index 100%
rename from resources/library/shape/blue_arrow_down.svg
rename to resources/library/shape/flèche bleue bas.svg
diff --git a/resources/library/shape/blue_arrow_right.svg b/resources/library/shape/flèche bleue droite.svg
similarity index 100%
rename from resources/library/shape/blue_arrow_right.svg
rename to resources/library/shape/flèche bleue droite.svg
diff --git a/resources/library/shape/blue_arrow_left.svg b/resources/library/shape/flèche bleue gauche.svg
similarity index 100%
rename from resources/library/shape/blue_arrow_left.svg
rename to resources/library/shape/flèche bleue gauche.svg
diff --git a/resources/library/shape/blue_arrow_up.svg b/resources/library/shape/flèche bleue haut.svg
similarity index 100%
rename from resources/library/shape/blue_arrow_up.svg
rename to resources/library/shape/flèche bleue haut.svg
diff --git a/resources/library/shape/grey_arrow_down.svg b/resources/library/shape/flèche grise bas.svg
similarity index 100%
rename from resources/library/shape/grey_arrow_down.svg
rename to resources/library/shape/flèche grise bas.svg
diff --git a/resources/library/shape/grey_arrow_right.svg b/resources/library/shape/flèche grise droite.svg
similarity index 100%
rename from resources/library/shape/grey_arrow_right.svg
rename to resources/library/shape/flèche grise droite.svg
diff --git a/resources/library/shape/grey_arrow_left.svg b/resources/library/shape/flèche grise gauche.svg
similarity index 100%
rename from resources/library/shape/grey_arrow_left.svg
rename to resources/library/shape/flèche grise gauche.svg
diff --git a/resources/library/shape/grey_arrow_up.svg b/resources/library/shape/flèche grise haut.svg
similarity index 100%
rename from resources/library/shape/grey_arrow_up.svg
rename to resources/library/shape/flèche grise haut.svg
diff --git a/resources/library/shape/red_arrow_down.svg b/resources/library/shape/flèche rouge bas.svg
similarity index 100%
rename from resources/library/shape/red_arrow_down.svg
rename to resources/library/shape/flèche rouge bas.svg
diff --git a/resources/library/shape/red_arrow_right.svg b/resources/library/shape/flèche rouge droite.svg
similarity index 100%
rename from resources/library/shape/red_arrow_right.svg
rename to resources/library/shape/flèche rouge droite.svg
diff --git a/resources/library/shape/red_arrow_left.svg b/resources/library/shape/flèche rouge gauche.svg
similarity index 100%
rename from resources/library/shape/red_arrow_left.svg
rename to resources/library/shape/flèche rouge gauche.svg
diff --git a/resources/library/shape/red_arrow_up.svg b/resources/library/shape/flèche rouge haut.svg
similarity index 100%
rename from resources/library/shape/red_arrow_up.svg
rename to resources/library/shape/flèche rouge haut.svg
diff --git a/resources/library/shape/nofill_arrow_down.svg b/resources/library/shape/flèche vide bas.svg
similarity index 100%
rename from resources/library/shape/nofill_arrow_down.svg
rename to resources/library/shape/flèche vide bas.svg
diff --git a/resources/library/shape/nofill_arrow_right.svg b/resources/library/shape/flèche vide droite.svg
similarity index 100%
rename from resources/library/shape/nofill_arrow_right.svg
rename to resources/library/shape/flèche vide droite.svg
diff --git a/resources/library/shape/nofill_arrow_left.svg b/resources/library/shape/flèche vide gauche.svg
similarity index 100%
rename from resources/library/shape/nofill_arrow_left.svg
rename to resources/library/shape/flèche vide gauche.svg
diff --git a/resources/library/shape/nofill_arrow_up.svg b/resources/library/shape/flèche vide haut.svg
similarity index 100%
rename from resources/library/shape/nofill_arrow_up.svg
rename to resources/library/shape/flèche vide haut.svg
diff --git a/resources/library/shape/flèche blanche bas.svg b/resources/library/shape/flèche blanche bas.svg
new file mode 100644
index 00000000..e4270523
--- /dev/null
+++ b/resources/library/shape/flèche blanche bas.svg
@@ -0,0 +1,102 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/flèche blanche droite.svg b/resources/library/shape/flèche blanche droite.svg
new file mode 100644
index 00000000..593b5c67
--- /dev/null
+++ b/resources/library/shape/flèche blanche droite.svg
@@ -0,0 +1,103 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/flèche blanche gauche.svg b/resources/library/shape/flèche blanche gauche.svg
new file mode 100644
index 00000000..90e42e31
--- /dev/null
+++ b/resources/library/shape/flèche blanche gauche.svg
@@ -0,0 +1,102 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/flèche blanche haut.svg b/resources/library/shape/flèche blanche haut.svg
new file mode 100644
index 00000000..b13c8774
--- /dev/null
+++ b/resources/library/shape/flèche blanche haut.svg
@@ -0,0 +1,103 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/flèche bleue bas.svg b/resources/library/shape/flèche bleue bas.svg
new file mode 100644
index 00000000..7613a3f2
--- /dev/null
+++ b/resources/library/shape/flèche bleue bas.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/resources/library/shape/flèche bleue droite.svg b/resources/library/shape/flèche bleue droite.svg
new file mode 100644
index 00000000..cd147f73
--- /dev/null
+++ b/resources/library/shape/flèche bleue droite.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/resources/library/shape/flèche bleue gauche.svg b/resources/library/shape/flèche bleue gauche.svg
new file mode 100644
index 00000000..64cf0f8a
--- /dev/null
+++ b/resources/library/shape/flèche bleue gauche.svg
@@ -0,0 +1,33 @@
+
+
+
+
diff --git a/resources/library/shape/flèche bleue haut.svg b/resources/library/shape/flèche bleue haut.svg
new file mode 100644
index 00000000..331c491c
--- /dev/null
+++ b/resources/library/shape/flèche bleue haut.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche grise bas.svg b/resources/library/shape/flèche grise bas.svg
new file mode 100644
index 00000000..d68b5218
--- /dev/null
+++ b/resources/library/shape/flèche grise bas.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche grise droite.svg b/resources/library/shape/flèche grise droite.svg
new file mode 100644
index 00000000..32f50aa2
--- /dev/null
+++ b/resources/library/shape/flèche grise droite.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche grise gauche.svg b/resources/library/shape/flèche grise gauche.svg
new file mode 100644
index 00000000..a895bb88
--- /dev/null
+++ b/resources/library/shape/flèche grise gauche.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche grise haut.svg b/resources/library/shape/flèche grise haut.svg
new file mode 100644
index 00000000..d4db8052
--- /dev/null
+++ b/resources/library/shape/flèche grise haut.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche rouge bas.svg b/resources/library/shape/flèche rouge bas.svg
new file mode 100644
index 00000000..96d38b83
--- /dev/null
+++ b/resources/library/shape/flèche rouge bas.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche rouge droite.svg b/resources/library/shape/flèche rouge droite.svg
new file mode 100644
index 00000000..d2fbc359
--- /dev/null
+++ b/resources/library/shape/flèche rouge droite.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche rouge gauche.svg b/resources/library/shape/flèche rouge gauche.svg
new file mode 100644
index 00000000..336a1e11
--- /dev/null
+++ b/resources/library/shape/flèche rouge gauche.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche rouge haut.svg b/resources/library/shape/flèche rouge haut.svg
new file mode 100644
index 00000000..6dd21956
--- /dev/null
+++ b/resources/library/shape/flèche rouge haut.svg
@@ -0,0 +1,34 @@
+
+
+
+
diff --git a/resources/library/shape/flèche vide bas.svg b/resources/library/shape/flèche vide bas.svg
new file mode 100644
index 00000000..07ce46d0
--- /dev/null
+++ b/resources/library/shape/flèche vide bas.svg
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/resources/library/shape/flèche vide droite.svg b/resources/library/shape/flèche vide droite.svg
new file mode 100644
index 00000000..ee87f755
--- /dev/null
+++ b/resources/library/shape/flèche vide droite.svg
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/resources/library/shape/flèche vide gauche.svg b/resources/library/shape/flèche vide gauche.svg
new file mode 100644
index 00000000..198f69da
--- /dev/null
+++ b/resources/library/shape/flèche vide gauche.svg
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/resources/library/shape/flèche vide haut.svg b/resources/library/shape/flèche vide haut.svg
new file mode 100644
index 00000000..54433be6
--- /dev/null
+++ b/resources/library/shape/flèche vide haut.svg
@@ -0,0 +1,16 @@
+
+
+
+
diff --git a/resources/library/shape/white_exagon.svg b/resources/library/shape/hexagone blanc.svg
similarity index 100%
rename from resources/library/shape/white_exagon.svg
rename to resources/library/shape/hexagone blanc.svg
diff --git a/resources/library/shape/blue_exagon.svg b/resources/library/shape/hexagone bleu.svg
similarity index 100%
rename from resources/library/shape/blue_exagon.svg
rename to resources/library/shape/hexagone bleu.svg
diff --git a/resources/library/shape/grey_exagon.svg b/resources/library/shape/hexagone gris.svg
similarity index 100%
rename from resources/library/shape/grey_exagon.svg
rename to resources/library/shape/hexagone gris.svg
diff --git a/resources/library/shape/red_exagon.svg b/resources/library/shape/hexagone rouge.svg
similarity index 100%
rename from resources/library/shape/red_exagon.svg
rename to resources/library/shape/hexagone rouge.svg
diff --git a/resources/library/shape/nofill_exagon.svg b/resources/library/shape/hexagone vide.svg
similarity index 100%
rename from resources/library/shape/nofill_exagon.svg
rename to resources/library/shape/hexagone vide.svg
diff --git a/resources/library/shape/white_pentagon.svg b/resources/library/shape/pentagone blanc.svg
similarity index 100%
rename from resources/library/shape/white_pentagon.svg
rename to resources/library/shape/pentagone blanc.svg
diff --git a/resources/library/shape/blue_pentagon.svg b/resources/library/shape/pentagone bleu.svg
similarity index 100%
rename from resources/library/shape/blue_pentagon.svg
rename to resources/library/shape/pentagone bleu.svg
diff --git a/resources/library/shape/grey_pentagon.svg b/resources/library/shape/pentagone gris.svg
similarity index 100%
rename from resources/library/shape/grey_pentagon.svg
rename to resources/library/shape/pentagone gris.svg
diff --git a/resources/library/shape/red_pentagon.svg b/resources/library/shape/pentagone rouge.svg
similarity index 100%
rename from resources/library/shape/red_pentagon.svg
rename to resources/library/shape/pentagone rouge.svg
diff --git a/resources/library/shape/nofill_pentagon.svg b/resources/library/shape/pentagone vide.svg
similarity index 100%
rename from resources/library/shape/nofill_pentagon.svg
rename to resources/library/shape/pentagone vide.svg
diff --git a/resources/library/shape/white_rectangle_rnd.svg b/resources/library/shape/rectangle blanc arr.svg
similarity index 100%
rename from resources/library/shape/white_rectangle_rnd.svg
rename to resources/library/shape/rectangle blanc arr.svg
diff --git a/resources/library/shape/white_rectangle.svg b/resources/library/shape/rectangle blanc.svg
similarity index 100%
rename from resources/library/shape/white_rectangle.svg
rename to resources/library/shape/rectangle blanc.svg
diff --git a/resources/library/shape/blue_rectangle_rnd.svg b/resources/library/shape/rectangle bleu arr.svg
similarity index 100%
rename from resources/library/shape/blue_rectangle_rnd.svg
rename to resources/library/shape/rectangle bleu arr.svg
diff --git a/resources/library/shape/blue_rectangle.svg b/resources/library/shape/rectangle bleu.svg
similarity index 100%
rename from resources/library/shape/blue_rectangle.svg
rename to resources/library/shape/rectangle bleu.svg
diff --git a/resources/library/shape/grey_rectangle_rnd.svg b/resources/library/shape/rectangle gris arr.svg
similarity index 100%
rename from resources/library/shape/grey_rectangle_rnd.svg
rename to resources/library/shape/rectangle gris arr.svg
diff --git a/resources/library/shape/grey_rectangle.svg b/resources/library/shape/rectangle gris.svg
similarity index 100%
rename from resources/library/shape/grey_rectangle.svg
rename to resources/library/shape/rectangle gris.svg
diff --git a/resources/library/shape/red_rectangle_rnd.svg b/resources/library/shape/rectangle rouge arr.svg
similarity index 100%
rename from resources/library/shape/red_rectangle_rnd.svg
rename to resources/library/shape/rectangle rouge arr.svg
diff --git a/resources/library/shape/red_rectangle.svg b/resources/library/shape/rectangle rouge.svg
similarity index 100%
rename from resources/library/shape/red_rectangle.svg
rename to resources/library/shape/rectangle rouge.svg
diff --git a/resources/library/shape/nofill_rectangle_rnd.svg b/resources/library/shape/rectangle vide arr.svg
similarity index 100%
rename from resources/library/shape/nofill_rectangle_rnd.svg
rename to resources/library/shape/rectangle vide arr.svg
diff --git a/resources/library/shape/nofill_rectangle.svg b/resources/library/shape/rectangle vide.svg
similarity index 100%
rename from resources/library/shape/nofill_rectangle.svg
rename to resources/library/shape/rectangle vide.svg
diff --git a/resources/library/shape/white_triangle_rnd.svg b/resources/library/shape/triangle blanc arr.svg
similarity index 100%
rename from resources/library/shape/white_triangle_rnd.svg
rename to resources/library/shape/triangle blanc arr.svg
diff --git a/resources/library/shape/white_triangle.svg b/resources/library/shape/triangle blanc.svg
similarity index 100%
rename from resources/library/shape/white_triangle.svg
rename to resources/library/shape/triangle blanc.svg
diff --git a/resources/library/shape/blue_triangle_rnd.svg b/resources/library/shape/triangle bleu arr.svg
similarity index 100%
rename from resources/library/shape/blue_triangle_rnd.svg
rename to resources/library/shape/triangle bleu arr.svg
diff --git a/resources/library/shape/blue_triangle.svg b/resources/library/shape/triangle bleu.svg
similarity index 100%
rename from resources/library/shape/blue_triangle.svg
rename to resources/library/shape/triangle bleu.svg
diff --git a/resources/library/shape/grey_triangle_rnd.svg b/resources/library/shape/triangle gris arr.svg
similarity index 100%
rename from resources/library/shape/grey_triangle_rnd.svg
rename to resources/library/shape/triangle gris arr.svg
diff --git a/resources/library/shape/grey_triangle.svg b/resources/library/shape/triangle gris.svg
similarity index 100%
rename from resources/library/shape/grey_triangle.svg
rename to resources/library/shape/triangle gris.svg
diff --git a/resources/library/shape/red_triangle_rnd.svg b/resources/library/shape/triangle rouge arr.svg
similarity index 100%
rename from resources/library/shape/red_triangle_rnd.svg
rename to resources/library/shape/triangle rouge arr.svg
diff --git a/resources/library/shape/red_triangle.svg b/resources/library/shape/triangle rouge.svg
similarity index 100%
rename from resources/library/shape/red_triangle.svg
rename to resources/library/shape/triangle rouge.svg
diff --git a/resources/library/shape/nofill_triangle_rnd.svg b/resources/library/shape/triangle vide arr.svg
similarity index 100%
rename from resources/library/shape/nofill_triangle_rnd.svg
rename to resources/library/shape/triangle vide arr.svg
diff --git a/resources/library/shape/nofill_triangle.svg b/resources/library/shape/triangle vide.svg
similarity index 100%
rename from resources/library/shape/nofill_triangle.svg
rename to resources/library/shape/triangle vide.svg
diff --git a/resources/library/shape/étoile blanche arr.svg b/resources/library/shape/étoile blanche arr.svg
new file mode 100644
index 00000000..ccc1232e
--- /dev/null
+++ b/resources/library/shape/étoile blanche arr.svg
@@ -0,0 +1,140 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/étoile blanche.svg b/resources/library/shape/étoile blanche.svg
new file mode 100644
index 00000000..728fe939
--- /dev/null
+++ b/resources/library/shape/étoile blanche.svg
@@ -0,0 +1,124 @@
+
+
+
\ No newline at end of file
diff --git a/resources/library/shape/étoile bleue arr.svg b/resources/library/shape/étoile bleue arr.svg
new file mode 100644
index 00000000..da45d59b
--- /dev/null
+++ b/resources/library/shape/étoile bleue arr.svg
@@ -0,0 +1,38 @@
+
+
+
+
diff --git a/resources/library/shape/étoile bleue.svg b/resources/library/shape/étoile bleue.svg
new file mode 100644
index 00000000..516b7180
--- /dev/null
+++ b/resources/library/shape/étoile bleue.svg
@@ -0,0 +1,29 @@
+
+
+
+
diff --git a/resources/library/shape/étoile vide arr.svg b/resources/library/shape/étoile vide arr.svg
new file mode 100644
index 00000000..5980afe0
--- /dev/null
+++ b/resources/library/shape/étoile vide arr.svg
@@ -0,0 +1,18 @@
+
+
+
+
diff --git a/resources/library/shape/étoile vide.svg b/resources/library/shape/étoile vide.svg
new file mode 100644
index 00000000..fcc08260
--- /dev/null
+++ b/resources/library/shape/étoile vide.svg
@@ -0,0 +1,14 @@
+
+
+
+
diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp
index 19e8a016..a82b2fec 100644
--- a/src/adaptors/UBCFFSubsetAdaptor.cpp
+++ b/src/adaptors/UBCFFSubsetAdaptor.cpp
@@ -52,6 +52,8 @@ static QString tIwb = "iwb";
static QString tMeta = "meta";
static QString tPage = "page";
static QString tPageset = "pageset";
+static QString tG = "g";
+static QString tSwitch = "switch";
static QString tPolygon = "polygon";
static QString tPolyline = "polyline";
static QString tRect = "rect";
@@ -62,7 +64,7 @@ static QString tTspan = "tspan";
static QString tBreak = "tbreak";
static QString tImage = "image";
static QString tFlash = "flash";
-static QString tAudio = "audio";
+static QString tAudio = "a";
static QString tVideo = "video";
//attribute names definition
@@ -161,6 +163,31 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parse()
return result;
}
+
+bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseGSection(const QDomElement &element)
+{
+ QDomElement currentSvgElement = element.firstChildElement();
+ while (!currentSvgElement.isNull()) {
+ if (!parseSvgElement(currentSvgElement))
+ return false;
+
+ currentSvgElement = currentSvgElement.nextSiblingElement();
+ }
+
+ return true;
+}
+bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgSwitchSection(const QDomElement &element)
+{
+
+ QDomElement currentSvgElement = element.firstChildElement();
+ while (!currentSvgElement.isNull()) {
+ if (parseSvgElement(currentSvgElement))
+ return true;
+ }
+
+ return false;
+}
+
bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &element)
{
qreal x1 = element.attribute(aX).toDouble();
@@ -175,7 +202,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &elem
QColor fillColor = !textFillColor.isNull() ? colorFromString(textFillColor) : QColor();
QColor strokeColor = !textStrokeColor.isNull() ? colorFromString(textStrokeColor) : QColor();
- int strokeWidth = !textStrokeWidth.isNull() ? textStrokeWidth.toInt() : 0;
+ int strokeWidth = textStrokeWidth.toInt();
+
+ x1 -= strokeWidth/2;
+ y1 -= strokeWidth/2;
+ width += strokeWidth;
+ height += strokeWidth;
//init svg generator with temp file
QSvgGenerator *generator = createSvgGenerator(width, height);
@@ -204,13 +236,13 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgRect(const QDomElement &elem
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ svgItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, svgItem);
}
- repositionSvgItem(svgItem, width, height, x1, y1, hastransform, transform);
+ repositionSvgItem(svgItem, width, height, x1, y1, transform);
hashSceneItem(element, svgItem);
delete generator;
@@ -249,13 +281,14 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgEllipse(const QDomElement &e
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ svgItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, svgItem);
}
- repositionSvgItem(svgItem, rx * 2, ry * 2, cx - rx , cy - ry, hastransform, transform);
+
+ repositionSvgItem(svgItem, rx * 2, ry * 2, cx - 2*rx, cy+ry, transform);
hashSceneItem(element, svgItem);
delete generator;
@@ -306,7 +339,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e
QColor strokeColor = !strokeColorText.isEmpty() ? colorFromString(strokeColorText) : QColor();
QColor fillColor = !fillColorText.isEmpty() ? colorFromString(fillColorText) : QColor();
- int strokeWidth = strokeWidthText.toInt() > 0 ? strokeWidthText.toInt() : 0;
+ int strokeWidth = strokeWidthText.toDouble();
QPen pen;
pen.setColor(strokeColor);
@@ -332,12 +365,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolygon(const QDomElement &e
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ svgItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, svgItem);
}
- repositionSvgItem(svgItem, width + 10, height + 10, x1 - 5, y1 - 5, hastransform, transform);
+ repositionSvgItem(svgItem, width +strokeWidth, height + strokeWidth, x1 - strokeWidth/2 + transform.m31(), y1 + strokeWidth/2 + transform.m32(), transform);
hashSceneItem(element, svgItem);
delete generator;
@@ -387,7 +420,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement &
QString strokeWidthText = element.attribute(aStrokewidth);
QColor strokeColor = !strokeColorText.isEmpty() ? colorFromString(strokeColorText) : QColor();
- int strokeWidth = strokeWidthText.toInt() > 0 ? strokeWidthText.toInt() : 0;
+ int strokeWidth = strokeWidthText.toDouble();
+
+ width += strokeWidth;
+ height += strokeWidth;
QPen pen;
pen.setColor(strokeColor);
@@ -398,7 +434,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement &
painter.begin(generator); //drawing to svg tmp file
- painter.translate(pen.widthF() / 2 - x1, pen.widthF() / 2 - y1);
+ painter.translate(pen.widthF()/2 - x1, pen.widthF()/2- y1);
painter.setPen(pen);
painter.drawPolyline(polygon);
@@ -408,12 +444,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgPolyline(const QDomElement &
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ svgItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, svgItem);
}
- repositionSvgItem(svgItem, width + 10, height + 10, x1 - 5, y1 - 5, hastransform, transform);
+ repositionSvgItem(svgItem, width +strokeWidth, height + strokeWidth, x1 + transform.m31() - strokeWidth/2, y1 + transform.m32() + strokeWidth/2, transform);
hashSceneItem(element, svgItem);
delete generator;
@@ -537,7 +573,6 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgText(const QDomElement &elem
// remember if text area has transform
// QString transformString;
QTransform transform = fontTransform;
- bool hasTransform = !fontTransform.isIdentity();
QRectF lastDrawnTextBoundingRect;
//parse text area tags
@@ -552,7 +587,8 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgText(const QDomElement &elem
//add resulting svg file to scene
UBGraphicsSvgItem *svgItem = mCurrentScene->addSvg(QUrl::fromLocalFile(generator->fileName()));
- repositionSvgItem(svgItem, width, height, x, y, hasTransform, transform);
+ svgItem->resetTransform();
+ repositionSvgItem(svgItem, width, height, x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, svgItem);
delete generator;
@@ -659,10 +695,10 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgTextarea(const QDomElement &
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ svgItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, svgItem);
}
//by default all the textAreas are not editable
@@ -671,7 +707,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgTextarea(const QDomElement &
curDelegate->setEditable(false);
}
- repositionSvgItem(svgItem, width, height, x, y, hastransform, transform);
+ repositionSvgItem(svgItem, width, height, x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, svgItem);
return true;
@@ -703,12 +739,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgImage(const QDomElement &ele
UBGraphicsPixmapItem *pixItem = mCurrentScene->addPixmap(pix);
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ pixItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, pixItem);
}
- repositionSvgItem(pixItem, width, height, x, y, hastransform, transform);
+ repositionSvgItem(pixItem, width, height, x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, pixItem);
return true;
@@ -745,10 +781,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
QTransform transform;
QString textTransform = element.attribute(aTransform);
+
+ flashItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
+ transform = transformFromString(textTransform, flashItem);
}
- repositionSvgItem(flashItem, width, height, x, y, true, transform);
+ repositionSvgItem(flashItem, width, height, x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, flashItem);
return true;
@@ -756,32 +794,42 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgFlash(const QDomElement &ele
bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgAudio(const QDomElement &element)
{
- qreal x = element.attribute(aX).toDouble();
- qreal y = element.attribute(aY).toDouble();
- qreal width = element.attribute(aWidth).toDouble();
- qreal height = element.attribute(aHeight).toDouble();
+ QDomElement parentOfAudio = element.firstChild().toElement();
+
+ qreal x = parentOfAudio.attribute(aX).toDouble();
+ qreal y = parentOfAudio.attribute(aY).toDouble();
QString itemRefPath = element.attribute(aHref);
- QUrl urlPath;
+ QUrl concreteUrl;
if (!itemRefPath.isNull()) {
- QString videoPath = pwdContent + "/" + itemRefPath;
- if (!QFile::exists(videoPath)) {
+ QString audioPath = pwdContent + "/" + itemRefPath;
+ if (!QFile::exists(audioPath)) {
qDebug() << "can't load file" << pwdContent + "/" + itemRefPath << "maybe file corrupted";
return false;
}
- urlPath = QUrl::fromLocalFile(videoPath);
+ concreteUrl = QUrl::fromLocalFile(audioPath);
}
- UBGraphicsAudioItem *audioItem = mCurrentScene->addAudio(urlPath, false);
+ QUuid uuid = QUuid::createUuid();
+
+#ifdef Q_WS_X11
+ concreteUrl = QUrl::fromLocalFile(mCurrentScene->document()->persistencePath() + "/" + UBPersistenceManager::persistenceManager()
+ ->addAudioFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid));
+#else
+ concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager()
+ ->addAudioFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid));
+#endif
+
+ UBGraphicsAudioItem *audioItem = mCurrentScene->addAudio(concreteUrl, false);
QTransform transform;
- QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+ QString textTransform = parentOfAudio.attribute(aTransform);
+
+ audioItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, audioItem);
}
- repositionSvgItem(audioItem, width, height, x, y, hastransform, transform);
+ repositionSvgItem(audioItem, audioItem->boundingRect().width(), audioItem->boundingRect().height(), x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, audioItem);
return true;
@@ -793,31 +841,38 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgVideo(const QDomElement &ele
if (parseSvgFlash(element)) return true;
else return false;
}
-
qreal x = element.attribute(aX).toDouble();
qreal y = element.attribute(aY).toDouble();
- qreal width = element.attribute(aWidth).toDouble();
- qreal height = element.attribute(aHeight).toDouble();
- QUrl urlPath;
+ QUrl concreteUrl;
if (!itemRefPath.isNull()) {
QString videoPath = pwdContent + "/" + itemRefPath;
if (!QFile::exists(videoPath)) {
qDebug() << "can't load file" << pwdContent + "/" + itemRefPath << "maybe file corrupted";
return false;
}
- urlPath = QUrl::fromLocalFile(videoPath);
+ concreteUrl = QUrl::fromLocalFile(videoPath);
}
- UBGraphicsVideoItem *videoItem = mCurrentScene->addVideo(urlPath, false);
+ QUuid uuid = QUuid::createUuid();
+
+#ifdef Q_WS_X11
+ concreteUrl = QUrl::fromLocalFile(mCurrentScene->document()->persistencePath() + "/" + UBPersistenceManager::persistenceManager()
+ ->addVideoFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid));
+#else
+ concreteUrl = QUrl::fromLocalFile(UBPersistenceManager::persistenceManager()
+ ->addVideoFileToDocument(mCurrentScene->document(), concreteUrl.toLocalFile(), uuid));
+#endif
+
+ UBGraphicsVideoItem *videoItem = mCurrentScene->addVideo(concreteUrl, false);
QTransform transform;
QString textTransform = element.attribute(aTransform);
- bool hastransform = false;
+
+ videoItem->resetTransform();
if (!textTransform.isNull()) {
- transform = transformFromString(textTransform);
- hastransform = true;
+ transform = transformFromString(textTransform, videoItem);
}
- repositionSvgItem(videoItem, width, height, x - 5, y - 5, hastransform, transform);
+ repositionSvgItem(videoItem, videoItem->boundingRect().width(), videoItem->boundingRect().height(), x + transform.m31(), y + transform.m32(), transform);
hashSceneItem(element, videoItem);
return true;
@@ -847,16 +902,18 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseSvgElement(const QDomElement &p
return false;
}
- if (tagName == tRect && !parseSvgRect(parent)) return false;
- else if (tagName == tEllipse && !parseSvgEllipse(parent)) return false;
- else if (tagName == tPolygon && !parseSvgPolygon(parent)) return false;
- else if (tagName == tPolyline && !parseSvgPolyline(parent)) return false;
- else if (tagName == tText && !parseSvgText(parent)) return false;
- else if (tagName == tTextarea && !parseSvgTextarea(parent)) return false;
- else if (tagName == tImage && !parseSvgImage(parent)) return false;
- else if (tagName == tFlash && !parseSvgFlash(parent)) return false;
- else if (tagName == tAudio && !parseSvgAudio(parent)) return false;
- else if (tagName == tVideo && !parseSvgVideo(parent)) return false;
+ if (tagName == tG && !parseGSection(parent)) return false;
+ else if (tagName == tSwitch && !parseSvgSwitchSection(parent)) return false;
+ else if (tagName == tRect && !parseSvgRect(parent)) return false;
+ else if (tagName == tEllipse && !parseSvgEllipse(parent)) return false;
+ else if (tagName == tPolygon && !parseSvgPolygon(parent)) return false;
+ else if (tagName == tPolyline && !parseSvgPolyline(parent)) return false;
+ else if (tagName == tText && !parseSvgText(parent)) return false;
+ else if (tagName == tTextarea && !parseSvgTextarea(parent)) return false;
+ else if (tagName == tImage && !parseSvgImage(parent)) return false;
+ else if (tagName == tFlash && !parseSvgFlash(parent)) return false;
+ else if (tagName == tAudio && !parseSvgAudio(parent)) return false;
+ else if (tagName == tVideo && !parseSvgVideo(parent)) return false;
return true;
}
@@ -984,7 +1041,7 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::parseDoc()
void UBCFFSubsetAdaptor::UBCFFSubsetReader::repositionSvgItem(QGraphicsItem *item, qreal width, qreal height,
qreal x, qreal y,
- bool useTransform, QTransform &transform)
+ QTransform &transform)
{
//First using viebox coordinates, then translate them to scene coordinates
@@ -996,29 +1053,32 @@ void UBCFFSubsetAdaptor::UBCFFSubsetReader::repositionSvgItem(QGraphicsItem *ite
qreal fullScaleX = mVBTransFactor * xScale;
qreal fullScaleY = mVBTransFactor * yScale;
- if (useTransform) { //if rotation or translation specified
- QPointF oldVector((x - transform.dx()), (y - transform.dy()));
- QTransform rTransform(transform.m11(), transform.m12(), transform.m21(), transform.m22(), 0, 0);
- QPointF newVector = rTransform.map(oldVector);
-
- item->setTransform(rTransform.scale(fullScaleX, fullScaleY));
- item->setPos((x - mViewBoxCenter.x() + (newVector - oldVector).x()) * mVBTransFactor,
- (y - mViewBoxCenter.y() + (newVector - oldVector).y()) * mVBTransFactor);
- } else { //item is't rotated or translated
- item->setTransform(QTransform(fullScaleX, 0, 0, fullScaleY, 0, 0));
- itemBounds = item->boundingRect();
- item->setPos((int)((x - mViewBoxCenter.x()) * mVBTransFactor),
- (int)((y - mViewBoxCenter.y()) * mVBTransFactor));
- }
+ QPointF oldVector((x - transform.dx()), (y - transform.dy()));
+ QTransform rTransform;
+ QPointF newVector = rTransform.map(oldVector);
+
+ QRectF sr = mCurrentScene->sceneRect();
+ QRectF sr1 = mCurrentSceneRect;
+ QRectF sr2 = mCurrentScene->normalizedSceneRect();
+
+ QTransform tr = item->sceneTransform();
+ item->setTransform(rTransform.scale(fullScaleX, fullScaleY), true);
+ tr = item->sceneTransform();
+ QPoint pos ((int)((x + mShiftVector.x() + (newVector - oldVector).x()) * mVBTransFactor), (int)((y +mShiftVector.y() + (newVector - oldVector).y()) * mVBTransFactor));
+ item->setPos(pos);
}
bool UBCFFSubsetAdaptor::UBCFFSubsetReader::createNewScene()
{
mCurrentScene = UBPersistenceManager::persistenceManager()->createDocumentSceneAt(mProxy, mProxy->pageCount());
mCurrentScene->setURStackEnable(false);
- mCurrentSceneRect = mCurrentScene->normalizedSceneRect();
- mVBTransFactor = qMin(mCurrentSceneRect.width() / mViewPort.width(),
- mCurrentSceneRect.height() / mViewPort.height());
+ mCurrentScene->setSceneRect(mViewBox);
+ if ((mCurrentScene->sceneRect().topLeft().x() >= 0) || (mCurrentScene->sceneRect().topLeft().y() >= 0)) {
+ mShiftVector = -mViewBox.center();
+ }
+ mCurrentSceneRect = mViewBox;
+ mVBTransFactor = qMin(mCurrentScene->normalizedSceneRect().width() / mViewPort.width(),
+ mCurrentScene->normalizedSceneRect().height() / mViewPort.height());
return true;
}
@@ -1046,11 +1106,12 @@ bool UBCFFSubsetAdaptor::UBCFFSubsetReader::persistScenes()
qDebug() << "can't allocate scene, loading failed";
return false;
}
- UBSvgSubsetAdaptor::persistScene(mProxy, mCurrentScene, i);
- UBGraphicsScene *tmpScene = UBSvgSubsetAdaptor::loadScene(mProxy, i);
- tmpScene->setModified(true);
- UBThumbnailAdaptor::persistScene(mProxy->persistencePath(), tmpScene, i);
- delete tmpScene;
+
+ UBSvgSubsetAdaptor::persistScene(mProxy, mCurrentScene, i);
+ UBGraphicsScene *tmpScene = UBSvgSubsetAdaptor::loadScene(mProxy, i);
+ tmpScene->setModified(true);
+ UBThumbnailAdaptor::persistScene(mProxy->persistencePath(), tmpScene, i);
+ delete tmpScene;
mCurrentScene->setModified(false);
}
@@ -1085,45 +1146,63 @@ QColor UBCFFSubsetAdaptor::UBCFFSubsetReader::colorFromString(const QString& clr
return QColor(clrString);
}
-QTransform UBCFFSubsetAdaptor::UBCFFSubsetReader::transformFromString(const QString trString)
+QTransform UBCFFSubsetAdaptor::UBCFFSubsetReader::transformFromString(const QString trString, QGraphicsItem *item)
{
+ qreal dxr = 0.0;
+ qreal dyr = 0.0;
qreal dx = 0.0;
qreal dy = 0.0;
qreal angle = 0.0;
+ QTransform tr;
- //check pattern for strings like 'rotate(10)'
- QRegExp regexp("rotate\\( *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *\\)");
- if (regexp.exactMatch(trString)) {
- angle = regexp.capturedTexts().at(1).toDouble();
- } else {
+ foreach(QString trStr, trString.split(" ", QString::SkipEmptyParts))
+ {
+ //check pattern for strings like 'rotate(10)'
+ QRegExp regexp("rotate\\( *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *\\)");
+ if (regexp.exactMatch(trStr)) {
+ angle = regexp.capturedTexts().at(1).toDouble();
+ if (item)
+ {
+ item->setTransformOriginPoint(QPointF(0, 0));
+ item->rotate(angle);
+ }
+ continue;
+ };
+
//check pattern for strings like 'rotate(10,20,20)' or 'rotate(10.1,10.2,34.2)'
regexp.setPattern("rotate\\( *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *, *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *, *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *\\)");
- if (regexp.exactMatch(trString)) {
+ if (regexp.exactMatch(trStr)) {
angle = regexp.capturedTexts().at(1).toDouble();
- dx = regexp.capturedTexts().at(2).toDouble();
- dy = regexp.capturedTexts().at(3).toDouble();
+ dxr = regexp.capturedTexts().at(2).toDouble();
+ dyr = regexp.capturedTexts().at(3).toDouble();
+ if (item)
+ {
+ item->setTransformOriginPoint(QPointF(dxr, dyr)-item->pos());
+ item->rotate(angle);
+ }
+ continue;
}
- }
- //check pattern for strings like 'translate(11.0, 12.34)'
- regexp.setPattern("translate\\( *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *,*([-+]{0,1}[0-9]*\\.{0,1}[0-9]*)*\\)");
- if (regexp.exactMatch(trString)) {
- dx = regexp.capturedTexts().at(1).toDouble();
- dy = regexp.capturedTexts().at(2).toDouble();
- }
- return QTransform().translate(dx, dy).rotate(angle);
+ //check pattern for strings like 'translate(11.0, 12.34)'
+ regexp.setPattern("translate\\( *([-+]{0,1}[0-9]*\\.{0,1}[0-9]*) *,*([-+]{0,1}[0-9]*\\.{0,1}[0-9]*)*\\)");
+ if (regexp.exactMatch(trStr)) {
+ dx = regexp.capturedTexts().at(1).toDouble();
+ dy = regexp.capturedTexts().at(2).toDouble();
+ tr.translate(dx,dy);
+ continue;
+ }
+ }
+ return tr;
}
bool UBCFFSubsetAdaptor::UBCFFSubsetReader::getViewBoxDimenstions(const QString& viewBox)
{
- //check pattern for strings like 'rotate(10)'
- QRegExp regexp("([0-9]+) ([0-9]+) ([0-9]+) ([0-9]+)");
- if (regexp.exactMatch(viewBox))
+ QStringList capturedTexts = viewBox.split(" ", QString::SkipEmptyParts);
+ if (capturedTexts.count())
{
- int capturesCount = regexp.capturedTexts().count();
- if (capturesCount == 5 && regexp.capturedTexts().at(0).length() == viewBox.length())
+ if (4 == capturedTexts.count())
{
- mViewBox = QRectF(0, 0, regexp.capturedTexts().at(3).toDouble(), regexp.capturedTexts().at(4).toDouble());
+ mViewBox = QRectF(capturedTexts.at(0).toDouble(), capturedTexts.at(1).toDouble(), capturedTexts.at(2).toDouble(), capturedTexts.at(3).toDouble());
mViewPort = mViewBox;
mViewPort.translate(- mViewPort.center());
mViewBoxCenter.setX(mViewBox.width() / 2);
diff --git a/src/adaptors/UBCFFSubsetAdaptor.h b/src/adaptors/UBCFFSubsetAdaptor.h
index d4def19b..791c057d 100644
--- a/src/adaptors/UBCFFSubsetAdaptor.h
+++ b/src/adaptors/UBCFFSubsetAdaptor.h
@@ -65,6 +65,7 @@ private:
qreal mVBTransFactor;
QPointF mViewBoxCenter;
QSize mSize;
+ QPointF mShiftVector;
private:
QDomDocument mDOMdoc;
@@ -85,6 +86,8 @@ private:
bool parseIwbMeta(const QDomElement &element);
bool parseSvg(const QDomElement &svgSection);
+ inline bool parseGSection(const QDomElement &element);
+ inline bool parseSvgSwitchSection(const QDomElement &element);
inline bool parseSvgRect(const QDomElement &element);
inline bool parseSvgEllipse(const QDomElement &element);
inline bool parseSvgPolygon(const QDomElement &element);
@@ -123,9 +126,9 @@ private:
// helper methods
void repositionSvgItem(QGraphicsItem *item, qreal width, qreal height,
qreal x, qreal y,
- bool useTransform, QTransform &transform);
+ QTransform &transform);
QColor colorFromString(const QString& clrString);
- QTransform transformFromString(const QString trString);
+ QTransform transformFromString(const QString trString, QGraphicsItem *item = 0);
bool getViewBoxDimenstions(const QString& viewBox);
QSvgGenerator* createSvgGenerator(qreal width, qreal height);
bool getTempFileName();
diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index 86ade4c9..e300bb3a 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -369,7 +369,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
// introduced in UB 4.0
- QStringRef svgViewBox = mXmlReader.attributes().value(nsSvg, "viewBox");
+ QStringRef svgViewBox = mXmlReader.attributes().value("viewBox");
+
if (!svgViewBox.isNull())
{
diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp
index 4b4d3686..260734ad 100644
--- a/src/api/UBWidgetUniboardAPI.cpp
+++ b/src/api/UBWidgetUniboardAPI.cpp
@@ -534,7 +534,7 @@ void UBWidgetUniboardAPI::ProcessDropEvent(QDropEvent *event)
}
}
}
-
+ qDebug() << destFileName;
QString mimeText = createMimeText(downloaded, contentType, destFileName);
dropMimeData.setData(tMimeText, mimeText.toAscii());
@@ -623,7 +623,7 @@ QString UBWidgetUniboardAPI::createMimeText(bool downloaded, const QString &mime
}
QString relatedFileName = fileName;
- relatedFileName = relatedFileName.remove(mGraphicsWidget->getOwnFolder().toLocalFile());
+ relatedFileName = relatedFileName.remove(mGraphicsWidget->getOwnFolder().toLocalFile() + "/");
writer.writeTextElement(tPath, relatedFileName); //writing path to created object
}
diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp
index 3dd30148..0296345b 100644
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
@@ -50,6 +50,7 @@
#include "domain/UBGraphicsVideoItem.h"
#include "domain/UBGraphicsAudioItem.h"
#include "domain/UBGraphicsSvgItem.h"
+#include "domain/UBGraphicsStrokesGroup.h"
#include "document/UBDocumentProxy.h"
@@ -436,7 +437,6 @@ void UBBoardView::mousePressEvent (QMouseEvent *event)
|| movingItem->type() == UBGraphicsTriangle::Type
|| movingItem == this->scene()->backgroundObject()
|| movingItem->group())
-
{
movingItem = NULL;
QGraphicsView::mousePressEvent (event);
@@ -563,7 +563,8 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event)
|| item->type() == UBGraphicsPixmapItem::Type
|| item->type() == UBGraphicsVideoItem::Type
|| item->type() == UBGraphicsAudioItem::Type
- || item->type() == UBGraphicsSvgItem::Type) {
+ || item->type() == UBGraphicsSvgItem::Type
+ || item->type() == UBGraphicsStrokesGroup::Type) {
if (!mJustSelectedItems.contains(item)) {
item->setSelected(true);
diff --git a/src/board/UBDrawingController.cpp b/src/board/UBDrawingController.cpp
index 2390cded..e03ef408 100644
--- a/src/board/UBDrawingController.cpp
+++ b/src/board/UBDrawingController.cpp
@@ -45,7 +45,7 @@ UBDrawingController::UBDrawingController(QObject * parent)
, mActiveRuler(NULL)
, mStylusTool((UBStylusTool::Enum)-1)
, mLatestDrawingTool((UBStylusTool::Enum)-1)
- //, mDrawingMode(eDrawingMode_Vector)
+ , mDrawingMode(DRAWING_MODE)
{
connect(UBSettings::settings(), SIGNAL(colorContextChanged()), this, SIGNAL(colorPaletteChanged()));
@@ -106,10 +106,16 @@ void UBDrawingController::setStylusTool(int tool)
mStylusTool = (UBStylusTool::Enum)tool;
+ if(eDrawingMode_Vector == DRAWING_MODE){
+ mDrawingMode = eDrawingMode_Vector;
+ }
+
if (mStylusTool == UBStylusTool::Pen)
UBApplication::mainWindow->actionPen->setChecked(true);
- else if (mStylusTool == UBStylusTool::Eraser)
+ else if (mStylusTool == UBStylusTool::Eraser){
UBApplication::mainWindow->actionEraser->setChecked(true);
+ mDrawingMode = eDrawingMode_Artistic;
+ }
else if (mStylusTool == UBStylusTool::Marker)
UBApplication::mainWindow->actionMarker->setChecked(true);
else if (mStylusTool == UBStylusTool::Selector)
diff --git a/src/board/UBDrawingController.h b/src/board/UBDrawingController.h
index 302800dd..21d4f78d 100644
--- a/src/board/UBDrawingController.h
+++ b/src/board/UBDrawingController.h
@@ -27,6 +27,8 @@ typedef enum{
eDrawingMode_Vector
}eDrawingMode;
+#define DRAWING_MODE eDrawingMode_Artistic
+
class UBDrawingController : public QObject
{
Q_OBJECT;
diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp
index 30b3f4d8..5a87f0d8 100644
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
@@ -71,9 +71,15 @@ UBDocumentController::UBDocumentController(UBMainWindow* mainWindow)
{
setupViews();
setupToolbar();
+ this->selectDocument(UBApplication::boardController->activeDocument());
connect(this, SIGNAL(exportDone()), mMainWindow, SLOT(onExportDone()));
+ connect(mMainWindow->actionNewPage, SIGNAL(triggered()), this, SLOT(reloadThumbs()));
}
+void UBDocumentController::reloadThumbs()
+{
+ mDocumentThumbs = UBThumbnailAdaptor::load(selectedDocumentProxy());
+}
UBDocumentController::~UBDocumentController()
{
diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h
index 76a8d42e..ac3f4ab3 100644
--- a/src/document/UBDocumentController.h
+++ b/src/document/UBDocumentController.h
@@ -75,6 +75,7 @@ class UBDocumentController : public QObject
void copy();
void paste();
void focusChanged(QWidget *old, QWidget *current);
+ void reloadThumbs();
protected:
virtual void setupViews();
diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp
index c081d40e..8a7494ec 100644
--- a/src/domain/UBGraphicsItemDelegate.cpp
+++ b/src/domain/UBGraphicsItemDelegate.cpp
@@ -236,27 +236,27 @@ void UBGraphicsItemDelegate::setMimeData(QMimeData *mimeData)
bool UBGraphicsItemDelegate::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
{
- if(NULL != mMimeData)
- {
- QDrag* mDrag = new QDrag(event->widget());
- mDrag->setMimeData(mMimeData);
- if (!mDragPixmap.isNull()) {
- mDrag->setPixmap(mDragPixmap);
- mDrag->setHotSpot(mDragPixmap.rect().center());
- }
- mDrag->exec();
- mDragPixmap = QPixmap();
+ if((NULL != mMimeData) && ((event->pos() - mDragStartPosition).manhattanLength() < QApplication::startDragDistance()))
+ {
+ QDrag* mDrag = new QDrag(event->widget());
+ mDrag->setMimeData(mMimeData);
+ if (!mDragPixmap.isNull()) {
+ mDrag->setPixmap(mDragPixmap);
+ mDrag->setHotSpot(mDragPixmap.rect().center());
+ }
+ mDrag->exec();
+ mDragPixmap = QPixmap();
- return true;
- }
+ return true;
+ }
if(isLocked())
{
event->accept();
return true;
}
- else
- return false;
+
+ return true;
}
bool UBGraphicsItemDelegate::weelEvent(QGraphicsSceneWheelEvent *event)
@@ -699,4 +699,4 @@ void UBGraphicsToolBarItem::paint(QPainter *painter, const QStyleOptionGraphicsI
path.addRoundedRect(rect(), 10, 10);
painter->fillPath(path, brush());
-}
\ No newline at end of file
+}
diff --git a/src/domain/UBGraphicsPolygonItem.cpp b/src/domain/UBGraphicsPolygonItem.cpp
index f05dd1e9..9c6dee10 100644
--- a/src/domain/UBGraphicsPolygonItem.cpp
+++ b/src/domain/UBGraphicsPolygonItem.cpp
@@ -39,6 +39,7 @@ UBGraphicsPolygonItem::UBGraphicsPolygonItem (const QPolygonF & polygon, QGraphi
, mOriginalWidth(-1)
, mIsNominalLine(false)
, mStroke(0)
+ , mpGroup(NULL)
{
// NOOP
initialize();
@@ -77,6 +78,10 @@ UBGraphicsPolygonItem::~UBGraphicsPolygonItem()
clearStroke();
}
+void UBGraphicsPolygonItem::setStrokesGroup(UBGraphicsStrokesGroup *group)
+{
+ mpGroup = group;
+}
void UBGraphicsPolygonItem::setStroke(UBGraphicsStroke* stroke)
{
@@ -156,7 +161,7 @@ UBGraphicsPolygonItem* UBGraphicsPolygonItem::deepCopy(const QPolygonF& pol) con
copy->mIsNominalLine = false;
copy->setStroke(this->stroke());
- copy->setGroup(this->group());
+ copy->setStrokesGroup(this->strokesGroup());
copy->setBrush(this->brush());
copy->setPen(this->pen());
copy->mHasAlpha = this->mHasAlpha;
diff --git a/src/domain/UBGraphicsPolygonItem.h b/src/domain/UBGraphicsPolygonItem.h
index 2934b66b..851092b2 100644
--- a/src/domain/UBGraphicsPolygonItem.h
+++ b/src/domain/UBGraphicsPolygonItem.h
@@ -19,6 +19,7 @@
#include "core/UB.h"
#include "UBItem.h"
+#include "UBGraphicsStrokesGroup.h"
class UBItem;
class UBGraphicsScene;
@@ -37,6 +38,8 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem
void initialize();
+ void setStrokesGroup(UBGraphicsStrokesGroup* group);
+ UBGraphicsStrokesGroup* strokesGroup() const{return mpGroup;}
void setColor(const QColor& color);
QColor color() const;
@@ -132,6 +135,7 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem
QColor mColorOnLightBackground;
UBGraphicsStroke* mStroke;
+ UBGraphicsStrokesGroup* mpGroup;
};
diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp
index 1494ce85..f6f10436 100644
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
@@ -567,7 +567,7 @@ bool UBGraphicsScene::inputDeviceRelease()
}
}else if (mCurrentStroke)
{
- if(eDrawingMode_Vector == dc->drawingMode()){
+ if(eDrawingMode_Vector == DRAWING_MODE){
UBGraphicsStrokesGroup* pStrokes = new UBGraphicsStrokesGroup();
// Remove the strokes that were just drawn here and replace them by a stroke item
@@ -575,6 +575,7 @@ bool UBGraphicsScene::inputDeviceRelease()
mPreviousPolygonItems.removeAll(poly);
removeItem(poly);
UBCoreGraphicsScene::removeItemFromDeletion(poly);
+ poly->setStrokesGroup(pStrokes);
pStrokes->addToGroup(poly);
}
@@ -756,114 +757,169 @@ void UBGraphicsScene::eraseLineTo(const QPointF &pEndPoint, const qreal &pWidth)
eraserPathVar.addPolygon(eraserPolygon);
const QPainterPath eraserPath = eraserPathVar;
+ // Get all the items that are intersecting with the eraser path
QList collidItems = items(eraserBoundingRect, Qt::IntersectsItemBoundingRect);
- QSet toBeAddedItems;
- QSet toBeRemovedItems;
-
- int collidItemsSize = collidItems.size();
+ if(eDrawingMode_Vector == UBDrawingController::drawingController()->drawingMode()){
+ // NOTE: I decided to reuse the 'artistic' eraser all the time in order to have a better eraser
+ // For this reason, the following code is not used but we will keep it for now, in case of
+ // futur requirements.
+ foreach(QGraphicsItem* poly, collidItems){
+ UBGraphicsStrokesGroup* pGroup = dynamic_cast(poly);
+ if(NULL != pGroup){
+ // TODO: Ungroup the item, put back the polygons on the scene, deal with the
+ // eraser's bounding rect, remove the polygons that must be removed
+ // then create new groups.
+
+ // Get all substrokes and verify if they are part of the eraserpath then deal with it
+ foreach(QGraphicsItem* item, poly->childItems()){
+ UBGraphicsPolygonItem* polygon = dynamic_cast(item);
+ if(NULL != polygon){
+ if(eraserBoundingRect.intersects(polygon->boundingRect())){
+ pGroup->removeFromGroup(polygon);
+ removeItem(polygon);
+ }
+ }
+ }
+ }
+ }
- toBeAddedItems.reserve(collidItemsSize);
- toBeRemovedItems.reserve(collidItemsSize);
+ }else{
+ QSet toBeAddedItems;
+ QSet toBeRemovedItems;
+ int collidItemsSize = collidItems.size();
+ toBeAddedItems.reserve(collidItemsSize);
+ toBeRemovedItems.reserve(collidItemsSize);
- if (mShouldUseOMP)
- {
-#pragma omp parallel for
- for (int i = 0; i < collidItemsSize; i++)
+ if (mShouldUseOMP)
{
- UBGraphicsPolygonItem *collidingPolygonItem
- = qgraphicsitem_cast (collidItems.at(i));
-
- if (collidingPolygonItem)
+ #pragma omp parallel for
+ for (int i = 0; i < collidItemsSize; i++)
{
- if(eraserInnerRect.contains(collidingPolygonItem->boundingRect()))
- {
-#pragma omp critical
- toBeRemovedItems << collidingPolygonItem;
- }
- else
- {
- QPolygonF collidingPolygon = collidingPolygonItem->polygon();
- QPainterPath collidingPath;
- collidingPath.addPolygon(collidingPolygon);
+ UBGraphicsPolygonItem *collidingPolygonItem = dynamic_cast(collidItems.at(i));
- QPainterPath croppedPath = collidingPath.subtracted(eraserPath);
- QPainterPath croppedPathSimplified = croppedPath.simplified();
+ if (NULL != collidingPolygonItem)
+ {
+ UBGraphicsStrokesGroup* pGroup = collidingPolygonItem->strokesGroup();
- if (croppedPath == collidingPath)
+ if(eraserInnerRect.contains(collidingPolygonItem->boundingRect()))
{
- // NOOP
- }
- else if (croppedPathSimplified.isEmpty())
- {
-#pragma omp critical
+ #pragma omp critical
+ // Put the entire polygon into the remove list
toBeRemovedItems << collidingPolygonItem;
}
else
{
- foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons())
+ // Here we get the polygon of the colliding item
+ QPolygonF collidingPolygon = collidingPolygonItem->polygon();
+ QPainterPath collidingPath;
+ collidingPath.addPolygon(collidingPolygon);
+
+ // Then we substract the eraser path to the polygon and we simplify it
+ QPainterPath croppedPath = collidingPath.subtracted(eraserPath);
+ QPainterPath croppedPathSimplified = croppedPath.simplified();
+
+ if (croppedPath == collidingPath)
{
- UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
-#pragma omp critical
- toBeAddedItems << croppedPolygonItem;
+ // NOOP
+ }
+ else if (croppedPathSimplified.isEmpty())
+ {
+ #pragma omp critical
+ // Put the entire polygon into the remove list if the eraser removes all its visible content
+ toBeRemovedItems << collidingPolygonItem;
+ }
+ else
+ {
+ // Then we convert the remaining path to a list of polygons that will be converted in
+ // UBGraphicsPolygonItems and added to the scene
+ foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons())
+ {
+ UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
+ #pragma omp critical
+ // Add this new polygon to the 'added' list
+ toBeAddedItems << croppedPolygonItem;
+ if(NULL != pGroup){
+ croppedPolygonItem->setStrokesGroup(pGroup);
+ }
+ }
+ #pragma omp critical
+ // Remove the original polygonitem because it has been replaced by many smaller polygons
+ toBeRemovedItems << collidingPolygonItem;
}
-#pragma omp critical
- toBeRemovedItems << collidingPolygonItem;
}
}
}
}
- }
- else
- {
- for (int i = 0; i < collidItemsSize; i++)
+ else
{
- UBGraphicsPolygonItem *collidingPolygonItem
- = qgraphicsitem_cast (collidItems.at(i));
-
- if (collidingPolygonItem)
+ for (int i = 0; i < collidItemsSize; i++)
{
- if(eraserInnerRect.contains(collidingPolygonItem->boundingRect()))
- {
- toBeRemovedItems << collidingPolygonItem;
- }
- else
- {
- QPolygonF collidingPolygon = collidingPolygonItem->polygon();
- QPainterPath collidingPath;
- collidingPath.addPolygon(collidingPolygon);
+ UBGraphicsPolygonItem *collidingPolygonItem
+ = qgraphicsitem_cast (collidItems.at(i));
- QPainterPath croppedPath = collidingPath.subtracted(eraserPath);
- QPainterPath croppedPathSimplified = croppedPath.simplified();
-
- if (croppedPath == collidingPath)
- {
- // NOOP
- }
- else if (croppedPathSimplified.isEmpty())
+ if (collidingPolygonItem)
+ {
+ if(eraserInnerRect.contains(collidingPolygonItem->boundingRect()))
{
toBeRemovedItems << collidingPolygonItem;
}
else
{
- foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons())
+ QPolygonF collidingPolygon = collidingPolygonItem->polygon();
+ QPainterPath collidingPath;
+ collidingPath.addPolygon(collidingPolygon);
+
+ QPainterPath croppedPath = collidingPath.subtracted(eraserPath);
+ QPainterPath croppedPathSimplified = croppedPath.simplified();
+
+ if (croppedPath == collidingPath)
{
- UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
- toBeAddedItems << croppedPolygonItem;
+ // NOOP
}
+ else if (croppedPathSimplified.isEmpty())
+ {
+ toBeRemovedItems << collidingPolygonItem;
+ }
+ else
+ {
+ foreach(const QPolygonF &pol, croppedPathSimplified.toFillPolygons())
+ {
+ UBGraphicsPolygonItem* croppedPolygonItem = collidingPolygonItem->deepCopy(pol);
+ toBeAddedItems << croppedPolygonItem;
+ }
- toBeRemovedItems << collidingPolygonItem;
+ toBeRemovedItems << collidingPolygonItem;
+ }
}
}
}
}
- }
- addItems(toBeAddedItems);
- mAddedItems += toBeAddedItems;
+ addItems(toBeAddedItems);
+ mAddedItems += toBeAddedItems;
- removeItems(toBeRemovedItems);
- mRemovedItems += toBeRemovedItems;
+ if(eDrawingMode_Vector == DRAWING_MODE){
+ foreach(QGraphicsItem* item, toBeAddedItems){
+ UBGraphicsPolygonItem* poly = dynamic_cast(item);
+ if(NULL != poly && NULL != poly->strokesGroup()){
+ poly->strokesGroup()->addToGroup(poly);
+ }
+ }
+ }
+
+ removeItems(toBeRemovedItems);
+ mRemovedItems += toBeRemovedItems;
+
+ if(eDrawingMode_Vector == DRAWING_MODE){
+ foreach(QGraphicsItem* item, toBeRemovedItems){
+ UBGraphicsPolygonItem* poly = dynamic_cast(item);
+ if(NULL != poly && NULL != poly->strokesGroup()){
+ poly->strokesGroup()->removeFromGroup(poly);
+ }
+ }
+ }
+ }
mPreviousPoint = pEndPoint;
}
diff --git a/src/domain/UBGraphicsStrokesGroup.h b/src/domain/UBGraphicsStrokesGroup.h
index 7eecd900..0d117c3a 100644
--- a/src/domain/UBGraphicsStrokesGroup.h
+++ b/src/domain/UBGraphicsStrokesGroup.h
@@ -16,6 +16,11 @@ public:
virtual UBItem* deepCopy() const;
virtual void remove();
virtual UBGraphicsItemDelegate* Delegate() const {return mDelegate;}
+ enum { Type = UBGraphicsItemType::StrokeItemType };
+ virtual int type() const
+ {
+ return Type;
+ }
protected:
virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
diff --git a/src/domain/UBGraphicsVideoItem.cpp b/src/domain/UBGraphicsVideoItem.cpp
index 9fa9d345..7ef73f8d 100644
--- a/src/domain/UBGraphicsVideoItem.cpp
+++ b/src/domain/UBGraphicsVideoItem.cpp
@@ -109,11 +109,6 @@ void UBGraphicsVideoItem::showOnDisplayChanged(bool shown)
void UBGraphicsVideoItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
-// QDrag* mDrag = new QDrag(event->widget());
-// QMimeData* pMime = new QMimeData();
-// mDrag->setMimeData(pMime);
-// mDrag->start();
-
mShouldMove = (event->buttons() & Qt::LeftButton);
mMousePressPos = event->scenePos();
mMouseMovePos = mMousePressPos;
diff --git a/src/frameworks/UBGeometryUtils.cpp b/src/frameworks/UBGeometryUtils.cpp
index 68c6f1b5..22bfda50 100644
--- a/src/frameworks/UBGeometryUtils.cpp
+++ b/src/frameworks/UBGeometryUtils.cpp
@@ -198,8 +198,9 @@ QRectF UBGeometryUtils::lineToInnerRect(const QLineF& pLine, const qreal& pWidth
qreal centerX = (pLine.x1() + pLine.x2()) / 2;
qreal centerY = (pLine.y1() + pLine.y2()) / 2;
+ // Please put a fucking comment here
qreal side = sqrt((pWidth * pWidth) / 2);
- qreal halfSide = side / 2;
+ qreal halfSide = side / 2;
return QRectF(centerX - halfSide, centerY - halfSide, side, side);
}