From 4a2d762e1e33404d77eeec4542a4a10bfa738dd2 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Mon, 5 Sep 2016 14:06:50 +0300 Subject: [PATCH] Sync git svn branch with SVN repository r33166. refs #6475 --- .../util/TransferableGraphRequest2.java | 4 ++ .../org.simantics.diagram.ontology/graph.tg | Bin 56254 -> 56366 bytes .../graph/DiagramScenegraph.pgraph | 4 +- .../scl/Document/All.scl | 2 + .../simantics/document/server/Functions.java | 7 ++ ...simantics-wiki-documents-default-model.css | 67 +++++++++++++----- .../simantics-wiki-documents.css | 19 +++-- .../org/simantics/document/Exportable.java | 5 +- bundles/org.simantics.g2d.ontology/graph.tg | Bin 18663 -> 18788 bytes .../graph/G2D.pgraph | 1 + .../org.simantics.modeling.ontology/graph.tg | Bin 81549 -> 81549 bytes .../graph/Modeling.pgraph | 2 +- 12 files changed, 77 insertions(+), 34 deletions(-) diff --git a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java index 446786171..6678e71c6 100644 --- a/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java +++ b/bundles/org.simantics.db.layer0/src/org/simantics/db/layer0/util/TransferableGraphRequest2.java @@ -60,6 +60,10 @@ import org.simantics.graph.representation.Value; import org.simantics.layer0.Layer0; import org.simantics.utils.datastructures.Pair; +/** + * @deprecated in favor of {@link ModelTransferableGraphSourceRequest} + */ +@Deprecated public class TransferableGraphRequest2 implements Read { public static String LOG_FILE = "transferableGraph.log"; diff --git a/bundles/org.simantics.diagram.ontology/graph.tg b/bundles/org.simantics.diagram.ontology/graph.tg index 543a0a3e3fdef857a646da16cfbd547742a35a5d..ab1473989a6c62d35bca5b833272126c1d841a7e 100644 GIT binary patch literal 56366 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
  • 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 literal 56254 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 A)&Kwi diff --git a/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph b/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph index 0a7cc33ff..364b539fa 100644 --- a/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph +++ b/bundles/org.simantics.diagram.ontology/graph/DiagramScenegraph.pgraph @@ -12,6 +12,7 @@ DIA.Scenegraph.Node -- DIA.Scenegraph.Composite.transform --> G2D.Transform "Vector Double" DIA.Scenegraph.Component -- DIA.Scenegraph.AbstractText.color --> DATATYPES.RGB.Integer -- DIA.Scenegraph.AbstractText.font --> DATATYPES.Font -- DIA.Scenegraph.AbstractText.transform --> G2D.Transform "DoubleArray" + ==> "Vector Double" >-- DIA.Scenegraph.AbstractText.borderWidth --> L0.Value "Float" >-- DIA.Scenegraph.AbstractText.borderColor --> DATATYPES.RGB.Integer -- DIA.Scenegraph.SVGImage.document --> L0.Value "String" >-- DIA.Scenegraph.SVGImage.transform --> G2D.Transform "Vector Double" @L0.assert DIA.Scenegraph.SVGImage.transform [1,0,0,1,0,0] : G2D.Transform \ No newline at end of file diff --git a/bundles/org.simantics.document.server/scl/Document/All.scl b/bundles/org.simantics.document.server/scl/Document/All.scl index 53124fb46..3d63eaf6a 100644 --- a/bundles/org.simantics.document.server/scl/Document/All.scl +++ b/bundles/org.simantics.document.server/scl/Document/All.scl @@ -115,6 +115,8 @@ importJava "org.simantics.document.server.Functions" where @JavaName getPropertyValueCached propertyValueCached_ :: Variable -> String -> Binding a -> a + stateVariable :: Variable -> Variable + propertyValueCached :: Serializable a => Typeable a => Variable -> String -> a propertyValueCached var prop = propertyValueCached_ var prop binding diff --git a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java index 2fd422f5e..2ba85b733 100644 --- a/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java +++ b/bundles/org.simantics.document.server/src/org/simantics/document/server/Functions.java @@ -185,6 +185,13 @@ public class Functions { return Variables.getVariable(graph, uri); } + public static Variable stateVariable(ReadGraph graph, Variable self) throws DatabaseException { + Variable session = graph.syncRequest(new ProxySessionRequest(self)); + if (session == null) + throw new DatabaseException("No state for " + self.getURI(graph)); + return session.getPossibleChild(graph, "__scl__"); + } + @SCLValue(type = "ReadGraph -> Resource -> Variable -> Variable") public static Variable state(ReadGraph graph, Resource converter, Variable context) throws DatabaseException { Variable session = graph.syncRequest(new ProxySessionRequest(context)); diff --git a/bundles/org.simantics.document/simantics-wiki-documents-default-model.css b/bundles/org.simantics.document/simantics-wiki-documents-default-model.css index 6fa388dae..47b66055e 100644 --- a/bundles/org.simantics.document/simantics-wiki-documents-default-model.css +++ b/bundles/org.simantics.document/simantics-wiki-documents-default-model.css @@ -15,7 +15,7 @@ div.description { font-family: "Times New Roman"; font-size: 1.5em; color: black; - margin-left: 10px; + margin-left: 0px; margin-bottom: 10px; margin-right: 0px; margin-top: 0px; @@ -27,7 +27,7 @@ p { font-size: 1.0em; color: black; margin-top: 10px; - margin-bottom: 10px; + margin-bottom: 15px; } /* Level 1 header */ @@ -35,17 +35,17 @@ h1 { font-family: "Times New Roman"; font-size: 1.6em; color: black; - margin-top: 16px; - margin-bottom: 2px; + margin-top: 16px; + margin-bottom: 2px; } /* Level 2 header */ h2 { font-family: "Times New Roman"; - font-size: 1.4em; + font-size: 1.4em; color: black; - margin-top: 14px; - margin-bottom: 2px; + margin-top: 14px; + margin-bottom: 2px; } /* Level 3 header */ @@ -53,8 +53,8 @@ h3 { font-family: "Times New Roman"; font-size: 1.2em; color: black; - margin-top: 12px; - margin-bottom: 2px; + margin-top: 12px; + margin-bottom: 2px; } /* Level 4 header */ @@ -62,8 +62,8 @@ h4 { font-family: "Times New Roman"; font-size: 1.0em; color: black; - margin-top: 10px; - margin-bottom: 2px; + margin-top: 10px; + margin-bottom: 2px; } /* Numbered list items */ @@ -84,23 +84,52 @@ ol li { margin-bottom: 1px; } +/* Links */ +a { + font-family: "Times New Roman"; + font-size: 1.0em; + margin-left: 2px; + margin-top: 1px; + margin-bottom: 1px; +} + /* Table items */ td div { font-family: "Times New Roman"; - font-size: 1.0em; + font-size: 0.6em; + line-height: 1.2; + padding: 2px; } /* Tables items */ table { + table-layout: auto; + width: auto; + margin-top: 10px; margin-bottom: 10px; + margin-left: 15px; + margin-right: 30px; + + border-collapse: collapse; + border: 0px solid black; + + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; } -/* Links */ -a { - font-family: "Times New Roman"; - font-size: 1.0em; - margin-left: 2px; - margin-top: 1px; - margin-bottom: 1px; +table div { + white-space: normal; +} + +th, td { + text-align: left; + border: 1px solid black; + padding: 2px; +} + +td div, th div { + border: none; } diff --git a/bundles/org.simantics.document/simantics-wiki-documents.css b/bundles/org.simantics.document/simantics-wiki-documents.css index 101e698c9..c28af5b17 100644 --- a/bundles/org.simantics.document/simantics-wiki-documents.css +++ b/bundles/org.simantics.document/simantics-wiki-documents.css @@ -37,18 +37,18 @@ div { } table { - border-collapse: collapse; - width: 100%; table-layout: fixed; + box-sizing: border-box; + width: 100%; + -webkit-user-select: text; -moz-user-select: text; -ms-user-select: text; user-select: text; + border: 0px; padding: 0px; - box-sizing: border-box; - } td { @@ -75,24 +75,23 @@ table th:first-child div { } table div { + height: auto; + width: auto; padding-left: 1px; border-right: 1px; border-left: 1px; - border-top: 1px; border-bottom: 1px; + margin-bottom: -1px; margin-left: -1px; border-style: solid; - text-overflow: ellipsis; overflow: hidden; + text-overflow: ellipsis; white-space: nowrap; - height: auto; - width: auto; page-break-inside: avoid; - box-sizing: border-box; - + box-sizing: border-box; } diff --git a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java index 74a739352..637340b90 100644 --- a/bundles/org.simantics.document/src/org/simantics/document/Exportable.java +++ b/bundles/org.simantics.document/src/org/simantics/document/Exportable.java @@ -74,8 +74,7 @@ public class Exportable implements IExportable { this.settings = settings; MarkupParser markupParser = new MarkupParser(); - MediaWikiLanguage language = new MediaWikiLanguage(); - markupParser.setMarkupLanguage(language); + markupParser.setMarkupLanguage(new MediaWikiLanguage()); String html = markupParser.parseToHtml(wiki); String width = "width:" + (210-settings.marginLeft-settings.marginRight) + "mm;"; @@ -95,7 +94,7 @@ public class Exportable implements IExportable { html = html.replace("", "
    "); html = html.replace("", "
    "); html = html.replace("", ""); - html = html.replace("", ""); + html = html.replace("", "\n\n"); this.html = html; diff --git a/bundles/org.simantics.g2d.ontology/graph.tg b/bundles/org.simantics.g2d.ontology/graph.tg index c215a73ccd3c34537d95647fac75e11a81766ea1..362c08c0753448e2524f8a6fb4865baf0d1efb51 100644 GIT binary patch literal 18788 zcmeI4d2}4bwZ>;`?UHw6R-0yvG1vy1H6##AmThEgOGw6HH!V#|YCP%@(<9q*2#`Qn z!kP`T5Mn}r1jxdgyo3OOkPw`Zec$)@683%Pec$c6qpLdM@&4xEbIMb{d%wE3s=B(S zWp}A|pd1bl=5o0_O0J%Nxj(g&%28SxDfdN7OCw2T0?kd)=1P>LaVbd~$#wjzg?}~0 zg(#`Sl{iWp$Trf1291;jDMbBo0%<8}rqunZsp&42D&yMKB;imbIch4S!&$9i8M;tT z!s0k(-Ede&eu+QUs-bh3Su$;HLq{^!vbHI$gq3Irjj|3))4Gjeapa9hP%APSHzsZm zH-HCpB(TYBPTRC;)50_!3NbN#>B3TZ0E&rp<)`&T#i);+TNg*07A#u07}mGZHF4&O zD2d8(UsqVh=+Wb~7&;siq+!#la5O6Kj~0tytD|i~LuXPc6-xu7fJtJh3)3_zSHL?6 zH?~K^QBp`d6PO+p(~Kj-bZJ;F#F(DAGTI#`1IUu!j?M?`JCco2Ic3@#McuR%mpo1@ zX=gt~+l#FZJ*<#(_Y2pzO41a9fQI``l$}M<++G^#Ek>>7a>%}}&5RvscT~i+D6B2P zxJ``Pp?6*7(l7=w+Fo5QaKA&`b<4Qc7~?+S7LiAVxDRn)eV14#r*Se+j5H4HQ^nrU z9#%p(t8+68+OGMu*^=^ilM0^!5U2ZB5B$nwyEeyx88O|Tt#$fS9%&uhgviq7DtFK=f0I0+DfHj z6!H?ED~7tBN*OZ%enhxQhad?L7F(mc(qj5%W@;O)RIkx8F(G*+8i>jWb#JE0t~JJu z4(=`{E~u`uy9Q(Hr&*l1_Xe@3D;Q5MTRoF{Mtbes1LK&E2~Rsg>$`UwSf*6#=Wuz%SRHq<-(#YxUBQD#8adY(ANuE+tMz?pFkQPdZZ&^VeDw&%{Al=)7^dQG>%%6O-56OvccJGY z6IbrB30(Q>xM{idJWT>j=7dFQUpbZy5W|uiaGGiUuT0nh9k+%k=^K^t9V_ zd5N}_CdHK^ng!93rE3_+#lsdJlr*DZ&B9yGXqU!to?wk@4=Q-UHxx zg0P?QE>JJOe;y|+Fy6~(sNwQli!Xi*w1tMtj3TWnmSdivXrLiAin~O?1=+K1MSH0a z%SwdPX}`+|iz1u^Aww+>hvFjk%6uKoMWeeT)8Re}M~W3}aitBsb2`M#%U?CUNK=Pt z+LJY{YTP~3FXon2aS|;{3O$w4A_ET6+CP1HTr5Tf&o_|y*5J~HMbCGQMC0;UiZ5ks znfXbyTx0rivq&b1e?>Vg#M#1X6Ep8twz_`%)w95+PURYVP%`;-MJJ zJog&ST}HP>bPb%rmADe{o=(e_MwuRGdT(ZGi#A3@XL?U&lHksCkc8qgu=~gDV&xX< zEt~vQdTuv;xkRMdHd=^d%v2LCml#Q>NaU`R8|d9}p~9a6UZuU$2#*#acg(THF+*(4 z-Pp+S)L4ubx1-SwVyu(Samv?a4YQlk-DtIPNeY^GpegZH500Jc*4X}xs8uE6C?)ILWl{76r4I3%*>8wYq<-5#-8g57WWU{{A%L%6Wz6H73?kqT{n# zwvpW;JUJWJ*u9avGqWRJcbH-+b_|8`#6FGoJ59h#Maa%|g_S`*H(?0PG+t^{>qW&y z(u1!;j&cGm>y1QKO-;SqS>QZO+SK+8hVm0hL69SCiw5FEXSf{BxejveC8?&h?f z#>A-Z78RF0z9@R+(FL87wRX3W4U4Q%BDtOVG@6E|C9)f@??;aHsdH`4T)m}YVSSA6 z@wl(*+L*bVbzG}W;+i6@#yJk9qlRBHZQS*^&Yz~~P}9NHqTx7r-7zWhv(C%3t~RnG zL?-j^`uYqlM;OV8BGK*4d^HV;L%t|Dp|1TsVr}e5*Trd!AG0ufGikcVgq$TB-p*rJ z_20D3GNRccVqWh{ zw-jGe@>9kqg&VK|#%`bZRAy-l(+C!RL4RB<^{XO$fpRNpn$Ho#u{}O_!sjFSoZ<0w zkEeM&)#E81Pxg3{$NWbDo1g!}VY$g;{xgd8^B+$v*L%!=4YB@Ok83>U99cd8nZq(4 znk@q@=U(&pRgYis_+^h@^7uuMU-0;OkDv4SS&yIb_-T)y^7u)QpYZr`k00~+QI8)s z{4do1?eYJBAH+J`4xc|lA=kc!KluE<ni1@&7|{u{;W$yQHR{WYln6Xn}zzZ*WU zc6=XrchtF7>DTu6qW%vQ)#KSzSoMixtN**vpN2YF_587hZ1sNwYkdB54q5d@$5#JW z*z9=8>gW8Bb-e7~Ur?-`Z1rT-vwwf~^kl0itDgP)6N-&bwtBMa*Q5SN6ssp&Jz4c9 zqy7g^Pquop>Q6%b_eTE%$5v0j>Q6-dcb=YX^<>p|qyAe@Pquop>W@bKH=dqs^<>p| zq5f-6Pquop>N`>Ym8U0LJz4c@Q2(W;CtE#P^{Y|;g{LQ5Jz4cDQUAH8CtE#P^&P1H z%+r&to~-(%sQ=W{ldYbt`Zm;mV)Wck$W~8QeJkoeMzQOYZ1rT-FG2l>D5~drBU?RL z^+%xoJrup)cXNE7+kXPb+Wubf11PHB)v@X)JGT1o8vRVv$yQIc`tKP16x7L9PqzAd zz&oP9D7kN;khcf#gwH)4t9~!X2jde(o;B`4{YKQ;hW)!6MdO|8*v6yZ#v^OI8BVY9 z$akUGcw`%oY~ztN-gMN-8jpM@ipKk&2@6Xd6AMN=4j=Ar=hQhv4uj4t&@fv)-g2KMi z&wb%#6!!IY6rG=&9ozY#U*mB-kPpsEeyU@gAM$M|8t)dzHXi*p9$DjY{gO2v`BoH- z*Y4QHqu<6OYdqdxWQ|8=pSEFs=irmi7MA&}LT-kCHa=INa84|L1+4ja{l1LyMd)YY zlRmQgx1#rwxLVaBIT*AIPU?f>UdzYay)Q-7_; zpY!+{@LY^<2Yk{;cKypwa;)>Mtns;CsMqVa)v>*PpM_2J?9bJPxt_M7X#ZOr-;e$T zsQ(jXD~gVnu|9)h<6Q;T{?kWRKl?}4{$1f%`?nVSX%yA7e^;VtJo?D$XFRfvN4D`k zW%SJVNsm9_@y9)88=a38sFU6G$T7BM#80qgwIN7np}jZg1B9*?Q9{Ud9B#uoosS`~#^<#q+xBE_&%TniJ-<(i zDB7NTD_Q$j=UDrvY~xd}@i|_y#@`e54JfLopVxF7?zcJk{Ikb@@%XQf_4+Xu+u!fL zZ~x};-#z|^<7RVz$FSM{3>xl7eZXVdYqCar=Vy) z`pBAZqGQdctnHbPdYg}I^Q{MKe17+nHU0$08eiGQr(WZ?JH3s6GHe>3&k|&fpLeYB zm2G_LZG5tge-c>Z^Vx)~@lh4l_{ugu^)^1)#y=6P@wwK?wmn(fbA6JvJ@*5yscr85 z{JqD2@c54&|H*N)x!;b5P4llq{WyUo5+n%iL&vbsY~!=NjZe1m*MN1uz8H0~#(%}J##grS zskiaTHvVd`#=i)4vc`YevBp=n@u}DN7dpL-zX~?hb3Gk}vd!HOzx4Q59{<|o-+266 zkALU5+1xM8r{iN^R-)+jI?wTq(4)_}mmKSOm9_s|?`*H*<$567@pc$LbCZ3)jYq%c zd(r8&Kjb4(RL}WajYR zZoRz2v91^9emjcxm-!Dx(d$beS^N96V;zsOw&(hxUgu|qV>>^Gz^42N>Ib1{Jo?Bs z9$Dkfaei&j{rNznXa5gC*#~7F3iV_i54B_+&r^;yzp~9wz4F_f-sWFy{LH@y#pWk# zerm~@|4GN1Us>~UKB-q`ezMKKzwtBweke9SS@Tm%*8ER6*8IwvkNK%rW`45GztH%Z ze*uckPuBd@k~RP1jy1os=3{>9m6@Mx^UpVa=HC~^<|k`@YRQ`aF~^!;S@SVJ^~%go zw)yuqe&*i;#pWk#erm~@|53-9Us>}pKlRGYPqz7YH-6^d&Es7SPeq;gM6=ruS{&aG z4p4spg?{DlIoAI2UZ7u@Ytb^-hGkwW%lmrFvCuya`FF-A$1)p5=i_0=non8xgPojT z=VJ%(E+{%*oDXU=K7Hh7H-6@vg`)ZX?O5|EYrZDuxB0e%&E}hFnDadYMe}jK$vVH^ zb*%kktm!B=-W0=($3ED2WR3S7=ht|Q)rex_)qoo?ey$7p$U5G8JigoGyF9+r<2yXQ z-Q(LlzSZMfJigiE8$7<=<7+(L>hV<`U+M7`9$)71r5<16@i`u!>G2kiQ;&x|PCOp+ zxajez9`}1(@VM9GQ#@Yp@yQ;asZY z!b{!3;lUyZz9O>PO@nxg9r)#OfomAp7AU@yHR#0~$Qyt+jc));^^fb-7o@?g)}XJ1 z6BBaKDk$}nN@d=e*NML+d*42g*PCIzR;*1t@KCjVE=#SF&kF9*8XUNwuQW7VO7N0s z(6*vmGL_0fmUDCa&Vre?n0 z8t8$P+(*S&>)x8qeME2vdD)fY%_hB43W`xOAn(+FSQIrb=7%!M4%Fl>7E0C*MnM5@ z3kSo4c)vA>(;y5AIBv<)fk8SP^~L>hR0!fE7{R$t%qb2n;NWH@N`uN^SP9C}Fpk(_ zUeGW>FZixG)aXUUMaCPl!Eji?+qDU&=_1K{Q;vy4zM^bHuuazclq1p*L7JT+Nf%K)+%$1KR}>|A0v8G!yDDRJ-4yW_B{gM?sExr(@leOPT~>Kj$-8+@9U;JQ*ni;HAa)#K=&xU?@Bl zlPzbmIIP_y$)t6dO_;0aPj?aX3S6pe!$DqmRAKCH$&T^|dvBgUI*;EGxJlBeZ=@1$ z#9k{M3^EDxY$pMWt>Zj}v0&qFy~?K2fh^DJ3rUo7#SM`MEj_l-k)zGl2 zlnhjsnLw`QbnO zl8Uik8zH}Jf|HPM#QqkJ+H_3$y74Df!QB-F6z~9UDP+v JMU|h_{};E?fqeh~ literal 18663 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