source:

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Graph Diff Rev Age Author Log Message
(edit) @d5efe56   9 years jrzhang Merge branch 'develop' into 1st Conflicts: src/dat/layout.json …
(edit) @db32cf3   9 years jrzhang change pattern and user pages Change-Id: …
(edit) @582ef89   9 years you update #105 Change-Id: I2ea81e07b717bc415aebfeb697ac9b3e3727db79 develop
(edit) @1192389   9 years jrzhang remove png from img Change-Id: Ic0eb740bb1e99800ce5a0ede54a034fdafec10b4 develop
(edit) @2f549b8   9 years jrzhang move the threads from monitor tab #102 Change-Id: … develop
(edit) @9cec350   9 years you update #105 Change-Id: I8320221d4e34ac3297e319a896413923fb45072e develop
(edit) @3c31b44   9 years you done #104 Change-Id: I8ab75da1edd5e699dc6b9cebcadc7efb0896cdbe develop
(edit) @ca8b555   9 years you upgrade from 0.1 version Change-Id: … develop
(edit) @23911f3   9 years you done #101 Change-Id: Ibe4302393c95dd683c5fe89ea6be778df9f3684e develop
(edit) @966e140   9 years you done #100 Change-Id: I90976b16171e230b13e95899a902e466bbe17d0b develop
(edit) @5f62d9d   9 years you done #99 Change-Id: Iceff3063095ef51d2abec92c23a1222db958c9a5 develop
(edit) @1d9d055   9 years you done #98 Change-Id: I55f66ec25654a0414371d4849e79c167fb7bed7a develop
(edit) @eb75964   9 years you finished #96 Change-Id: Ie0ad53e9998db607bbd530d28d682a0e5e3595c2 develop
(edit) @b7030cd   9 years you done #95 Change-Id: I3f2e11797f06b4ea608cfd07f87a60fade153f0b develop
(edit) @2505486   9 years you done #94 Change-Id: I4ae254950a1e8c6e6cc5b774c3962db9eb141389 develop
(edit) @cb1e553   9 years you done #93 Change-Id: Id0e79b528cdf9d896336d709f38af42647b3e410 develop
(edit) @22da607   9 years you done #92 Change-Id: Ie49d4e29f2569cb41634ee70e46f292e00feea10 develop
(edit) @1d305ed   9 years you add cx_Freeze and uncompleted #89 Change-Id: … develop
(edit) @87686bf   9 years yanll fixed #82 Change-Id: Ib5395b572afbb52a966c3f503e1b8813c2c3b839 develop
(edit) @2d41a70   9 years yanll fixed #84 Change-Id: I764a018a81e2e16b951c25b86e77f78b4b39a51d develop
(edit) @409369c   9 years yanll done #84 Change-Id: I22324b4da27713e0d34aa0b99eb7c468d718514c develop
(edit) @28a32fa   9 years yanll fixed #72 realized log function Change-Id: … develop
(edit) @dcb4489   9 years yanll done #79 Change-Id: Ieacd961d5a2acd2da1fdc7cc5ce326201ae1122f develop
(edit) @d53efc7   9 years yanll done #80 remove sample and calibration Change-Id: … develop
(edit) @34d5bcb   9 years yanll done #81 Change-Id: I6df53a7f881cd3a30346398aaee81a99da431e0f develop
(edit) @24ea815   9 years yanlili done #78 Change-Id: Ib4c44d027f6ae75bb6ecd3cb921ee9a90d33c3e5 develop
(edit) @dea961a   10 years jrzhang fix bool bug #77 Change-Id: I79b3a46117142a5a01a6046f08e5a740773c7c0c develop
(edit) @7f34307   10 years jrzhang change getSourceID to getSource #77 Change-Id: … develop
(edit) @6c4c67c   10 years jrzhang add startDiffractionSimulator #77 Change-Id: … develop
(edit) @c8e3628   10 years yanlili Finished initial log show #72 Change-Id: … develop
(edit) @174da6d   10 years jrzhang improved #76 Change-Id: Ie703cb57a17f4bed87f30aecba68eee2475d606f develop
(edit) @5f0bc09   10 years jrzhang done #76 Change-Id: I1f1dce0d2afe6d3ec72893bcd609f305e00f58c5 develop
(edit) @81bab43   10 years jrzhang pep8 Change-Id: I5dc3b664c71ebf48d12907edea993a29677299e5 develop
(edit) @0a2b800   10 years jrzhang done #75 Change-Id: I002175a15a6989d8ea8ceccc152e248e4f546952 develop
(edit) @3aae9b0   10 years jrzhang rm conf.py #73 Change-Id: I066f27a9c598f0363ccdfb710a874eb9442cdfda develop
(edit) @7273796   10 years jrzhang add conf/constants.py #73 Change-Id: … develop
(edit) @82d9562   10 years jrzhang fixed #71 Change-Id: If98109e263919753314183c06de048d66b1659e3 develop
(edit) @5e7dee7   10 years jrzhang done #68 Change-Id: Ia710c8d02aa6370dc28f9ce82bc1ce6dc5889256 develop
(edit) @4ca381b   10 years jrzhang done #69 Change-Id: Ia9f3a0170e1a5315ad9988395e859d973b4736e0 develop
(edit) @40eefb6   10 years yanlili add neon #66 Change-Id: Ia88b41f706a780c9eeecb77355fdc21aa2eee512 develop
(edit) @0590ae9   10 years yanlili test Change-Id: If08086c99374de6f14b0e8bf7845e47e2a32b3dc develop
(edit) @5423c28   10 years yanlili test test Change-Id: I5c67107067d1519b00e97998438d2c9533eaaa4e develop
(edit) @969867e   10 years yanlili test git Change-Id: I59e0e4edc14db14e6f6b621cd30c1aee49fb6bd1 develop
(edit) @43e1112   10 years jrzhang NEON again #66 Change-Id: I0150a136e7984dcbd5690531839e8d30261fd87d develop
(edit) @2151e66   10 years jrzhang merge and push again #66 Change-Id: … develop
(edit) @a12304b   10 years jrzhang put NEON folder #66 Change-Id: I42f43fb804f0f688215029b6fc229dc754c03e5e develop
(edit) @457bd75   10 years jrzhang done #66 Change-Id: I436e9634a36127cedeaa0ef3b4f6b37eea7cf209 develop
(edit) @aa834c1   10 years yanlili done #65 Change-Id: Ie6333b176ed5901f9b23a46b782ce25189d462a3 develop
(edit) @d649752   10 years jrzhang improved #66 Change-Id: I2bf8b486a336dd970878c587223c00043876c918 develop
(edit) @72f841d   10 years jrzhang update plot done #63 Change-Id: Ib7952c4da8dcb08ad1028369baad929756fa6f6f develop
(edit) @7a13882   10 years gerrit Merge "add NeonReceiver? #63" into develop develop
(edit) @413e214   10 years jrzhang add NeonReceiver? #63 Change-Id: I9873b374520d16f85404b16f57a5e1417ac49a0d develop
(edit) @ee99f4c   10 years yanlili Data Streaming Dialog #64 Change-Id: … develop
(edit) @0a085f7   10 years yanlili update statusbar #62 Change-Id: I8a8717f226e4e057e247ed9f511254a2e09f245c develop
(edit) @6bb1fa6   10 years yanlili exit action #61 Change-Id: I00afdfd644d210ab44092f66fe32ea220cbba2dc develop
(edit) @29c5212   10 years yanlili save action #60 Change-Id: I0c192f37868f52c6986b3f3b5d576673c237c924 develop
(edit) @00245a4   10 years yanlili export button and its action in Calibration #59 Change-Id: … develop
(edit) @10c8f8c   10 years yanlili add QListWidge in Calibration #58 Change-Id: … develop
(edit) @b54e74d   10 years yanlili PrograssBar? in Experiment #43 Change-Id: … develop
(edit) @b6dc0c2   10 years yanlili Add LoadButton? action in Calibration #57 Change-Id: … develop
(edit) @b729cbc   10 years yanlili done #56 Change-Id: Icf2b3af4fa15428841d9452e67efe7ba6b8cbb63 develop
(edit) @f6251c4   10 years yanlili Add two layers Canvas #55 Change-Id: … develop
(edit) @5339b89   10 years yanlili done #54 Change-Id: I9fbe225a504cfd36de6eaef89caa811b6d7f2c7b develop
(edit) @2ef5f42   10 years yanlili fixed #52 Change-Id: Id4b24c11ae9fac71cebeb3cc4035f17d805f6da1 develop
(edit) @64894a8   10 years yanlili done #53 Change-Id: Ica2e6121bc89a3280e0b71e0213755521de51491 develop
(edit) @a11f1a0   10 years yanlili Save the last layout #50 Change-Id: … develop
(edit) @0623709   10 years yanlili update #43 Change-Id: I12f80ad15b1971f8545624d553c7506ec89848bd develop
(edit) @844fddb   10 years yanlili Add RadioButton? and realize basic progressBar funciton #43 Change-Id: … develop
(edit) @190047a   10 years jrzhang many jobs #46 #47 #49 Change-Id: I2a95fb445c2f308c6f47f02149583302db84d37a develop
(edit) @3c783f8   10 years yanlili Combobox Unit convert #47 Change-Id: … develop
(edit) @aa4fe15   10 years jrzhang done #47 Change-Id: If70080ca02791cf08e2617467275785bf0d8661c develop
(edit) @9277c5e   10 years yanlili realize Measurement Time ProgressBar? #43 Change-Id: … develop
(edit) @68ba18e   10 years jrzhang change pause and resume method #47 Change-Id: … develop
(edit) @4c0bd87   10 years jrzhang add pause and resume #47 Change-Id: … develop
(edit) @ac44392   10 years jrzhang add parent #45 Change-Id: I47ed5c75a6277b647769a0a754e4e62d9641c989 develop
(edit) @a7bc539   10 years jrzhang button (resume) changed #42 Change-Id: … develop
(edit) @cf20e0c   10 years yanlili All thread use try-except #40 Change-Id: … develop
(edit) @b5d184a   10 years jrzhang use try-except #40 Change-Id: I7d89b4f6eff983cab68b1e0f305cf5ee21b2b190 develop
(edit) @d1de436   10 years jrzhang trial solution #40 Change-Id: I678a9ece4d3a20d0403b0481364c90eb9e04025a develop
(edit) @4b4396b   10 years yanlili Finished #42 Change-Id: I06ec1fa4c58bc67851e005fbad64c312cad5f540 develop
(edit) @2753a93   10 years yanlili done #41 Change-Id: I037a32bf9ea157b2f340613cd104915955a511dc develop
(edit) @675bd77   10 years jrzhang second trial #31 Change-Id: I64712df47ff0af7e1b5c9920b94c69d17a09644d develop
(edit) @fa068c1   10 years jrzhang first trial #31 Change-Id: I00d04e99997107697a836663a6d7a86e4885adeb develop
(edit) @d8311df   10 years yanlili fixed #18 Change-Id: Ic022a52139b240d543643d6d16bbafc116e3247d develop
(edit) @29162b3   10 years jrzhang done #39 Change-Id: Ifbe16f8b323e58f4aa54da54866e2246d11cb940 develop
(edit) @3697c4b   10 years jrzhang A bug fixed #37 Change-Id: I1ea0eb3288df70f7dcc4c039e0dca091150b5c2b develop
(edit) @519b118   10 years jrzhang Add getColumnFrom2DList method #38 Change-Id: … develop
(edit) @26fd158   10 years jrzhang trial #37 Change-Id: I266c1ae86bafb9d7c3ef109f3e62690ccf2238da develop
(edit) @055279c   10 years jrzhang done #29 Change-Id: I25a9d1b6bb96657be77075fa0f42690cc5a1040c develop
(edit) @9c6c4b2   10 years gerrit Merge "solved #30" into develop develop
(edit) @0909119   10 years jrzhang solved #30 Change-Id: I60ca1b4f867dac05d7e9225a6bdcf1200c4597be develop
(edit) @2808b37   10 years yanlili fixed #33 Change-Id: Ibec820791b13f44e1f8007906cbf2644e665996a develop
(edit) @9c91405   10 years yanlili fixed #34 Change-Id: I0b0c1bf9daddf9b674f0b6b719f9b497504fbfb9 develop
(edit) @f48e5ad   10 years jrzhang fixed #24 Change-Id: I3420f176fe0c9eafa07787bf27eafabc3eca374f develop
(edit) @5d7b7ca   10 years durong done #28 Change-Id: I3bb655c98d7ace98e690715101ddfd937269ea8c develop
(edit) @1640caa   10 years yanlili fix #27 Change-Id: Ia872fdc308d12dc5eb2f2d85c66cfd63f70ba759 develop
(edit) @7992ea4   10 years yanlili done #26 Change-Id: I3b10940ffe383a1bac4db439be699b01fa97ca6e develop
(edit) @44263ca   10 years yanlili done #25 Change-Id: I8b123ac5f7112256274bba49b036fcddebdefbbe develop
(edit) @6de8042   10 years yanlili finish #23 Change-Id: I8abfa2d3d736ec904aa85820734280cb4e09db44 develop
(edit) @5efd9bf   10 years yanlili fixed #22 Change-Id: Ic9ad723ddb6cab0be41b824d48f972e92bb5bfec develop
Note: See TracRevisionLog for help on using the revision log.