wangchunlin
/
cvat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use cache default (#2321)

Browse Source 
* Use cache default

* Update version
main
Maria Khrustaleva 5 years ago committed by GitHub
parent 7543f5ef6f
commit f31b7a532a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 101 additions and 149 deletions
Show Stats Download Patch File Download Diff File

250
cvat-ui/src/components/create-task-page/advanced-configuration-form.tsx
Unescape Escape View File

@ -41,8 +41,7 @@ function isPositiveInteger(_: any, value: any, callback: any): void {
} }
const intValue = +value; const intValue = +value;
if (Number.isNaN(intValue) if (Number.isNaN(intValue) || !Number.isInteger(intValue) || intValue < 1) {
|| !Number.isInteger(intValue) || intValue < 1) {
callback('Value must be a positive integer'); callback('Value must be a positive integer');
} }
@ -70,10 +69,7 @@ function isIntegerRange(min: number, max: number, _: any, value: any, callback:
} }
const intValue = +value; const intValue = +value;
if (Number.isNaN(intValue) if (Number.isNaN(intValue) || !Number.isInteger(intValue) || intValue < min || intValue > max) {
|| !Number.isInteger(intValue)
|| intValue < min || intValue > max
) {
callback(`Value must be an integer [${min}, ${max}]`); callback(`Value must be an integer [${min}, ${max}]`);
} }
@ -83,10 +79,7 @@ function isIntegerRange(min: number, max: number, _: any, value: any, callback:
class AdvancedConfigurationForm extends React.PureComponent<Props> { class AdvancedConfigurationForm extends React.PureComponent<Props> {
public submit(): Promise<void> { public submit(): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const { const { form, onSubmit } = this.props;
form,
onSubmit,
} = this.props;
form.validateFields((error, values): void => { form.validateFields((error, values): void => {
if (!error) { if (!error) {
@ -97,8 +90,10 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
reject(new Error('Segment size must be more than overlap size')); reject(new Error('Segment size must be more than overlap size'));
} }
if (typeof (values.startFrame) !== 'undefined' && typeof (values.stopFrame) !== 'undefined' if (
&& +values.stopFrame < +values.startFrame typeof values.startFrame !== 'undefined' &&
typeof values.stopFrame !== 'undefined' &&
+values.stopFrame < +values.startFrame
) { ) {
reject(new Error('Stop frame must be more or equal start frame')); reject(new Error('Stop frame must be more or equal start frame'));
} }
@ -129,9 +124,7 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
valuePropName: 'checked', valuePropName: 'checked',
})( })(
<Checkbox> <Checkbox>
<Text className='cvat-text-color'> <Text className='cvat-text-color'>Z-order</Text>
Z-order
</Text>
</Checkbox>, </Checkbox>,
)} )}
</Form.Item> </Form.Item>
@ -146,19 +139,16 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
<Tooltip title='Defines image quality level' mouseLeaveDelay={0}> <Tooltip title='Defines image quality level' mouseLeaveDelay={0}>
{form.getFieldDecorator('imageQuality', { {form.getFieldDecorator('imageQuality', {
initialValue: 70, initialValue: 70,
rules: [{ rules: [
required: true, {
message: 'The field is required.', required: true,
}, { message: 'The field is required.',
validator: isIntegerRange.bind(null, 5, 100), },
}], {
})( validator: isIntegerRange.bind(null, 5, 100),
<Input },
size='large' ],
type='number' })(<Input size='large' type='number' suffix={<Icon type='percentage' />} />)}
suffix={<Icon type='percentage' />}
/>,
)}
</Tooltip> </Tooltip>
</Form.Item> </Form.Item>
); );
@ -171,12 +161,12 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
<Form.Item label={<span>Overlap size</span>}> <Form.Item label={<span>Overlap size</span>}>
<Tooltip title='Defines a number of intersected frames between different segments' mouseLeaveDelay={0}> <Tooltip title='Defines a number of intersected frames between different segments' mouseLeaveDelay={0}>
{form.getFieldDecorator('overlapSize', { {form.getFieldDecorator('overlapSize', {
rules: [{ rules: [
validator: isNonNegativeInteger, {
}], validator: isNonNegativeInteger,
})( },
<Input size='large' type='number' />, ],
)} })(<Input size='large' type='number' />)}
</Tooltip> </Tooltip>
</Form.Item> </Form.Item>
); );
@ -189,12 +179,12 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
<Form.Item label={<span>Segment size</span>}> <Form.Item label={<span>Segment size</span>}>
<Tooltip title='Defines a number of frames in a segment' mouseLeaveDelay={0}> <Tooltip title='Defines a number of frames in a segment' mouseLeaveDelay={0}>
{form.getFieldDecorator('segmentSize', { {form.getFieldDecorator('segmentSize', {
rules: [{ rules: [
validator: isPositiveInteger, {
}], validator: isPositiveInteger,
})( },
<Input size='large' type='number' />, ],
)} })(<Input size='large' type='number' />)}
</Tooltip> </Tooltip>
</Form.Item> </Form.Item>
); );
@ -206,17 +196,12 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<Form.Item label={<span>Start frame</span>}> <Form.Item label={<span>Start frame</span>}>
{form.getFieldDecorator('startFrame', { {form.getFieldDecorator('startFrame', {
rules: [{ rules: [
validator: isNonNegativeInteger, {
}], validator: isNonNegativeInteger,
})( },
<Input ],
size='large' })(<Input size='large' type='number' min={0} step={1} />)}
type='number'
min={0}
step={1}
/>,
)}
</Form.Item> </Form.Item>
); );
} }
@ -227,17 +212,12 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<Form.Item label={<span>Stop frame</span>}> <Form.Item label={<span>Stop frame</span>}>
{form.getFieldDecorator('stopFrame', { {form.getFieldDecorator('stopFrame', {
rules: [{ rules: [
validator: isNonNegativeInteger, {
}], validator: isNonNegativeInteger,
})( },
<Input ],
size='large' })(<Input size='large' type='number' min={0} step={1} />)}
type='number'
min={0}
step={1}
/>,
)}
</Form.Item> </Form.Item>
); );
} }
@ -248,17 +228,12 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<Form.Item label={<span>Frame step</span>}> <Form.Item label={<span>Frame step</span>}>
{form.getFieldDecorator('frameStep', { {form.getFieldDecorator('frameStep', {
rules: [{ rules: [
validator: isPositiveInteger, {
}], validator: isPositiveInteger,
})( },
<Input ],
size='large' })(<Input size='large' type='number' min={1} step={1} />)}
type='number'
min={1}
step={1}
/>,
)}
</Form.Item> </Form.Item>
); );
} }
@ -273,9 +248,7 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
initialValue: false, initialValue: false,
})( })(
<Checkbox> <Checkbox>
<Text className='cvat-text-color'> <Text className='cvat-text-color'>Use LFS (Large File Support):</Text>
Use LFS (Large File Support):
</Text>
</Checkbox>, </Checkbox>,
)} )}
</Form.Item> </Form.Item>
@ -292,24 +265,26 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
extra='Attach a repository to store annotations there' extra='Attach a repository to store annotations there'
> >
{form.getFieldDecorator('repository', { {form.getFieldDecorator('repository', {
rules: [{ rules: [
validator: (_, value, callback): void => { {
if (!value) { validator: (_, value, callback): void => {
callback(); if (!value) {
} else { callback();
const [url, path] = value.split(/\s+/); } else {
if (!patterns.validateURL.pattern.test(url)) { const [url, path] = value.split(/\s+/);
callback('Git URL is not a valid'); if (!patterns.validateURL.pattern.test(url)) {
} callback('Git URL is not a valid');
}
if (path && !patterns.validatePath.pattern.test(path)) {
callback('Git path is not a valid'); if (path && !patterns.validatePath.pattern.test(path)) {
callback('Git path is not a valid');
}
callback();
} }
},
callback();
}
}, },
}], ],
})( })(
<Input <Input
size='large' size='large'
@ -324,14 +299,10 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<> <>
<Row> <Row>
<Col> <Col>{this.renderGitRepositoryURL()}</Col>
{this.renderGitRepositoryURL()}
</Col>
</Row> </Row>
<Row> <Row>
<Col> <Col>{this.renderGitLFSBox()}</Col>
{this.renderGitLFSBox()}
</Col>
</Row> </Row>
</> </>
); );
@ -347,18 +318,18 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
extra='Attach issue tracker where the task is described' extra='Attach issue tracker where the task is described'
> >
{form.getFieldDecorator('bugTracker', { {form.getFieldDecorator('bugTracker', {
rules: [{ rules: [
validator: (_, value, callback): void => { {
if (value && !patterns.validateURL.pattern.test(value)) { validator: (_, value, callback): void => {
callback('Issue tracker must be URL'); if (value && !patterns.validateURL.pattern.test(value)) {
} else { callback('Issue tracker must be URL');
callback(); } else {
} callback();
}
},
}, },
}], ],
})( })(<Input size='large' />)}
<Input size='large' />,
)}
</Form.Item> </Form.Item>
); );
} }
@ -372,9 +343,7 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
valuePropName: 'checked', valuePropName: 'checked',
})( })(
<Checkbox> <Checkbox>
<Text className='cvat-text-color'> <Text className='cvat-text-color'>Use zip chunks</Text>
Use zip chunks
</Text>
</Checkbox>, </Checkbox>,
)} )}
</Form.Item> </Form.Item>
@ -386,13 +355,11 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<Form.Item help='Using cache to store data.'> <Form.Item help='Using cache to store data.'>
{form.getFieldDecorator('useCache', { {form.getFieldDecorator('useCache', {
initialValue: false, initialValue: true,
valuePropName: 'checked', valuePropName: 'checked',
})( })(
<Checkbox> <Checkbox>
<Text className='cvat-text-color'> <Text className='cvat-text-color'>Use cache</Text>
Use cache
</Text>
</Checkbox>, </Checkbox>,
)} )}
</Form.Item> </Form.Item>
@ -405,11 +372,10 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<Form.Item label={<span>Chunk size</span>}> <Form.Item label={<span>Chunk size</span>}>
<Tooltip <Tooltip
title={( title={
<> <>
Defines a number of frames to be packed in Defines a number of frames to be packed in a chunk when send from client to server. Server
a chunk when send from client to server. defines automatically if empty.
Server defines automatically if empty.
<br /> <br />
Recommended values: Recommended values:
<br /> <br />
@ -421,16 +387,16 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
<br /> <br />
More: 1 - 4 More: 1 - 4
</> </>
)} }
mouseLeaveDelay={0} mouseLeaveDelay={0}
> >
{form.getFieldDecorator('dataChunkSize', { {form.getFieldDecorator('dataChunkSize', {
rules: [{ rules: [
validator: isPositiveInteger, {
}], validator: isPositiveInteger,
})( },
<Input size='large' type='number' />, ],
)} })(<Input size='large' type='number' />)}
</Tooltip> </Tooltip>
</Form.Item> </Form.Item>
); );
@ -442,27 +408,19 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
return ( return (
<Form> <Form>
<Row> <Row>
<Col> <Col>{this.renderZOrder()}</Col>
{this.renderZOrder()}
</Col>
</Row> </Row>
<Row> <Row>
<Col> <Col>{this.renderUzeZipChunks()}</Col>
{this.renderUzeZipChunks()}
</Col>
</Row> </Row>
<Row> <Row>
<Col> <Col>{this.renderCreateTaskMethod()}</Col>
{this.renderCreateTaskMethod()}
</Col>
</Row> </Row>
<Row type='flex' justify='start'> <Row type='flex' justify='start'>
<Col span={7}> <Col span={7}>{this.renderImageQuality()}</Col>
{this.renderImageQuality()}
</Col>
<Col span={7} offset={1}> <Col span={7} offset={1}>
{this.renderOverlap()} {this.renderOverlap()}
</Col> </Col>
@ -472,9 +430,7 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
</Row> </Row>
<Row type='flex' justify='start'> <Row type='flex' justify='start'>
<Col span={7}> <Col span={7}>{this.renderStartFrame()}</Col>
{this.renderStartFrame()}
</Col>
<Col span={7} offset={1}> <Col span={7} offset={1}>
{this.renderStopFrame()} {this.renderStopFrame()}
</Col> </Col>
@ -484,17 +440,13 @@ class AdvancedConfigurationForm extends React.PureComponent<Props> {
</Row> </Row>
<Row type='flex' justify='start'> <Row type='flex' justify='start'>
<Col span={7}> <Col span={7}>{this.renderChunkSize()}</Col>
{this.renderChunkSize()}
</Col>
</Row> </Row>
{ installedGit ? this.renderGit() : null} {installedGit ? this.renderGit() : null}
<Row> <Row>
<Col> <Col>{this.renderBugTracker()}</Col>
{this.renderBugTracker()}
</Col>
</Row> </Row>
</Form> </Form>
); );

Write Preview
Loading…
Cancel
Save