From 1d2697ff0c3af10e3a8c13457e6feee8f96e640a Mon Sep 17 00:00:00 2001 From: villberg Date: Thu, 3 Nov 2011 11:21:07 +0000 Subject: [PATCH] Modified image ontology => multiple ontology versions were updated. git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@23186 ac1ea38d-2e2b-0410-8846-a27921b304fc --- org.simantics.sysdyn.ontology/graph.tg | Bin 72091 -> 72086 bytes .../graph/Sysdyn.pgraph | 2 +- .../Sysdyn_ModelBrowser_Viewpoint.pgraph | 43 +++++++++--------- .../graph/WorkModel.pgraph | 2 +- org.simantics.sysdyn.ontology/mdl2pgraph.pl | 2 +- .../testGraph/Cancer.pgraph.keep | 2 +- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/org.simantics.sysdyn.ontology/graph.tg b/org.simantics.sysdyn.ontology/graph.tg index 3863b84b4a9f1d2979d965ee940157ce643d8136..b22cae4f6f2dc12b5a50332e9d9df1b02da83b8c 100644 GIT binary patch delta 3165 zcmZXWS!@$m6o%)<&PGYG0Y}B5m=+KXC2=+f0;C~?EGCPyI3ancP-0Jt6JsMU1%!m3 zkjhh~UQvX2;H60Ap$gK7R#l}^9#TP}B~%cj8lu{e8uL?np8Jz~N-o{9}jLQ^zDps#xBeh)>9&RC6d5iN{*vv6Or;B}uG? z+nrtfNb#GjTKVqvWp?F<;`bQa#uG0*c6U%^-XedpD-xTO!@;;D+2;^r9sKa(M{Hi1 zD4EY=_ju3|Xkr^FnH3F0qLUTXl~uSNrqqoEV~I#;GKtF}mB-`Ju$%zz7Mw41rQ11c zV^w^;Yt53X60|oSc`Kb5rC#}Im!H-0dDkxXK&dO8vSli4xK+MBqaBI(fux+Bksm6n za1HDoO~~Q4bWBV**{0vMN64k!@o+k-R>e{+dn3_sKNyvbLSOR#!cHNSppYuFhTS5* zST!6tv~MgPh0P`rU8Y8ZhxW_ndo)FO9w zW*?J8WGqeFfW5yjl8XGXP&6Huv8A@>B2tP1K2_r?WKDvVPpaH(sF|+Ionqd!J6R*P zgQR9B%6hR$u~bhyEYlhx+9D(eBvEKmb_#{Bui3!5cz?}Fwv|7uS<42wv)0Yp_{LiI z+IC85E7FV6@?DCw7y4sw%ZViU@8T1+t11R4T)rffPNw4f%*(S`2*u{j3i9){J!SPm zaP-T`csdc1O?|zgtg4%EGrw}I$HQ2oayCF;{BrLe*3HZNF0f8M-#5j4{A7Osk$H@r zykX!p^Yht(05Z#i9%lo3EyRNU^Dq9;TQ?s;G>B+{DeB|Lf*#h-&j!8ln8kG;U%<7W zmk)YaFZU06GmXe!!1*ZBoSIc;J2mdnxJ6}YT;m;@-VJ_csRtYNn^c`?^-RlWT75t3 zM8aQL1KS<&pIK(q5Lh>)T*0~_)swCnO53=9$ioi~IWkoFhpFis25i{;s_MFpbVXymEgv7*t-3t2 zxPT3p$EYIKCpV*U*5y;p<)Os|Y`FY_Dq`J*dLhvQE{lRTm{L{IE= zb|9O&%7-)N$~u%g=e8~?>CZMMmGTvzt;xXNIFj{9?6feRwH&?G#BIn2vv%B!mSiP9 z+f6z)fmolq$R*aN?vtd9NYLkwwV?ILxgidZ!CRo?oEwZaVK6b6CQyqH{{7f#ck5I( z^h!;awRg(6lu-+`fc>T11p5jLyDeO1VOjxdK=*su!mBLo$yfrbE&K|&3ZEvejBEY zegQ_VZ_y;=8}DMgd4ulYyEz46?xx2E$e*QZpBQB^9-pPub+-Z-(=;m6w=PgKN53cY zX))&CCV7xX<;?9S8-BUZ{TN-jLA<33)t{(ItX>~h%jr;mIIlK-07K|i4*$J+<$s9b B`>Ox| delta 3400 zcmZ9PTW}Lq7{~W?V@pfH1S~^iZy@5pkS4uQz#EYncW43+0dX2j{h=Q~MJ8b0hI=BAr5H zKjK-iuwy8`U&-Kd2XTLKTY6|Xok?UB&~{-ejHHu;$_V%wn@dVbW%&o?9ju<;E$?L0 zT8n>FW~=y}%F4&vWjL=Y>pKu1Q3fNq)Bu&tm}$C&%qI@?(|?T zsaVck!d#j+_Z=SEn@%Emldvw#Telq^R@x3El7m|j3307k?27MIlDgO^M1HaALsrYx z>ZPn!d%rs3)m|>~c_J$?pv2~FPbkk1rxPi$t1zsixmOh1)AR_FZvb;;eDD(55TG%HyH(wKv7(99_m8knai0qV{-Zdm@vICo{NZ*^$KF zoPNhP2wnRq4 zZ?h-)&H80*8!v6}tD8w&;X`FHmwj6!ByFB!WRxV&4YEXvI#P#}kqi~>5Yc7IbLgI$ zM@#k$TZR1aKrWL_581bDjS!044$QUgVjmxC=wYk*gNAbUlvdt&(9hbnmwKuhTd$pn z(g*)MwwrbFWxXd^C!gvaWsUr`tx;H}uy*pszIRzWztk61*Q3`W+}Sw~@DCe(KhH8D zn61_MKb^b4g)V=v>ED;vWy8M_{E*H6pFGR|;`1j-Dqy|*#J1p)P9UB>vkh_s8*VJd z@4~AcR&0mE3v7Bt`KJCLjU@k#);C%$6B|)1tm|#M-mPjP{7-!=2A62m@` z!BK!5i~>j|0*r~*fq%37MZ>?E2_;4igB|%uH}WBtbSCntxS$4pu>wTLV6)?9T+iAH z;3*+?6d>IwK(WL|!)L*FEPs(7Eb^=L*iwPpt^#030n&{E6ijRsm;nE5`HKQz#{hVI zjb}_Ee=y}&#kmRR4Q2rfrU0V=P4J_u0N7Dr##I397=UzR0E#7UeZYryELUm%TUNNZ zgJ4HE=|=dp?r*e5^W3!j#r$ALdpBJ9!A5>n95Qk+3Q#byQGn+E!3q$M+?172oDr~* zP~;=s$cI>&SkEU0oP;eU&V=^r&UFj?GQGS$ff1kbPF%0nPk1+Rentht0g@o9}3wK|g)LBfeQJ6#R#bTQ6@L*HcM&F}}a2+Gk8 zRp74$f5z(zhmY8d4@;6N9Q3Ua!4zO@1r8H!hZ#T(VFygcX=hC~UIRvqsgr*_{z7O7 zw~aOA+0+9PUNPjL=c?W|%i(OpqV!w+YbusOLEx)JI#Z{`yQ0?Lx7cT(^Z4(Ca z%r@u)(C$GuSUgyErrTm?m5z?xKqt@6bkgliuNFJcx|m*`cAZ|`~`$z~AW zcVPKmej*Qsr2vx)TnqmgXEd-Vy}xAxcCtl(Gl#Tx#C zEaPGgpB2|)4WHW$`|)!ZkYf0}$^f%pQdrFeT4Q28BGxgnPKwn#L27tHB${YpGsiAQ z$^GI< DIA = SIMU = MOD = -PROJ = +PROJ = //##################################################################### // Defines ontology and attaches it to SimanticsDomain diff --git a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph index 8a714c78..e5de0873 100644 --- a/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph +++ b/org.simantics.sysdyn.ontology/graph/Sysdyn_ModelBrowser_Viewpoint.pgraph @@ -1,12 +1,13 @@ L0 = -VP = +VP = SIMU = -PROJECT = -IMAGE = +PROJECT = +IMAGE = ACT = MOD = STR = SYSDYN = +SILK = SBC = SYSDYN.ProjectBrowseContext : VP.BrowseContext SAC = SYSDYN.ProjectActionContext : VP.BrowseContext @@ -62,12 +63,12 @@ MBC // Images MBC - @VP.constantImageRule SBC.FunctionsFolder MBC.Images.Folder - @VP.constantImageRule SBC.SharedFunctionsFolder MBC.Images.Folder - @VP.constantImageRule SYSDYN.SysdynModelicaFunction MBC.Images.Component - @VP.constantImageRule SBC.ModulesFolder MBC.Images.Folder - @VP.constantImageRule SBC.ModuleSymbol MBC.Images.Composite - @VP.constantImageRule SBC.BuiltinFunctions MBC.Images.Folder + @VP.constantImageRule SBC.FunctionsFolder SILK.folder + @VP.constantImageRule SBC.SharedFunctionsFolder SILK.folder + @VP.constantImageRule SYSDYN.SysdynModelicaFunction SILK.brick + @VP.constantImageRule SBC.ModulesFolder SILK.folder + @VP.constantImageRule SBC.ModuleSymbol SILK.bricks + @VP.constantImageRule SBC.BuiltinFunctions SILK.folder // Modifiers MBC @@ -87,20 +88,20 @@ ACTIONS.OpenWorkbook : ACT.Action MAC - @VP.actionContribution "Module" SBC.ModulesFolder MBC.Images.Composite VP.NewActionCategory ACTIONS.NewModuleType + @VP.actionContribution "Module" SBC.ModulesFolder SILK.bricks VP.NewActionCategory ACTIONS.NewModuleType VP.BrowseContext.HasActionContribution _ : VP.ActionContribution L0.HasLabel "Open Workbook" - VP.ActionContribution.HasImage MBC.Images.Component + VP.ActionContribution.HasImage SILK.brick VP.ActionContribution.HasNodeType MBC.Configuration VP.ActionContribution.HasAction ACTIONS.OpenWorkbook - @VP.actionContribution "Enumeration" MBC.Configuration MBC.Images.Component VP.NewActionCategory ACTIONS.NewEnumeration - //@VP.actionContribution "Open Workbook" MBC.Configuration MBC.Images.Component VP.NewActionCategory ACTIONS.OpenWorkbook - @VP.actionContribution "Enumeration" SBC.ModuleSymbol MBC.Images.Component VP.NewActionCategory ACTIONS.NewEnumeration - @VP.actionContribution "Function" SBC.FunctionsFolder MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction - @VP.actionContribution "Function" SYSDYN.SysdynModelicaFunctionLibrary MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction - @VP.actionContribution "Function" SYSDYN.SharedFunctionOntology MBC.Images.Component VP.NewActionCategory ACTIONS.NewFunction - @VP.actionContribution "Function Library" SBC.FunctionsFolder MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary - @VP.actionContribution "Function Library" SYSDYN.SysdynModelicaFunctionLibrary MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary - @VP.actionContribution "Function Library" SYSDYN.SharedFunctionOntology MBC.Images.Folder VP.NewActionCategory ACTIONS.NewFunctionLibrary - @VP.actionContribution "Shared Function Library" SBC.SharedFunctionsFolder MBC.Images.Folder VP.NewActionCategory ACTIONS.NewSharedFunctionLibrary \ No newline at end of file + @VP.actionContribution "Enumeration" MBC.Configuration SILK.brick VP.NewActionCategory ACTIONS.NewEnumeration + //@VP.actionContribution "Open Workbook" MBC.Configuration SILK.brick VP.NewActionCategory ACTIONS.OpenWorkbook + @VP.actionContribution "Enumeration" SBC.ModuleSymbol SILK.brick VP.NewActionCategory ACTIONS.NewEnumeration + @VP.actionContribution "Function" SBC.FunctionsFolder SILK.brick VP.NewActionCategory ACTIONS.NewFunction + @VP.actionContribution "Function" SYSDYN.SysdynModelicaFunctionLibrary SILK.brick VP.NewActionCategory ACTIONS.NewFunction + @VP.actionContribution "Function" SYSDYN.SharedFunctionOntology SILK.brick VP.NewActionCategory ACTIONS.NewFunction + @VP.actionContribution "Function Library" SBC.FunctionsFolder SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary + @VP.actionContribution "Function Library" SYSDYN.SysdynModelicaFunctionLibrary SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary + @VP.actionContribution "Function Library" SYSDYN.SharedFunctionOntology SILK.folder VP.NewActionCategory ACTIONS.NewFunctionLibrary + @VP.actionContribution "Shared Function Library" SBC.SharedFunctionsFolder SILK.folder VP.NewActionCategory ACTIONS.NewSharedFunctionLibrary \ No newline at end of file diff --git a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph index 042f12d0..e74c5e93 100644 --- a/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph +++ b/org.simantics.sysdyn.ontology/graph/WorkModel.pgraph @@ -6,7 +6,7 @@ DIA = SIMU = MOD = SYSDYN = -PROJ = +PROJ = //###################################################################### //# Example work model with two modules diff --git a/org.simantics.sysdyn.ontology/mdl2pgraph.pl b/org.simantics.sysdyn.ontology/mdl2pgraph.pl index 2e49e3ec..b8e1a1cf 100755 --- a/org.simantics.sysdyn.ontology/mdl2pgraph.pl +++ b/org.simantics.sysdyn.ontology/mdl2pgraph.pl @@ -585,7 +585,7 @@ DIA = SIMU = MOD = SYSDYN = -PROJ = +PROJ = //###################################################################### //# Example work model with two modules diff --git a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep index d99f7b6e..42efd793 100644 --- a/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep +++ b/org.simantics.sysdyn.ontology/testGraph/Cancer.pgraph.keep @@ -5,7 +5,7 @@ DIA = SIMU = MOD = SYSDYN = -PROJ = +PROJ = //###################################################################### //# Example work model with two modules -- 2.47.1