# # ChangeLog for / # # Generated by Trac 1.0.2 # 12/14/25 15:20:34 Wed, 30 Mar 2016 05:24:02 GMT zhangjr [5f0bc09] * src/dat/layout.json (modified) * src/main.py (modified) * src/model/diffractionSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/canvas.py (modified) * src/viewer/histogram.py (modified) * src/viewer/image.py (added) * src/viewer/mainTab.py (modified) * src/viewer/runData.py (modified) done #76 Change-Id: I1f1dce0d2afe6d3ec72893bcd609f305e00f58c5 Wed, 30 Mar 2016 02:42:45 GMT zhangjr [81bab43] * src/conf/__init__.py (modified) * src/conf/constants.py (modified) * src/json/backward.py (modified) * src/json/hotimage3D.py (modified) * src/json/hotimage4D.py (modified) * src/json/last.py (modified) * src/json/monitor.py (modified) * src/main.py (modified) * src/model/chopperModel.py (modified) * src/model/commonMethod.py (modified) * src/model/diffractionSimulator.py (modified) * src/model/neonReceiver.py (modified) * src/model/profileFunction.py (modified) * src/model/protonSimulator.py (modified) * src/neon/Neon.py (modified) * src/neon/__init__.py (modified) * src/neon/data/GPPDData.py (modified) * src/neon/data/__init__.py (modified) * src/neon/test/GPPDneon.py (modified) * src/neon/test/RPC.py (modified) * src/neon/test/Test.py (modified) * src/neon/test/__init__.py (modified) * src/presenter/progressBarThread.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/calibration.py (modified) * src/viewer/canvas.py (modified) * src/viewer/chopper.py (modified) * src/viewer/chopperSetting.py (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/sample.py (modified) * src/viewer/serverSetting.py (modified) * src/viewer/statusBar.py (modified) * src/viewer/subTab.py (modified) pep8 Change-Id: I5dc3b664c71ebf48d12907edea993a29677299e5 Wed, 30 Mar 2016 02:32:00 GMT zhangjr [0a2b800] * src/dat/layout.json (modified) * src/viewer/histogram.py (modified) done #75 Change-Id: I002175a15a6989d8ea8ceccc152e248e4f546952 Tue, 29 Mar 2016 01:33:38 GMT zhangjr [3aae9b0] * src/conf.py (deleted) rm conf.py #73 Change-Id: I066f27a9c598f0363ccdfb710a874eb9442cdfda Tue, 29 Mar 2016 01:22:01 GMT zhangjr [7273796] * src/conf/__init__.py (added) * src/conf/constants.py (added) * src/dat/layout.json (modified) * src/main.py (modified) * src/viewer/calibration.py (modified) * src/viewer/chopper.py (modified) * src/viewer/chopperSetting.py (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/reduction.py (modified) * src/viewer/runData.py (modified) * src/viewer/sample.py (modified) * src/viewer/serverSetting.py (modified) * src/viewer/statusBar.py (modified) * src/viewer/subTab.py (modified) add conf/constants.py #73 Change-Id: ... Mon, 28 Mar 2016 05:35:25 GMT zhangjr [82d9562] * src/dat/layout.json (modified) * src/model/neonReceiver.py (modified) * src/viewer/menuBar.py (modified) fixed #71 Change-Id: If98109e263919753314183c06de048d66b1659e3 Mon, 28 Mar 2016 01:20:38 GMT zhangjr [5e7dee7] * src/dat/layout.json (modified) * src/main.py (modified) * src/model/neonReceiver.py (modified) * src/neon/Neon.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/serverSetting.py (modified) done #68 Change-Id: Ia710c8d02aa6370dc28f9ce82bc1ce6dc5889256 Fri, 25 Mar 2016 08:19:29 GMT zhangjr [4ca381b] * src/dat/layout.json (modified) * src/model/neonReceiver.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/histogram.py (modified) done #69 Change-Id: Ia9f3a0170e1a5315ad9988395e859d973b4736e0 Fri, 25 Mar 2016 01:52:52 GMT yanll [40eefb6] * src/neon/Neon.py (added) * src/neon/README (added) * src/neon/__init__.py (added) * src/neon/data/GPPDData.py (added) * src/neon/data/__init__.py (added) * src/neon/test/GPPDneon.py (added) * src/neon/test/RPC.py (added) * src/neon/test/Test.py (added) * src/neon/test/__init__.py (added) add neon #66 Change-Id: Ia88b41f706a780c9eeecb77355fdc21aa2eee512 Fri, 25 Mar 2016 01:50:46 GMT yanll [0590ae9] * src/test/test.txt (added) test Change-Id: If08086c99374de6f14b0e8bf7845e47e2a32b3dc Fri, 25 Mar 2016 01:47:41 GMT yanll [5423c28] * src/README.txt (deleted) test test Change-Id: I5c67107067d1519b00e97998438d2c9533eaaa4e Fri, 25 Mar 2016 01:45:43 GMT yanll [969867e] * src/README.txt (added) test git Change-Id: I59e0e4edc14db14e6f6b621cd30c1aee49fb6bd1 Fri, 25 Mar 2016 01:29:42 GMT zhangjr [43e1112] * src/NEON (modified) NEON again #66 Change-Id: I0150a136e7984dcbd5690531839e8d30261fd87d Fri, 25 Mar 2016 01:19:25 GMT zhangjr [2151e66] * src/model/Neon.py (deleted) * src/model/neonConnetor.py (deleted) merge and push again #66 Change-Id: ... Fri, 25 Mar 2016 01:11:18 GMT zhangjr [a12304b] * src/viewer/menuBar.py (modified) * src/viewer/serverSetting.py (modified) put NEON folder #66 Change-Id: I42f43fb804f0f688215029b6fc229dc754c03e5e Thu, 24 Mar 2016 08:20:41 GMT zhangjr [457bd75] * src/NEON (added) * src/dat/layout.json (added) * src/model/neonReceiver.py (modified) * src/viewer/serverSetting.py (modified) done #66 Change-Id: I436e9634a36127cedeaa0ef3b4f6b37eea7cf209 Thu, 24 Mar 2016 02:57:11 GMT YAN Lili [aa834c1] * src/dat/layout.json (deleted) * src/viewer/histogram.py (modified) * src/viewer/serverSetting.py (modified) done #65 Change-Id: Ie6333b176ed5901f9b23a46b782ce25189d462a3 Thu, 24 Mar 2016 02:17:14 GMT zhangjr [d649752] * src/conf.py (modified) * src/dat/layout.json (modified) * src/model/neonConnetor.py (modified) * src/viewer/serverSetting.py (modified) improved #66 Change-Id: I2bf8b486a336dd970878c587223c00043876c918 Wed, 23 Mar 2016 10:19:21 GMT zhangjr [72f841d] * src/dat/layout.json (modified) * src/main.py (modified) * src/model/Neon.py (modified) * src/model/neonConnetor.py (modified) * src/model/neonReceiver.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/serverSetting.py (modified) update plot done #63 Change-Id: ... Wed, 23 Mar 2016 08:20:57 GMT Gerrit Code Review [7a13882] * src/model/Neon.py (added) * src/model/neonConnetor.py (added) * src/model/neonReceiver.py (added) * src/dat/layout.json (modified) * src/dat/layout1.json (deleted) * src/json/backward.py (added) * src/json/hotimage3D.py (added) * src/json/hotimage4D.py (added) * src/json/key.json (added) * src/json/last.py (added) * src/json/monitor.py (added) * src/json/monitor_value.json (added) * src/main.py (modified) * src/viewer/chopperSetting.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/serverSetting.py (added) * test/ipython_test.py (deleted) Merge "add NeonReceiver #63" into develop Wed, 23 Mar 2016 08:20:17 GMT zhangjr [413e214] * src/model/Neon.py (added) * src/model/neonConnetor.py (added) * src/model/neonReceiver.py (added) add NeonReceiver #63 Change-Id: ... Wed, 23 Mar 2016 08:17:42 GMT yanll [ee99f4c] * src/dat/layout.json (modified) * src/dat/layout1.json (deleted) * src/json/backward.py (added) * src/json/hotimage3D.py (added) * src/json/hotimage4D.py (added) * src/json/key.json (added) * src/json/last.py (added) * src/json/monitor.py (added) * src/json/monitor_value.json (added) * src/main.py (modified) * src/viewer/chopperSetting.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/serverSetting.py (added) * test/ipython_test.py (deleted) Data Streaming Dialog #64 Change-Id: ... Wed, 27 Jan 2016 07:33:22 GMT yanll [0a085f7] * src/dat/layout.json (modified) * src/viewer/menuBar.py (modified) * src/viewer/statusBar.py (modified) update statusbar #62 Change-Id: ... Wed, 27 Jan 2016 02:24:12 GMT yanll [6bb1fa6] * src/dat/layout.json (modified) * src/viewer/menuBar.py (modified) exit action #61 Change-Id: I00afdfd644d210ab44092f66fe32ea220cbba2dc Wed, 27 Jan 2016 01:52:49 GMT yanll [29c5212] * src/dat/layout.json (modified) * src/dat/save.txt (added) * src/viewer/menuBar.py (modified) save action #60 Change-Id: I0c192f37868f52c6986b3f3b5d576673c237c924 Tue, 26 Jan 2016 07:51:01 GMT yanll [00245a4] * src/dat/layout.json (modified) * src/dat/maskData.txt (added) * src/viewer/calibration.py (modified) export button and its action in Calibration #59 Change-Id: ... Tue, 26 Jan 2016 02:43:22 GMT yanll [10c8f8c] * src/dat/layout.json (modified) * src/viewer/calibration.py (modified) * src/viewer/chopper.py (modified) add QListWidge in Calibration #58 Change-Id: ... Fri, 22 Jan 2016 03:24:21 GMT yanll [b54e74d] * src/presenter/progressBarThread.py (modified) * src/viewer/experiment.py (modified) PrograssBar in Experiment #43 Change-Id: ... Thu, 21 Jan 2016 08:37:39 GMT yanll [b6dc0c2] * src/dat/layout.json (modified) * src/viewer/calibration.py (modified) * src/viewer/menuBar.py (modified) Add LoadButton action in Calibration #57 Change-Id: ... Thu, 21 Jan 2016 07:56:10 GMT yanll [b729cbc] * src/dat/layout.json (modified) * src/viewer/calibration.py (modified) * src/viewer/canvas.py (modified) done #56 Change-Id: Icf2b3af4fa15428841d9452e67efe7ba6b8cbb63 Thu, 21 Jan 2016 06:54:31 GMT yanll [f6251c4] * src/dat/layout.json (modified) * src/viewer/calibration.py (modified) * src/viewer/canvas.py (modified) * src/viewer/chopper.py (modified) * src/viewer/experiment.py (modified) Add two layers Canvas #55 Change-Id: ... Wed, 20 Jan 2016 08:32:28 GMT yanll [5339b89] * src/viewer/calibration.py (modified) done #54 Change-Id: I9fbe225a504cfd36de6eaef89caa811b6d7f2c7b Wed, 20 Jan 2016 03:14:16 GMT yanll [2ef5f42] * src/dat/layout.json (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) fixed #52 Change-Id: Id4b24c11ae9fac71cebeb3cc4035f17d805f6da1 Wed, 20 Jan 2016 02:22:05 GMT yanll [64894a8] * src/dat/layout.json (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) done #53 Change-Id: Ica2e6121bc89a3280e0b71e0213755521de51491 Tue, 19 Jan 2016 06:32:46 GMT yanll [a11f1a0] * src/conf.py (modified) * src/dat/layout.json (added) * src/dat/layout1.json (added) * src/main.py (modified) * src/viewer/chopper.py (modified) * src/viewer/experiment.py (modified) Save the last layout #50 Change-Id: ... Wed, 13 Jan 2016 07:49:53 GMT yanll [0623709] * src/viewer/experiment.py (modified) update #43 Change-Id: I12f80ad15b1971f8545624d553c7506ec89848bd Thu, 07 Jan 2016 08:36:04 GMT yanll [844fddb] * src/presenter/progressBarThread.py (modified) * src/viewer/experiment.py (modified) Add RadioButton and realize basic progressBar funciton #43 ... Wed, 06 Jan 2016 06:53:26 GMT zhangjr [190047a] * src/conf.py (modified) * src/main.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) many jobs #46 #47 #49 Change-Id: ... Wed, 06 Jan 2016 03:23:59 GMT yanll [3c783f8] * src/presenter/progressBarThread.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/histogram.py (modified) Combobox Unit convert #47 Change-Id: ... Wed, 06 Jan 2016 02:35:51 GMT zhangjr [aa4fe15] * src/presenter/updateStreaming.py (modified) done #47 Change-Id: If70080ca02791cf08e2617467275785bf0d8661c Wed, 06 Jan 2016 02:17:09 GMT yanll [9277c5e] * src/presenter/progressBarThread.py (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) realize Measurement Time ProgressBar #43 Change-Id: ... Wed, 06 Jan 2016 01:46:12 GMT zhangjr [68ba18e] * src/presenter/updateStreaming.py (modified) change pause and resume method #47 Change-Id: ... Wed, 06 Jan 2016 01:14:10 GMT zhangjr [4c0bd87] * src/model/diffractionSimulator.py (modified) * src/model/protonSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/experiment.py (modified) * src/viewer/mainTab.py (modified) add pause and resume #47 Change-Id: ... Tue, 05 Jan 2016 07:49:17 GMT zhangjr [ac44392] * src/viewer/calibration.py (modified) * src/viewer/chopper.py (modified) * src/viewer/experiment.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/reduction.py (modified) * src/viewer/sample.py (modified) add parent #45 Change-Id: I47ed5c75a6277b647769a0a754e4e62d9641c989 Tue, 05 Jan 2016 07:17:28 GMT zhangjr [a7bc539] * src/viewer/histogram.py (modified) button (resume) changed #42 Change-Id: ... Tue, 05 Jan 2016 06:33:24 GMT yanll [cf20e0c] * src/model/diffractionSimulator.py (modified) * src/presenter/progressBarThread.py (added) * src/presenter/updateStreaming.py (modified) * src/viewer/experiment.py (modified) All thread use try-except #40 Change-Id: ... Mon, 04 Jan 2016 06:54:54 GMT zhangjr [b5d184a] * src/model/protonSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/experiment.py (modified) use try-except #40 Change-Id: I7d89b4f6eff983cab68b1e0f305cf5ee21b2b190 Mon, 04 Jan 2016 00:52:54 GMT zhangjr [d1de436] * src/main.py (modified) * src/model/protonSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/experiment.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) trial solution #40 Change-Id: I678a9ece4d3a20d0403b0481364c90eb9e04025a Wed, 30 Dec 2015 02:13:45 GMT yanll [4b4396b] * src/viewer/histogram.py (modified) Finished #42 Change-Id: I06ec1fa4c58bc67851e005fbad64c312cad5f540 Tue, 29 Dec 2015 09:11:38 GMT yanll [2753a93] * src/conf.py (modified) * src/viewer/chopperSetting.py (added) * src/viewer/menuBar.py (modified) done #41 Change-Id: I037a32bf9ea157b2f340613cd104915955a511dc Tue, 29 Dec 2015 06:59:41 GMT zhangjr [675bd77] * src/img/logo.jpg (added) * src/main.py (modified) * src/model/profileFunction.py (modified) * src/viewer/experiment.py (modified) * src/viewer/mainTab.py (modified) second trial #31 Change-Id: I64712df47ff0af7e1b5c9920b94c69d17a09644d Tue, 29 Dec 2015 06:48:08 GMT zhangjr [fa068c1] * src/viewer/experiment.py (added) first trial #31 Change-Id: I00d04e99997107697a836663a6d7a86e4885adeb Tue, 29 Dec 2015 06:42:14 GMT yanll [d8311df] * src/img/1.jpg (moved) * src/main.py (modified) * src/model/diffractionSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/histogram.py (modified) * src/viewer/menuBar.py (modified) fixed #18 Change-Id: Ic022a52139b240d543643d6d16bbafc116e3247d Tue, 29 Dec 2015 06:31:49 GMT zhangjr [29162b3] * src/presenter/updateStreaming.py (modified) done #39 Change-Id: Ifbe16f8b323e58f4aa54da54866e2246d11cb940 Tue, 29 Dec 2015 06:25:03 GMT zhangjr [3697c4b] * src/model/protonSimulator.py (modified) A bug fixed #37 Change-Id: I1ea0eb3288df70f7dcc4c039e0dca091150b5c2b Tue, 29 Dec 2015 06:23:12 GMT zhangjr [519b118] * src/model/commonMethod.py (added) Add getColumnFrom2DList method #38 Change-Id: ... Tue, 29 Dec 2015 03:57:22 GMT zhangjr [26fd158] * src/model/profileFunction.py (added) * src/model/protonSimulator.py (added) trial #37 Change-Id: I266c1ae86bafb9d7c3ef109f3e62690ccf2238da Tue, 29 Dec 2015 02:04:18 GMT zhangjr [055279c] * src/viewer/chopper.py (modified) done #29 Change-Id: I25a9d1b6bb96657be77075fa0f42690cc5a1040c Tue, 29 Dec 2015 01:38:14 GMT Gerrit Code Review [9c6c4b2] * src/viewer/chopper.py (modified) Merge "solved #30" into develop Tue, 29 Dec 2015 01:33:59 GMT zhangjr [0909119] * src/1.jpg (added) * src/main.py (modified) * src/viewer/chopper.py (modified) * src/viewer/histogram.py (modified) solved #30 Change-Id: I60ca1b4f867dac05d7e9225a6bdcf1200c4597be Tue, 29 Dec 2015 01:22:31 GMT yanll [2808b37] * src/1.jpg (added) * src/main.py (modified) * src/viewer/histogram.py (modified) fixed #33 Change-Id: Ibec820791b13f44e1f8007906cbf2644e665996a Mon, 28 Dec 2015 09:27:16 GMT yanll [9c91405] * src/conf.py (modified) * src/model/diffractionSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/histogram.py (modified) fixed #34 Change-Id: I0b0c1bf9daddf9b674f0b6b719f9b497504fbfb9 Fri, 25 Dec 2015 08:47:34 GMT zhangjr [f48e5ad] * src/model/chopperModel.py (modified) * src/viewer/chopper.py (modified) fixed #24 Change-Id: I3420f176fe0c9eafa07787bf27eafabc3eca374f Fri, 25 Dec 2015 08:02:05 GMT durong [5d7b7ca] * src/doc/readme.txt (added) done #28 Change-Id: I3bb655c98d7ace98e690715101ddfd937269ea8c Fri, 25 Dec 2015 06:08:06 GMT yanll [1640caa] * src/viewer/analysis.py (deleted) * src/viewer/hotimage.py (deleted) * src/viewer/mainTab.py (modified) fix #27 Change-Id: Ia872fdc308d12dc5eb2f2d85c66cfd63f70ba759 Fri, 25 Dec 2015 03:00:35 GMT yanll [7992ea4] * src/model/chopperModel.py (modified) * src/viewer/chopper.py (modified) * src/viewer/mainTab.py (modified) done #26 Change-Id: I3b10940ffe383a1bac4db439be699b01fa97ca6e Thu, 24 Dec 2015 09:44:34 GMT yanll [44263ca] * src/viewer/chopper.py (modified) done #25 Change-Id: I8b123ac5f7112256274bba49b036fcddebdefbbe Thu, 24 Dec 2015 09:02:07 GMT yanll [6de8042] * src/viewer/chopper.py (modified) finish #23 Change-Id: I8abfa2d3d736ec904aa85820734280cb4e09db44 Thu, 24 Dec 2015 07:18:19 GMT yanll [5efd9bf] * src/viewer/chopper.py (modified) fixed #22 Change-Id: Ic9ad723ddb6cab0be41b824d48f972e92bb5bfec Thu, 24 Dec 2015 05:56:06 GMT zhangjr [6e61c20] * src/model/chopperModel.py (modified) * src/viewer/mainTab.py (modified) done #20 Change-Id: Ia5f4816703b87d05f54ad02992da6d9d3f8c972c Wed, 23 Dec 2015 08:33:03 GMT zhangjr [3dfa0c1] * src/conf.py (modified) * src/dat/3d.py (modified) * src/main.py (modified) * src/model/__init__.py (modified) * src/model/chopperModel.py (modified) * src/model/diffractionSimulator.py (modified) * src/model/getROI.py (modified) * src/model/globalClass.py (modified) * src/model/peakFinder.py (modified) * src/model/readData.py (modified) * src/model/readFile.py (modified) * src/model/readImage.py (modified) * src/model/slitModel.py (modified) * src/presenter/__init__.py (modified) * src/presenter/slitSignal.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/__init__.py (modified) * src/viewer/analysis.py (modified) * src/viewer/calibration.py (modified) * src/viewer/canvas.py (modified) * src/viewer/chopper.py (modified) * src/viewer/histogram.py (modified) * src/viewer/hotimage.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) * src/viewer/reduction.py (modified) * src/viewer/runData.py (modified) * src/viewer/runList.py (modified) * src/viewer/statusBar.py (modified) * src/viewer/subTab.py (modified) done #17 Change-Id: I02f0aa8864c0f0a7827c0cb21d708bb18eca9464 Wed, 23 Dec 2015 05:47:07 GMT zhangjr [b826c71] * src/model/diffractionSimulator.py (modified) * src/presenter/updateStreaming.py (modified) * src/viewer/histogram.py (modified) finished #16 Change-Id: I00686f2823fabff1666036c51ba1dc3b21be719c Wed, 23 Dec 2015 05:26:51 GMT yanll [a995294] * src/main.py (modified) * src/viewer/analysis.py (modified) * src/viewer/canvas.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) fixed #15 Change-Id: Ib9721ae3df0abe8ccee51e7a74d8701f0243eb8a Wed, 23 Dec 2015 02:53:25 GMT zhangjr [db90f23] * src/model/diffractionSimulator.py (modified) bug fixed #14 Change-Id: I73895823e98382261d11113ee8990d332e65ff3c Wed, 23 Dec 2015 00:47:10 GMT yanll [a450ab4] * src/main.py (modified) * src/viewer/analysis.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) Refresh 3D Canvas #13 Change-Id: ... Tue, 22 Dec 2015 09:38:21 GMT yanll [d8aea5e] * src/presenter/updateStreaming.py (moved) Add 3D animation #12 Change-Id: ... Tue, 22 Dec 2015 09:05:47 GMT zhangjr [e7ee3d2] * src/model/diffractionSimulator.py (modified) * src/presenter/updateStreaming2D.py (modified) Add sampling options #10 Change-Id: ... Tue, 22 Dec 2015 06:17:22 GMT yanll [98c4f05] * src/main.py (modified) * src/presenter/updateStreaming2D.py (added) * src/viewer/analysis.py (modified) * src/viewer/histogram.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/menuBar.py (modified) update #12 Change-Id: I219156784c7af15f5fee97bfb45165e641d39c61 Mon, 21 Dec 2015 08:18:08 GMT zhangjr [a821b09] * src/dat/gppd.dat (added) add gppd.dat and monitor.dat #10 Change-Id: ... Mon, 21 Dec 2015 07:44:18 GMT zhangjr [47830d2] * src/model/globalClass.py (added) add globalClass #10 Change-Id: I0d5b99cf0563700464ead9b82281e510482bfc53 Mon, 21 Dec 2015 07:40:42 GMT Gerrit Code Review [d72b178] * src/model/diffractionSimulator.py (added) * src/main.py (modified) * src/model/chopperModel.py (modified) * src/viewer/analysis.py (modified) * src/viewer/calibration.py (modified) * src/viewer/calibration1.py (deleted) * src/viewer/chopper.py (modified) * src/viewer/histogram.py (modified) * src/viewer/hotimage.py (modified) * src/viewer/menuBar.py (added) * src/viewer/reduction.py (modified) * src/viewer/sample.py (modified) * src/viewer/statusBar.py (added) * test/ipython_test.py (modified) Merge "first test #10" into develop Mon, 21 Dec 2015 07:37:50 GMT zhangjr [44b2f5b] * src/model/diffractionSimulator.py (added) first test #10 Change-Id: I192e7ad1f6cd2c54cc5c2f503b58941f8b29a13e Mon, 21 Dec 2015 07:36:49 GMT yanll [0059ef2] * test/ipython_test.py (modified) update #11 Change-Id: I9d0785b94fddf194f12ee188ee95df66c4d76dc5 Fri, 18 Dec 2015 08:49:45 GMT yanll [86caef1] * src/main.py (modified) * src/model/chopperModel.py (modified) * src/viewer/analysis.py (modified) * src/viewer/calibration.py (modified) * src/viewer/calibration1.py (deleted) * src/viewer/chopper.py (modified) * src/viewer/histogram.py (modified) * src/viewer/hotimage.py (modified) * src/viewer/menuBar.py (added) * src/viewer/reduction.py (modified) * src/viewer/sample.py (modified) * src/viewer/statusBar.py (added) update #11 Change-Id: Icb8ef9d397c3fa018bb5188d3858b2d98d18f4a6 Wed, 16 Dec 2015 08:58:46 GMT yanll [454d065] * src/viewer/guishell.py (modified) fixed #8 Change-Id: If235de3e5ca5f925a2597723ea7131a620239aac Wed, 16 Dec 2015 08:12:09 GMT yanll [ce93c29] * test/ipython_test.py (added) added #7 Change-Id: I5501cf7f8b7ac5c798106f0e0815db6f8572306c Wed, 16 Dec 2015 08:02:12 GMT yanll [1fe89fd] * src/viewer/guishell.py (modified) fixed #6 Change-Id: I6fa0c0690683e5f04e6466e8423882b9b097cfcc Tue, 08 Dec 2015 02:59:43 GMT zhangjr [29a7166] * src/conf.py (modified) * src/dat/3d.py (modified) * src/dat/ReadData.py (modified) * src/main.py (modified) * src/model/__init__.py (modified) * src/model/chopperModel.py (modified) * src/model/getROI.py (modified) * src/model/peakFinder.py (modified) * src/model/readData.py (modified) * src/model/readFile.py (modified) * src/model/readImage.py (modified) * src/model/sampleModel.py (modified) * src/model/slitModel.py (modified) * src/presenter/__init__.py (modified) * src/presenter/slitSignal.py (modified) * src/viewer/__init__.py (modified) * src/viewer/analysis.py (modified) * src/viewer/calibration.py (modified) * src/viewer/calibration1.py (modified) * src/viewer/canvas.py (modified) * src/viewer/chopper.py (modified) * src/viewer/guishell.py (modified) * src/viewer/histogram.py (modified) * src/viewer/hotimage.py (modified) * src/viewer/mainTab.py (modified) * src/viewer/reduction.py (modified) * src/viewer/runData.py (modified) * src/viewer/runList.py (modified) * src/viewer/sample.py (modified) * src/viewer/subTab.py (modified) PEP8 re-formatting done #4 Change-Id: ... Mon, 07 Dec 2015 09:00:52 GMT zhangjr [c452604] * src/doc/install.txt (added) installation guide added #3 Change-Id: ... Mon, 07 Dec 2015 08:21:41 GMT zhangjr [2701891] * src/viewer/reduction.py (modified) bug fixed #2 Change-Id: Id849cdffb7d34f5b4d9a45bfa7695491d822ca3b Mon, 07 Dec 2015 08:12:42 GMT zhangjr [f491a95] * src/viewer/guishell.py (modified) ticket:1 Change-Id: Ide12978432a72ccf6fb6f95786b5c62f08199b07 Mon, 07 Dec 2015 08:03:00 GMT zhangjr [8834915] * src/viewer/Ipython.py (deleted) remove Ipython.py Change-Id: Ief63747574a2fdd0c1cdb29e40c39601e64d93fc Mon, 07 Dec 2015 01:25:50 GMT zhangjr [e365a44] * .gitignore (added) add .gitignore file Change-Id: I082cb03b9d311ea0ae8290548f307a5edf076fe7 Mon, 07 Dec 2015 01:21:25 GMT zhangjr [6f47129] * src/.DS_Store (deleted) * src/conf.pyc (deleted) * src/dat/3d.py~ (deleted) * src/model/.slitModel.py.swp (deleted) * src/model/__init__.pyc (deleted) * src/model/chopperModel.pyc (deleted) * src/model/getROI.pyc (deleted) * src/model/peakFinder.pyc (deleted) * src/model/readData.pyc (deleted) * src/model/readFile.pyc (deleted) * src/model/readImage.pyc (deleted) * src/model/sampleModel.pyc (deleted) * src/model/slitModel.pyc (deleted) * src/presenter/.DS_Store (deleted) * src/viewer/.DS_Store (deleted) * src/viewer/Ipython.pyc (deleted) * src/viewer/__init__.pyc (deleted) * src/viewer/analysis.pyc (deleted) * src/viewer/calibration.pyc (deleted) * src/viewer/calibration1.pyc (deleted) * src/viewer/canvas.pyc (deleted) * src/viewer/chopper.pyc (deleted) * src/viewer/histogram.pyc (deleted) * src/viewer/hotimage.pyc (deleted) * src/viewer/mainTab.pyc (deleted) * src/viewer/reduction.pyc (deleted) * src/viewer/runData.pyc (deleted) * src/viewer/runList.pyc (deleted) * src/viewer/sample.pyc (deleted) * src/viewer/subTab.pyc (deleted) remove .pyc files Change-Id: I7ce315f71ebad693372278ec503a3bfbf43d868f Fri, 04 Dec 2015 09:53:03 GMT Gerrit Code Review [f21fb39] * src/conf.pyc (modified) * src/model/__init__.pyc (modified) * src/model/chopperModel.pyc (modified) * src/model/getROI.pyc (modified) * src/model/peakFinder.pyc (modified) * src/model/readData.pyc (modified) * src/model/readFile.pyc (modified) * src/model/readImage.pyc (modified) * src/model/sampleModel.pyc (modified) * src/model/slitModel.pyc (modified) * src/viewer/Ipython.pyc (modified) * src/viewer/__init__.pyc (modified) * src/viewer/analysis.pyc (modified) * src/viewer/calibration.pyc (modified) * src/viewer/calibration1.pyc (modified) * src/viewer/canvas.pyc (modified) * src/viewer/chopper.pyc (modified) * src/viewer/histogram.pyc (modified) * src/viewer/hotimage.pyc (modified) * src/viewer/mainTab.pyc (modified) * src/viewer/reduction.pyc (modified) * src/viewer/runData.pyc (modified) * src/viewer/runList.pyc (modified) * src/viewer/sample.pyc (modified) * src/viewer/subTab.pyc (modified) * src/viewer/guishell.py (added) * src/viewer/subTab.py (modified) Merge "remove .pyc" into develop Fri, 04 Dec 2015 09:51:00 GMT yanll [69db6a0] * src/conf.pyc (modified) * src/model/__init__.pyc (modified) * src/model/chopperModel.pyc (modified) * src/model/getROI.pyc (modified) * src/model/peakFinder.pyc (modified) * src/model/readData.pyc (modified) * src/model/readFile.pyc (modified) * src/model/readImage.pyc (modified) * src/model/sampleModel.pyc (modified) * src/model/slitModel.pyc (modified) * src/viewer/Ipython.pyc (modified) * src/viewer/__init__.pyc (modified) * src/viewer/analysis.pyc (modified) * src/viewer/calibration.pyc (modified) * src/viewer/calibration1.pyc (modified) * src/viewer/canvas.pyc (modified) * src/viewer/chopper.pyc (modified) * src/viewer/histogram.pyc (modified) * src/viewer/hotimage.pyc (modified) * src/viewer/mainTab.pyc (modified) * src/viewer/reduction.pyc (modified) * src/viewer/runData.pyc (modified) * src/viewer/runList.pyc (modified) * src/viewer/sample.pyc (modified) * src/viewer/subTab.pyc (modified) remove .pyc Change-Id: Ifec7c5e1d3aa619b301f458bce2137580f0a5fe4 Fri, 04 Dec 2015 09:13:48 GMT zhangjr [c0dd1c2] * src/viewer/guishell.py (added) * src/viewer/subTab.py (modified) rename Ipyton.py to guishell.py Change-Id: ... Fri, 04 Dec 2015 08:24:17 GMT yanll [731f6ca] * src/conf.pyc (modified) * src/model/__init__.pyc (modified) * src/model/chopperModel.pyc (modified) * src/model/getROI.pyc (modified) * src/model/peakFinder.pyc (modified) * src/model/readData.pyc (modified) * src/model/readFile.pyc (modified) * src/model/readImage.pyc (modified) * src/model/sampleModel.pyc (modified) * src/model/slitModel.pyc (modified) * src/viewer/.Ipython.py.swp (deleted) * src/viewer/Ipython.pyc (modified) * src/viewer/__init__.pyc (modified) * src/viewer/analysis.pyc (modified) * src/viewer/calibration.pyc (modified) * src/viewer/calibration1.pyc (modified) * src/viewer/canvas.pyc (modified) * src/viewer/chopper.pyc (modified) * src/viewer/histogram.pyc (modified) * src/viewer/hotimage.pyc (modified) * src/viewer/mainTab.pyc (modified) * src/viewer/reduction.pyc (modified) * src/viewer/runData.pyc (modified) * src/viewer/runList.pyc (modified) * src/viewer/sample.pyc (modified) * src/viewer/subTab.pyc (modified) * src20151010/.DS_Store (deleted) * src20151010/conf.py (deleted) * src20151010/conf.pyc (deleted) * src20151010/dat/1.dot (deleted) * src20151010/dat/2d-sample.dat (deleted) * src20151010/dat/2d-x.dat (deleted) * src20151010/dat/2d-y.dat (deleted) * src20151010/dat/3d.dat (deleted) * src20151010/dat/3d.py (deleted) * src20151010/dat/3d.py~ (deleted) * src20151010/dat/3d0.dat (deleted) * src20151010/dat/3d1.dat (deleted) * src20151010/dat/3d2.dat (deleted) * src20151010/dat/DPHM.dat (deleted) * src20151010/dat/ReadData.py (deleted) * src20151010/dat/detector.dat (deleted) * src20151010/dat/flowchart.dot (deleted) * src20151010/dat/monitor.dat (deleted) * src20151010/dat/refl.dat (deleted) * src20151010/img/XT ++.png (deleted) * src20151010/img/XT +-.png (deleted) * src20151010/img/XT -+.png (deleted) * src20151010/img/XT --.png (deleted) * src20151010/img/XY ++.png (deleted) * src20151010/img/XY +-.png (deleted) * src20151010/img/XY -+.png (deleted) * src20151010/img/XY --.png (deleted) * src20151010/img/flowchart.png (deleted) * src20151010/main.py (deleted) * src20151010/model/.slitModel.py.swp (deleted) * src20151010/model/__init__.py (deleted) * src20151010/model/__init__.pyc (deleted) * src20151010/model/chopperModel.py (deleted) * src20151010/model/chopperModel.pyc (deleted) * src20151010/model/getROI.py (deleted) * src20151010/model/getROI.pyc (deleted) * src20151010/model/peakFinder.py (deleted) * src20151010/model/peakFinder.pyc (deleted) * src20151010/model/readData.py (deleted) * src20151010/model/readData.pyc (deleted) * src20151010/model/readFile.py (deleted) * src20151010/model/readFile.pyc (deleted) * src20151010/model/readImage.py (deleted) * src20151010/model/readImage.pyc (deleted) * src20151010/model/sampleModel.py (deleted) * src20151010/model/sampleModel.pyc (deleted) * src20151010/model/slitModel.py (deleted) * src20151010/model/slitModel.pyc (deleted) * src20151010/presenter/.DS_Store (deleted) * src20151010/presenter/__init__.py (deleted) * src20151010/presenter/slitSignal.py (deleted) * src20151010/viewer/.DS_Store (deleted) * src20151010/viewer/Ipython.py (deleted) * src20151010/viewer/Ipython.pyc (deleted) * src20151010/viewer/__init__.py (deleted) * src20151010/viewer/__init__.pyc (deleted) * src20151010/viewer/analysis.py (deleted) * src20151010/viewer/analysis.pyc (deleted) * src20151010/viewer/calibration.py (deleted) * src20151010/viewer/calibration.pyc (deleted) * src20151010/viewer/calibration1.py (deleted) * src20151010/viewer/calibration1.pyc (deleted) * src20151010/viewer/canvas.py (deleted) * src20151010/viewer/canvas.pyc (deleted) * src20151010/viewer/chopper.py (deleted) * src20151010/viewer/chopper.pyc (deleted) * src20151010/viewer/histogram.py (deleted) * src20151010/viewer/histogram.pyc (deleted) * src20151010/viewer/hotimage.py (deleted) * src20151010/viewer/hotimage.pyc (deleted) * src20151010/viewer/mainTab.py (deleted) * src20151010/viewer/mainTab.pyc (deleted) * src20151010/viewer/reduction.py (deleted) * src20151010/viewer/reduction.pyc (deleted) * src20151010/viewer/runData.py (deleted) * src20151010/viewer/runData.pyc (deleted) * src20151010/viewer/runList.py (deleted) * src20151010/viewer/runList.pyc (deleted) * src20151010/viewer/sample.py (deleted) * src20151010/viewer/sample.pyc (deleted) * src20151010/viewer/subTab.py (deleted) * src20151010/viewer/subTab.pyc (deleted) delete other version Change-Id: ... Thu, 03 Dec 2015 08:43:56 GMT yanll [d68a4a7] * src/viewer/runList.py (modified) from json file add treeWidget in runList.py Change-Id: ... Thu, 03 Dec 2015 07:54:42 GMT yanll [62a01f7] * src/conf.pyc (modified) * src/dat/summary.json (added) * src/model/__init__.pyc (added) * src/model/chopperModel.pyc (added) * src/model/getROI.pyc (added) * src/model/peakFinder.pyc (added) * src/model/readData.pyc (added) * src/model/readFile.pyc (added) * src/model/readImage.pyc (added) * src/model/sampleModel.pyc (added) * src/model/slitModel.pyc (added) * src/model/summary.json (added) * src/viewer/.Ipython.py.swp (added) * src/viewer/Ipython.pyc (added) * src/viewer/__init__.pyc (added) * src/viewer/analysis.pyc (added) * src/viewer/calibration.pyc (added) * src/viewer/calibration1.pyc (added) * src/viewer/canvas.pyc (added) * src/viewer/chopper.pyc (added) * src/viewer/histogram.pyc (added) * src/viewer/hotimage.pyc (added) * src/viewer/mainTab.pyc (added) * src/viewer/reduction.pyc (added) * src/viewer/runData.pyc (added) * src/viewer/runList.py (modified) * src/viewer/runList.pyc (added) * src/viewer/sample.pyc (added) * src/viewer/subTab.pyc (added) * src20151010/.DS_Store (added) * src20151010/conf.py (added) * src20151010/conf.pyc (added) * src20151010/dat/1.dot (added) * src20151010/dat/2d-sample.dat (added) * src20151010/dat/2d-x.dat (added) * src20151010/dat/2d-y.dat (added) * src20151010/dat/3d.dat (added) * src20151010/dat/3d.py (added) * src20151010/dat/3d.py~ (added) * src20151010/dat/3d0.dat (added) * src20151010/dat/3d1.dat (added) * src20151010/dat/3d2.dat (added) * src20151010/dat/DPHM.dat (added) * src20151010/dat/ReadData.py (added) * src20151010/dat/detector.dat (added) * src20151010/dat/flowchart.dot (added) * src20151010/dat/monitor.dat (added) * src20151010/dat/refl.dat (added) * src20151010/img/XT ++.png (added) * src20151010/img/XT +-.png (added) * src20151010/img/XT -+.png (added) * src20151010/img/XT --.png (added) * src20151010/img/XY ++.png (added) * src20151010/img/XY +-.png (added) * src20151010/img/XY -+.png (added) * src20151010/img/XY --.png (added) * src20151010/img/flowchart.png (added) * src20151010/main.py (added) * src20151010/model/.slitModel.py.swp (added) * src20151010/model/__init__.py (added) * src20151010/model/__init__.pyc (added) * src20151010/model/chopperModel.py (added) * src20151010/model/chopperModel.pyc (added) * src20151010/model/getROI.py (added) * src20151010/model/getROI.pyc (added) * src20151010/model/peakFinder.py (added) * src20151010/model/peakFinder.pyc (added) * src20151010/model/readData.py (added) * src20151010/model/readData.pyc (added) * src20151010/model/readFile.py (added) * src20151010/model/readFile.pyc (added) * src20151010/model/readImage.py (added) * src20151010/model/readImage.pyc (added) * src20151010/model/sampleModel.py (added) * src20151010/model/sampleModel.pyc (added) * src20151010/model/slitModel.py (added) * src20151010/model/slitModel.pyc (added) * src20151010/presenter/.DS_Store (added) * src20151010/presenter/__init__.py (added) * src20151010/presenter/slitSignal.py (added) * src20151010/viewer/.DS_Store (added) * src20151010/viewer/Ipython.py (added) * src20151010/viewer/Ipython.pyc (added) * src20151010/viewer/__init__.py (added) * src20151010/viewer/__init__.pyc (added) * src20151010/viewer/analysis.py (added) * src20151010/viewer/analysis.pyc (added) * src20151010/viewer/calibration.py (added) * src20151010/viewer/calibration.pyc (added) * src20151010/viewer/calibration1.py (added) * src20151010/viewer/calibration1.pyc (added) * src20151010/viewer/canvas.py (added) * src20151010/viewer/canvas.pyc (added) * src20151010/viewer/chopper.py (added) * src20151010/viewer/chopper.pyc (added) * src20151010/viewer/histogram.py (added) * src20151010/viewer/histogram.pyc (added) * src20151010/viewer/hotimage.py (added) * src20151010/viewer/hotimage.pyc (added) * src20151010/viewer/mainTab.py (added) * src20151010/viewer/mainTab.pyc (added) * src20151010/viewer/reduction.py (added) * src20151010/viewer/reduction.pyc (added) * src20151010/viewer/runData.py (added) * src20151010/viewer/runData.pyc (added) * src20151010/viewer/runList.py (added) * src20151010/viewer/runList.pyc (added) * src20151010/viewer/sample.py (added) * src20151010/viewer/sample.pyc (added) * src20151010/viewer/subTab.py (added) * src20151010/viewer/subTab.pyc (added) runList update Change-Id: Ia60ab54d7fb50bc935ee6e3877f4f2748783e245