X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Gnumeric.js;h=e86566ee810d8f7d83bed6ffaa8c6aacc477789f;hp=5c62da90973b3b4ad1974bbda853d7cb4798849d;hb=2667e5de2255d3c16b10f3d5a9d8af0718ab8e79;hpb=74034fd8b0afc5fe5290420a7ca13b3e7d435a66
diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js
index 5c62da90..e86566ee 100644
--- a/Pman.Gnumeric.js
+++ b/Pman.Gnumeric.js
@@ -327,7 +327,6 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
}
}
-
});
// read colinfo..
var ci = this.sheet.getElementsByTagNameNS('*','ColInfo');
@@ -834,14 +833,13 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
this.setRowHeight( row + yoff +1, Roo.get(rows[row]).getHeight());
}
-
var cols = rows[row].getElementsByTagName('td');
-
for(var col=0;col < cols.length; col++) {
-
-
+ if (cols[col].getAttribute('xls:width')) {
+ this.setColumnWidth(col, 1 * cols[col].getAttribute('xls:width'));
+ }
var colspan = cols[col].getAttribute('colspan');
colspan = colspan ? colspan *1 : 1;
@@ -1123,7 +1121,87 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
},
-
+ /**
+ * writeImageOld:
+ * write an image in old gnumberic format (needs base64 data to write it)
+ *
+ *
+ * @param {Number} row row to put it in (rows start at 0)
+ * @param {Number} col column to put it in
+ * @param {Number} data the base64 description of the images
+ * @param {Number} width image width
+ * @param {Number} width image height
+ *
+ */
+ writeImageOld : function (row, col, data, width, height, type, size)
+ {
+
+ if (!data) {
+ throw "write Image called with missing data";
+ }
+
+ row*=1;
+ col*=1;
+ height*=1;
+ width*=1;
+ var objs = this.sheet.getElementsByTagNameNS('*','Objects')[0];
+ var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage');
+
+ var colwidth = 0;
+ var endcol=col;
+ for ( endcol=col;endcol <100; endcol++) {
+ if (!this.colInfo[endcol]) {
+ this.colInfo[endcol] = 100; // eak fudge
+ }
+ colwidth += this.colInfo[endcol];
+ if (colwidth > width) {
+ break;
+ }
+ }
+
+ soi.setAttribute('ObjectBound', this.RCtoCell(row,col) + ':' + this.RCtoCell(row,endcol));
+
+ var ww = 0.01; // offset a bit...
+ var hh = 0.01; //
+
+ var ww2 = 1 - ((colwidth - width) / this.colInfo[endcol]);
+ var hh2 = 0.99;
+
+ var offset_str = ww + ' ' + hh + ' ' + ww2 + ' '+hh2;
+
+ //alert(offset_str);
+ soi.setAttribute('ObjectOffset', offset_str);
+ soi.setAttribute('ObjectAnchorType','16 16 16 16');
+ soi.setAttribute('Direction','17');
+ soi.setAttribute('crop-top','0.000000');
+ soi.setAttribute('crop-bottom','0.000000');
+ soi.setAttribute('crop-left','0.000000');
+ soi.setAttribute('crop-right','0.000000');
+
+ var content = this.doc.createElement('Content');
+ content.setAttribute('image-type', type ? type : 'jpeg');
+ content.setAttribute('size-bytes', size);
+ soi.appendChild(content);
+ objs.appendChild(soi);
+
+ if (typeof(this.grid[row]) == 'undefined') {
+ this.grid[row] = [];
+ }
+ if (typeof(this.grid[row][col]) == 'undefined') {
+ this.createCell(row,col);
+ }
+
+ this.grid[row][col].value= data;
+ this.grid[row][col].valueFormat = 'image';
+ this.grid[row][col].imageType = type;
+ this.grid[row][col].width = width;
+ this.grid[row][col].height = height;
+
+ return true;
+ //< /gnm:SheetObjectImage>
+ // < /gnm:Objects>
+
+ },
/**
* writeImage:
@@ -1137,8 +1215,6 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
* @param {Number} width image height
*
*/
-
-
writeImage : function (row, col, data, width, height, type)
{
@@ -1199,7 +1275,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
var hh2 = 0.99;
var offset_str = ww + ' ' + hh + ' ' + ww2 + ' '+hh2;
- //console.log(offset_str );
+
//alert(offset_str);
soi.setAttribute('ObjectOffset', offset_str);
soi.setAttribute('ObjectAnchorType','16 16 16 16');
@@ -1213,18 +1289,154 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
var name = 'Image' + Math.random().toString(36).substring(2);
var content = this.doc.createElement('Content');
content.setAttribute('image-type', type ? type : 'jpeg');
-
- content.setAttribute('name', );
-
- content.setAttribute('size-bytes',data.length);
- content.textContent = data;
+ content.setAttribute('name', name);
soi.appendChild(content);
objs.appendChild(soi);
+
+ var godoc = this.doc.getElementsByTagNameNS('*','GODoc')[0];
+
+ var goimage = this.doc.createElement('GOImage');
+ goimage.setAttribute('image-type', type ? type : 'jpeg');
+ goimage.setAttribute('name', name);
+ goimage.setAttribute('type', 'GOPixbuf');
+ goimage.setAttribute('width', width);
+ goimage.setAttribute('height', height);
+ goimage.textContent = data;
+
+ godoc.appendChild(goimage);
+
+ if (typeof(this.grid[row]) == 'undefined') {
+ this.grid[row] = [];
+ }
+ if (typeof(this.grid[row][col]) == 'undefined') {
+ this.createCell(row,col);
+ }
+
+ this.grid[row][col].value= data;
+ this.grid[row][col].valueFormat = 'image';
+ this.grid[row][col].imageType = type;
+ this.grid[row][col].width = width;
+ this.grid[row][col].height = height;
+
return true;
//< /gnm:SheetObjectImage>
// < /gnm:Objects>
},
+
+ /**
+ * writeFixedImageOld:
+ * write an image in old gnumberic format (needs base64 data to write it)
+ */
+ writeFixedImageOld : function (startCol, startRow, endCol, endRow, type, data, width, height, size)
+ {
+ if (!data) {
+ throw "write Image called with missing data";
+ }
+
+ startCol = startCol * 1;
+ startRow = startRow * 1;
+ endCol = endCol * 1;
+ endRow = endRow * 1;
+ width = width * 1;
+ height = height * 1;
+
+ var objs = this.sheet.getElementsByTagNameNS('*','Objects')[0];
+ var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage');
+
+ soi.setAttribute('ObjectBound',this.RCtoCell(startRow, startCol) + ':' + this.RCtoCell(endRow, endCol));
+
+ soi.setAttribute('ObjectOffset', '0 0 0 0');
+ soi.setAttribute('ObjectAnchorType','16 16 16 16');
+ soi.setAttribute('Direction','17');
+ soi.setAttribute('crop-top','0.000000');
+ soi.setAttribute('crop-bottom','0.000000');
+ soi.setAttribute('crop-left','0.000000');
+ soi.setAttribute('crop-right','0.000000');
+
+ var content = this.doc.createElement('Content');
+ content.setAttribute('image-type', type ? type : 'jpeg');
+ content.setAttribute('size-bytes', size);
+ content.textContent = data;
+ soi.appendChild(content);
+ objs.appendChild(soi);
+
+ if (typeof(this.grid[startRow]) == 'undefined') {
+ this.grid[startRow] = [];
+ }
+ if (typeof(this.grid[startRow][startCol]) == 'undefined') {
+ this.createCell(startRow,startCol);
+ }
+
+ this.grid[startRow][startCol].value= data;
+ this.grid[startRow][startCol].valueFormat = 'image';
+ this.grid[startRow][startCol].imageType = type;
+ this.grid[startRow][startCol].width = width;
+ this.grid[startRow][startCol].height = height;
+
+ return true;
+ },
+
+ writeFixedImage : function (startCol, startRow, endCol, endRow, type, data, width, height)
+ {
+ if (!data) {
+ throw "write Image called with missing data";
+ }
+
+ startCol = startCol * 1;
+ startRow = startRow * 1;
+ endCol = endCol * 1;
+ endRow = endRow * 1;
+ width = width * 1;
+ height = height * 1;
+
+ var objs = this.sheet.getElementsByTagNameNS('*','Objects')[0];
+ var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage');
+
+ soi.setAttribute('ObjectBound',this.RCtoCell(startRow, startCol) + ':' + this.RCtoCell(endRow, endCol));
+
+ soi.setAttribute('ObjectOffset', '0 0 0 0');
+ soi.setAttribute('ObjectAnchorType','16 16 16 16');
+ soi.setAttribute('Direction','17');
+ soi.setAttribute('crop-top','0.000000');
+ soi.setAttribute('crop-bottom','0.000000');
+ soi.setAttribute('crop-left','0.000000');
+ soi.setAttribute('crop-right','0.000000');
+
+ var name = 'Image' + Math.random().toString(36).substring(2);
+ var content = this.doc.createElement('Content');
+ content.setAttribute('image-type', type ? type : 'jpeg');
+ content.setAttribute('name', name);
+ soi.appendChild(content);
+ objs.appendChild(soi);
+
+ var godoc = this.doc.getElementsByTagNameNS('*','GODoc')[0];
+
+ var goimage = this.doc.createElement('GOImage');
+ goimage.setAttribute('image-type', type ? type : 'jpeg');
+ goimage.setAttribute('name', name);
+ goimage.setAttribute('type', 'GOPixbuf');
+ goimage.setAttribute('width', width);
+ goimage.setAttribute('height', height);
+ goimage.textContent = data;
+
+ godoc.appendChild(goimage);
+
+ if (typeof(this.grid[startRow]) == 'undefined') {
+ this.grid[startRow] = [];
+ }
+ if (typeof(this.grid[startRow][startCol]) == 'undefined') {
+ this.createCell(startRow,startCol);
+ }
+
+ this.grid[startRow][startCol].value= data;
+ this.grid[startRow][startCol].valueFormat = 'image';
+ this.grid[startRow][startCol].imageType = type;
+ this.grid[startRow][startCol].width = width;
+ this.grid[startRow][startCol].height = height;
+
+ return true;
+ },
/**
* mergeRegion:
@@ -1344,7 +1556,7 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
column = column *1;
width= width*1;
if (typeof(this.colInfoDom[column]) == 'undefined') {
- var cols = this.doc.getElementsByTagNameNS('*','Cols')[0];
+ var cols = this.sheet.getElementsByTagNameNS('*','Cols')[0];
var ri = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:ColInfo');
ri.setAttribute('No', column);
ri.setAttribute('Unit', width);
@@ -1414,6 +1626,23 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, {
}
+ if(g.valueFormat == 'image') {
+
+ out+=String.format(' | ',
+ g.colspan, g.rowspan, g.cls.join(' '),
+ 'overflow:hidden;' +
+ 'width:'+g.width+'px;' +
+
+ 'text-overflow:ellipsis;' +
+ 'white-space:nowrap;',
+ g.imageType,
+ value, g.width, g.height
+
+ );
+ c+=(g.colspan-1);
+ continue;
+ }
+
out+=String.format('{2} | ',
g.colspan, g.rowspan, value,
'overflow:hidden;' +