admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#35772 Enigszins fg_dwgscale ondersteunen

Browse Source 
svn path=/Website/trunk/; revision=33640
This commit is contained in:
Jos Groot Lipman
2017-05-01 13:59:38 +00:00
parent fa8cbebcd2
commit 63184630e0
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
APPL/CAD/cad_verify.asp
View File

@@ -10,7 +10,6 @@
Context:
Note:
*/
DOCTYPE_Disable = 1;
%>
<!-- #include file="../Shared/common.inc" -->
@@ -97,11 +96,11 @@ if (!fso.FileExists(fullnameDWF))
version = "";
version += "DWG ("+pSLNKEvent.viewminX.toFixed(accuracy)+", "+pSLNKEvent.viewminY.toFixed(accuracy) +")";
version += " - ("+pSLNKEvent.viewmaxX.toFixed(accuracy)+", "+pSLNKEvent.viewmaxY.toFixed(accuracy) + ")";
version += "<br>= " + (pSLNKEvent.viewmaxX-pSLNKEvent.viewminX).toFixed(accuracy)+"x"+
(pSLNKEvent.viewmaxY-pSLNKEvent.viewminY).toFixed(accuracy) + "mm";
version += "<br>= " + ((pSLNKEvent.viewmaxX-pSLNKEvent.viewminX) * 1000 /<%=S("fg_dwgscale")%>).toFixed(accuracy)+"x"+
((pSLNKEvent.viewmaxY-pSLNKEvent.viewminY) * 1000 /<%=S("fg_dwgscale")%>).toFixed(accuracy) + "mm";
version += "<br>= " + ((pSLNKEvent.viewmaxX-pSLNKEvent.viewminX)*
(pSLNKEvent.viewmaxY-pSLNKEvent.viewminY) / 1e6).toFixed(2) + "m<sup>2</sup>";
version += "<br>= " + ((pSLNKEvent.viewmaxX-pSLNKEvent.viewminX) / <%=S("fg_dwgscale")%> *
(pSLNKEvent.viewmaxY-pSLNKEvent.viewminY) / <%=S("fg_dwgscale")%>).toFixed(2) + "m<sup>2</sup>";
ext.html(version);
}
}
@@ -113,6 +112,9 @@ if (!fso.FileExists(fullnameDWF))
.lcont, .llabel { cursor: pointer;
white-space: nowrap; }
input#lcont,input#llabel { width: 180px; }
table#analyse td sup {
color:#888;
}
</style>
</head>
@@ -184,13 +186,13 @@ function analyze(contlayer, labellayer)
{
var c = y.ContourItem(i2);
var oLabel = c.Key;
var oOpp = c.Area;
var oOpp = c.Area / 1e6; // Vanuit de DLL krijg ik altijd mm2 lijkt het?
if (oLabel && oOpp)
{
result.Labels.push(oLabel);
result.Opp += oOpp/1e6;
result.Labels.push("{0}<sup>({1})</sup>".format(oLabel, oOpp.toFixed(1)));
result.Opp += oOpp;
}
//Response.Write((oLabel?oLabel.value:"Geen label gevonden") + ": " + oOpp.value);
//Response.Write((oLabel) + ": " + oOpp);
}
return result;

3
APPL/CAD/cad_verify_proc.asp
View File

@@ -25,6 +25,7 @@ function myContourProcessor(cHandle)
for (var i2=0; i2 < cHandle.ContourCount; i2++)
{
var c = cHandle.ContourItem(i2);
c.lineweight = S("fg_contourWeight") * S("fg_dwgscale") / 1000;
if (c.Key)
{
c.Label = "[u][i]" + c.Key;
@@ -42,7 +43,7 @@ function myContourProcessor(cHandle)
}
// cHandle.SetLabel("", "[u][i]"); // initieel originele ruimtenummer onderstreept
cHandle.SetLabelFont("Arial", 600);
cHandle.SetLabelFont("Arial", S("fg_inLabelSize") * S("fg_dwgscale") / 1000);
ll = getQParamArray("layers", [".*"]);
for (l in ll)