Skip to content

Commit 30c0f85

Browse files
author
Arendelle
committed
rename Experiment.exit to Experiment.close
1 parent c293cbb commit 30c0f85

File tree

10 files changed

+101
-337
lines changed

10 files changed

+101
-337
lines changed

docs/docsgen/user-method.md

Whitespace-only changes.

docs/errors.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1-
# 异常 errors
1+
`physicsLab`也提供了一些自定义的异常类型
22

3-
## 警告 warning
4-
`physicsLab`抛出的警告默认会打印黄色的警告内容与有用的调用栈
3+
# 警告
4+
`physicsLab`抛出的警告类型都是`PhysicsLabWarning`,并且为该警告客制化了打印输出的格式
55

6-
如果希望更精细地自定义警告的行为, 请参阅python内置[warnings](https://docs.python.org/3/library/warnings.html)
6+
如果希望更精细地控制警告的行为 (比如忽略警告,将警告视为错误等等), 请参阅python内置[warnings](https://docs.python.org/3/library/warnings.html)模块
77

88
## 异常
99

10+
### ExperimentOpenedError
11+
尝试打开一个已经有某个`Experiment`的实例打开过的实验时,会抛出此异常
12+
13+
### ExperimentClosedError
14+
尝试在调用了`Experiment.close`之后使用该实例的方法时,会抛出此异常

docs/experiment.md

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ from physicsLab import *
4040

4141
expe = Experiment(OpenMode.load_by_sav_name, "example")
4242
expe.save()
43-
expe.exit()
43+
expe.close()
4444
```
4545
也就是说, with语句作用是自动帮你保存存档(但如果在with内部有异常发生,是不会保存存档的)
4646

@@ -87,7 +87,7 @@ from physicsLab import *
8787
expe = Experiment(OpenMode.crt, "example", ExperimentType.Circuit, force_crt=False)
8888
# do something
8989
expe.save()
90-
expe.exit()
90+
expe.close()
9191
```
9292

9393
* `experiment_type`参数用于指定创建实验的类型
@@ -133,7 +133,7 @@ user = web.User(YOUR_UESRNAME, YOUR_PASSWORD)
133133

134134
with Experiment(OpenMode.load_by_plar_app, "642cf37a494746375aae306a", Category.Discussion) as expe:
135135
expe.update(user, YOUR_IMAGE_PATH)
136-
expe.exit() # 这里手动调用了expe.exit()之后, `with Experiment`在退出的时候就不会执行默认的保存存档并退出的操作了
136+
expe.close() # 这里手动调用了expe.close()之后, `with Experiment`在退出的时候就不会执行默认的保存存档并退出的操作了
137137
# 也就是说,这样写,Experiment.save() 不会被调用
138138
```
139139

@@ -152,10 +152,10 @@ with Experiment(OpenMode.load_by_sav_name, "example") as expe:
152152
```Python
153153
from physicsLab import *
154154

155-
exp = Experiment(OpenMode.load_by_sav_name, "example")
155+
expe = Experiment(OpenMode.load_by_sav_name, "example")
156156
# do something
157-
exp.save()
158-
exp.exit()
157+
expe.save()
158+
expe.close()
159159
```
160160
`Experiment.save`也有一些参数:
161161
* `target_path`: 将存档写入自己指定的路径
@@ -168,7 +168,7 @@ from physicsLab import *
168168

169169
with Experiment(OpenMode.load_by_sav_name, "example") as expe:
170170
# do something
171-
expe.exit() # expe已经退出对存档的操作了, 就不会再在退出with的时候调用expe.save()了
171+
expe.close() # expe已经退出对存档的操作了, 就不会再在退出with的时候调用expe.save()了
172172
```
173173

174174
## 删除存档
@@ -178,8 +178,8 @@ from physicsLab import *
178178

179179
with Experiment(OpenMode.load_by_sav_name, "example") as expe:
180180
# maybe do something
181-
expe.exit(delete=True) # 在退出操作存档的时候执行删除存档的操作
182-
# 并且由于已经手动调用了expe.exit(), 在退出with的时候不会调用expe.save()了
181+
expe.close(delete=True) # 在退出操作存档的时候执行删除存档的操作
182+
# 并且由于已经手动调用了expe.close(), 在退出with的时候不会调用expe.save()了
183183
```
184184

185185
更原始的方式是:
@@ -188,20 +188,19 @@ from physicsLab import *
188188

189189
expe = Experiment(OpenMode.load_by_sav_name, "example")
190190
# maybe do something
191-
expe.exit(delete=True)
191+
expe.close(delete=True)
192192
```
193193

194-
> Note: `expe.exit(True)`这种写法会报错,因为这是一个`Keyword-Only argument`
194+
> Note: `expe.close(True)`这种写法会报错,因为这是一个`Keyword-Only argument`
195195
196196
## 停止操作存档
197-
***低级api***
198-
`Experiment.exit`会立刻停止对存档的操作:
197+
`Experiment.close`会立刻停止对存档的操作:
199198
```Python
200199
from physicsLab import *
201200

202201
exp = Experiment(OpenMode.load_by_sav_name, "example")
203202
# do something, 但未调用Experiment.save
204-
exp.exit()
203+
exp.close()
205204
# 对exp的所有修改都丢失了
206205
```
207206

@@ -211,7 +210,7 @@ from physicsLab import *
211210

212211
exp = Experiment(OpenMode.load_by_sav_name, "example")
213212
# do something
214-
exp.exit()
213+
exp.close()
215214

216215
Logic_Input() # error: 不可以在没有实验打开的情况下创建元件
217216
```
@@ -221,9 +220,9 @@ from physicsLab import *
221220

222221
expe = Experiment(OpenMode.load_by_sav_name, "example")
223222
# do something
224-
expe.exit()
223+
expe.close()
225224
# expe.save() # 无法对已经退出操作的存档调用任何Experiment的方法进行操作
226-
# expe.exit() # 无法重复调用.exit
225+
# expe.close() # 无法重复调用.close
227226
```
228227

229228
## 编辑存档的发布信息

docs/log.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,3 +241,4 @@
241241
20. 移除元件坐标系`set_O`
242242
21. 元件新增`identifier`参数用于指定元件的id
243243
22. 废弃`elementXYZ.is_elementXYZ()`
244+
23. 重命名`Experiment.exit``Experiment.close`

0 commit comments

Comments
 (0)