X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Gnumeric.js;h=2574bd27b3cc8cf6ca5b3f0343ff55b2011941d1;hp=e54d6573323203a3f05ed4d9d064651d79dfebb3;hb=refs%2Fheads%2Fwip_alan_T5884_add_photo_to_report;hpb=98a429ee531c027f8ab17acdc994ef8bb18b9785 diff --git a/Pman.Gnumeric.js b/Pman.Gnumeric.js index e54d6573..2574bd27 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,90 @@ 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; + + var godoc = this.doc.getElementsByTagNameNS('*','GODoc')[0]; + + if(godoc && godoc.parentNode) { + godoc.parentNode.removeChild(godoc); + } + + return true; + }, /** * writeImage: @@ -1137,8 +1218,6 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { * @param {Number} width image height * */ - - writeImage : function (row, col, data, width, height, type) { @@ -1199,7 +1278,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'); @@ -1229,13 +1308,30 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { 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> }, - writeFixedImage : function (startCol, startRow, endCol, endRow, type, data, width, height) + /** + * 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"; @@ -1252,25 +1348,70 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { var soi = this.doc.createElementNS('http://www.gnumeric.org/v10.dtd', 'gnm:SheetObjectImage'); soi.setAttribute('ObjectBound',this.RCtoCell(startRow, startCol) + ':' + this.RCtoCell(endRow, endCol)); - - var ww = 0.01; // offset a bit... - var hh = 0.01; // - var ww2 = 1 - ((colwidth - width) / this.colInfo[endcol]); - var hh2 = 0.99; + 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 offset_str = ww + ' ' + hh + ' ' + ww2 + ' '+hh2; - //console.log(offset_str ); - //alert(offset_str); - soi.setAttribute('ObjectOffset', offset_str); + 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; + + var godoc = this.doc.getElementsByTagNameNS('*','GODoc')[0]; + + if(godoc && godoc.parentNode) { + godoc.parentNode.removeChild(godoc); + } + + 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'); - // ...... < / Content> - + var name = 'Image' + Math.random().toString(36).substring(2); var content = this.doc.createElement('Content'); content.setAttribute('image-type', type ? type : 'jpeg'); @@ -1290,10 +1431,20 @@ Roo.extend(Pman.Gnumeric, Roo.util.Observable, { 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; - //< /gnm:SheetObjectImage> - // < /gnm:Objects> - }, /** @@ -1414,7 +1565,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); @@ -1484,6 +1635,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;' +