From a1c18084fd43430a3874413413d4645c3d4d6e34 Mon Sep 17 00:00:00 2001 From: Allanis <allanis@saracraft.net> Date: Tue, 16 Apr 2013 14:23:28 +0100 Subject: [PATCH] [Add] resedit: More work on planet editor, tree view. --- utils/resedit/space.py | 32 +++++++++++++++++++++++++++++++- utils/resedit/space.pyc | Bin 14182 -> 15186 bytes 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/utils/resedit/space.py b/utils/resedit/space.py index 054c9bd..13039a2 100644 --- a/utils/resedit/space.py +++ b/utils/resedit/space.py @@ -37,6 +37,16 @@ class Space: data.save("planet.xml", self.planets, "Planets", "planet", True, { "commodities":"commodity" }) + def __genPlanetTree(self): + self.planetTree = {} + # Set planets to none. + for planet in self.planets.keys(): + self.planetTree[planet] = None + # Set allocated planets. + for name, system in self.systems.items(): + for planet in system["planets"]: + self.planetTree[planet] = name + def window(self): """ create the window @@ -124,7 +134,7 @@ class Space: """ # Store the current values. - self.__sstore(); + self.__sstore() self.cur_system = self.__curSystem() if self.cur_system == "": @@ -159,6 +169,17 @@ class Space: self.__space_draw() + def __pupdate(self, wgt=None, event=None): + # Store the current values + self.__pstore() + + self.__genPlanetTree() + + self.cur_planet = self.__curPlanet() + if self.cur_planet == "": + return + planet = self.planets[self.cur_planet] + def __sstore(self): sys_name = self.__swidget("inpName").get_text() if sys_name == "": @@ -220,6 +241,15 @@ class Space: else: return model.get_value(p, 0) + def __curPlanet(self): + tree = self.__pwidget("trePlanets") + model = tree.get_model() + try: + iter = tree.get_selection().get_selected()[1] + except: + return "" + return model.get_value(iter, 0) + def __done(self, widget=None, data=None): """ Window is done diff --git a/utils/resedit/space.pyc b/utils/resedit/space.pyc index ae7f72e52250c083001828c6533c9a4197f87a00..f3fb02217d080e865740546d1ce89d81073836f9 100644 GIT binary patch delta 3136 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 IzvzGEZ?ud#p8x;= delta 2239 zcmai#{clrM7{~AFM#t^eZEZIOb?-8~l$Uk9Y;24K1cA));u$)u%-Xegv)Hv|_qL+} zGKGPP8X?b5h^R;uUl1fW{-}R|ziEsnY9#(3A;zCH{$h-JzE5d~1Y@>*_B_vh&N<K9 zIr}nyGwrVU&Fgt<^L6)t5M8uIJTbdOOB8=~ZLUI#)MyEhHm7M3FWalNIiW>rwL}dY z>q^dEZO)}d>Pu=Zt3EAJ$8LTtQO`o4<ltk6hLY-MwNa^i*%V-XQR#C7t4$@fk=4Z| zbrGv7=q5fRs3jJ&aGxeejG*(f>(Bxxq93pH*b6jGOWNj?<^1Sf<`RapuzpI2R?7Q2 z-2LjCTtydr1G-(Q<lULHN#FY}R@-i+Sp`e2qvQS~B1(Vx=R`N12;@bU{s;^<?!nTO zg5iP$e>p|rW!vc02Cv9F7aD#MRUu{FE!*kLqGRrd;W12srm)yg+nUzQ4#7|lYyc38 zy->k2?Wk=Ywq*q7RWR!c!%52?u`|=AJOKNXKoocihymk39H;{lfC+3@FuagB&Iu*i z^m|jFXA)9{LLwQL`=Fp)`B*AvN*pQ!z|%kyICwil_d+X|O~h=oKrb!c<hX;5m~Dpx zGM23haMy}^6rc*Ic_0hqfN9_mU;~zd!KapMF<Gibxma8an5QxcGsUIj1hSQxtUN%2 z&0Fe`hdd5&^pl9$i^@i$mW2wwO+Pfh(Z<bJQ?AJ|1%oTYKvCoboo`v9I)#p2Yj@M% zExP!e^wukFoE@iwWI0cx3QKsylk`<<pBST>wywGtVSQG?hI^K-hqkD_^r{gatS{(n zTMK>NJ}g$z{T+F6gI?<x>BXJ~W>FRg2GS;AJ3gRQck~d=GV^BI=B=ZhKG#p0Gu^q- zC05YYrR}rajTx*dZ<gfIKn})|e|;zpV6C#Dy0KI$6OY-+Oj-^q6W@pNoNZ^)wx{G0 zx088O4q+D_W6Ue}BAK>1T-wzYY{qc2H8yVXC9?}zlgC<arW0ME)tucf?6Mm`e1;zq zH)8_QIpFpM`mSsB3Lab3beeZe$EHj^0yh@d(K=lGQ;?(@xX<;o=A2rV6RIkIKG3zg zTnip{%T{At?A_})2I<OU0Ir^jagWjX$b5KcLor5_>fSNpg9E$^Tn63)-UmJaKBP~K z3E`*a<!6I@Ahx}$yYd_lUv(%TLev(@{h#BnA-@PK$3`c(;#P&qwW51R^&QQpN4r-B zc}6);t^%JujEF|*eD`ShBE<PO=}o2bg-cAwW}>NN+T>Z}TBppkJW8G6tq;z(=rJt6 zN7CGlc(Ez*g1mxl-3qE-(aE?>(&cbZ{R>#kckddckLgzUqUd!__v{o8@r)oY?)Nih z!79$(0eIqJV|y;0JS2Ny`tNd%uB{a_&cxawv7x-F{1$6?kWWFH-vSrx?jE0}TkA%} zbF_K=H%swk@e7vZ$Ch8U@^}?rx*6Ko+p=;a9N$qWJ{3q_P5?aGA1R58I;n~}Lvy_m zafWX6UT7@8HN_`^yLXb#_6357(U=d9>vkF&5`EUUU!0?+4W9=2ABzW`^A88kl2<WW z9xP9o<GIO8G}zxPn(6WW{)40V&f)TDd!dd2T$Lk`o(GNsVPGAw1K0_y1=axQf?N;u z0(}5#Aa5!dnu=j7jSYC(;p}$lRr&(Gl7ISipYGNx{L6Ktrb@4+R|Y!NBYAD$(m!Ca Bt9AeY