conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
var font = new Font('My Family', 'n4'),
TARGET_SIZE = new Size(3, 3),
FALLBACK_SIZE_A = new Size(1, 1),
FALLBACK_SIZE_B = new Size(2, 2),
LAST_RESORT_SIZE = new Size(4, 4),
=======
var fontFamily = 'My Family',
fontDescription = 'n4',
TARGET_SIZE = 3,
FALLBACK_SIZE_A = 1,
FALLBACK_SIZE_B = 2,
LAST_RESORT_SIZE = 4,
>>>>>>>
var font = new Font('My Family', 'n4'),
TARGET_SIZE = 3,
FALLBACK_SIZE_A = 1,
FALLBACK_SIZE_B = 2,
LAST_RESORT_SIZE = 4,
<<<<<<<
describe('webkit metrics bug', function () {
it('should correctly call active even though the height is different', function () {
actualSizes = [
FALLBACK_SIZE_A, FALLBACK_SIZE_B,
new Size(1, 2), new Size(2, 3), // Same as FALLBACK_SIZE_A and FALLBACK_SIZE_B except that the height is different.
TARGET_SIZE, TARGET_SIZE
];
var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
domHelper, font, new BrowserInfo(true, false, true));
fontWatchRunner.start();
jasmine.Clock.tick(2 * 25);
expect(activeCallback).toHaveBeenCalledWith(font);
});
});
=======
>>>>>>>
<<<<<<<
expect(activeCallback).toHaveBeenCalledWith(sourceSansB);
activeSize = ruler.getSize();
expect(activeSize).not.toEqual(originalSize);
=======
expect(activeCallback).toHaveBeenCalledWith('SourceSansB', '');
activeWidth = ruler.getWidth();
expect(activeWidth).not.toEqual(originalWidth);
>>>>>>>
expect(activeCallback).toHaveBeenCalledWith(sourceSansB);
activeWidth = ruler.getWidth();
expect(activeWidth).not.toEqual(originalWidth); |
<<<<<<<
FontWatcher.prototype.watch = function(fonts, fontTestStrings, last) {
if (fonts.length === 0 && last) {
=======
FontWatcher.prototype.watchFonts = function(fonts,
fontTestStrings, fontWatchRunnerCtor, last) {
var length = fonts.length;
if (length === 0 && last) {
>>>>>>>
FontWatcher.prototype.watchFonts = function(fonts,
fontTestStrings, last) {
var length = fonts.length;
if (length === 0 && last) { |
<<<<<<<
if (cellView) {
if (!cellView.model.isLink()) {
if (cellView.$box.css('z-index') < z.index) {
cellView.$box.css('z-index', ++z.index);
}
=======
if (cellView && !cellView.model.isLink()) {
if (cellView.$box.css('z-index') < zIndex) {
cellView.$box.css('z-index', ++zIndex);
>>>>>>>
if (!cellView.model.isLink()) {
if (cellView.$box.css('z-index') < z.index) {
cellView.$box.css('z-index', ++z.index); |
<<<<<<<
// Install toolchain
async.series([
ensurePythonIsAvailable,
extractVirtualEnv,
makeVenvDirectory,
ensureInternetConnection,
installApio,
apioInstallSystem,
apioInstallScons,
apioInstallIcestorm,
apioInstallIverilog,
installationCompleted
]);
// Restore alert
alertify.defaults.closable = true;
}
=======
// Install toolchain
async.series([
ensurePythonIsAvailable,
extractVirtualEnv,
makeVenvDirectory,
ensureInternetConnection,
installApio,
apioInstallSystem,
apioInstallScons,
apioInstallIcestorm,
apioInstallIverilog,
apioInstallDrivers,
installationCompleted
]);
// Restore alert
alertify.defaults.closable = true;
>>>>>>>
// Install toolchain
async.series([
ensurePythonIsAvailable,
extractVirtualEnv,
makeVenvDirectory,
ensureInternetConnection,
installApio,
apioInstallSystem,
apioInstallScons,
apioInstallIcestorm,
apioInstallIverilog,
apioInstallDrivers,
installationCompleted
]);
// Restore alert
alertify.defaults.closable = true;
} |
<<<<<<<
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
import Toggles from './Forms/Toggles';
import Editor from './Forms/Editor';
import DatePicker from './Forms/DatePicker';
import Dropzone from './Forms/Dropzone';
=======
import Selects from './Forms/Selects';
>>>>>>>
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
import Toggles from './Forms/Toggles';
import Editor from './Forms/Editor';
import DatePicker from './Forms/DatePicker';
import Dropzone from './Forms/Dropzone';
import Selects from './Forms/Selects';
<<<<<<<
<Route component={ Wizard } path="/forms/wizard" />
<Route component={ TextMask } path="/forms/text-mask" />
<Route component={ Typeahead } path="/forms/typeahead" />
<Route component={ Toggles } path="/forms/toggles" />
<Route component={ Editor } path="/forms/editor" />
<Route component={ DatePicker } path="/forms/date-picker" />
<Route component={ Dropzone } path="/forms/dropzone" />
=======
<Route component={ Selects } path="/forms/selects" />
>>>>>>>
<Route component={ Wizard } path="/forms/wizard" />
<Route component={ TextMask } path="/forms/text-mask" />
<Route component={ Typeahead } path="/forms/typeahead" />
<Route component={ Toggles } path="/forms/toggles" />
<Route component={ Editor } path="/forms/editor" />
<Route component={ DatePicker } path="/forms/date-picker" />
<Route component={ Dropzone } path="/forms/dropzone" />
<Route component={ Selects } path="/forms/selects" /> |
<<<<<<<
import { SidebarTopA } from './../Sidebar/SidebarTopA'
import { SidebarBottomA } from './../Sidebar/SidebarBottomA'
import { LogoThemed } from './../LogoThemed/LogoThemed';
=======
import { SidebarTop } from './../Sidebar/SidebarTop'
import { SidebarBottom } from './../Sidebar/SidebarBottom'
>>>>>>>
import { LogoThemed } from './../LogoThemed/LogoThemed';
import { SidebarTop } from './../Sidebar/SidebarTop'
import { SidebarBottom } from './../Sidebar/SidebarBottom' |
<<<<<<<
<SidebarMenu.Item title="Wizard" to='/forms/wizard' />
<SidebarMenu.Item title="Text Mask" to='/forms/text-mask' />
<SidebarMenu.Item title="Typeahead" to='/forms/typeahead' />
<SidebarMenu.Item title="Toggles" to='/forms/toggles' />
<SidebarMenu.Item title="Editor" to='/forms/editor' />
<SidebarMenu.Item title="Date Picker" to='/forms/date-picker' />
=======
<SidebarMenu.Item title="Dropzone" to='/forms/dropzone' />
>>>>>>>
<SidebarMenu.Item title="Wizard" to='/forms/wizard' />
<SidebarMenu.Item title="Text Mask" to='/forms/text-mask' />
<SidebarMenu.Item title="Typeahead" to='/forms/typeahead' />
<SidebarMenu.Item title="Toggles" to='/forms/toggles' />
<SidebarMenu.Item title="Editor" to='/forms/editor' />
<SidebarMenu.Item title="Date Picker" to='/forms/date-picker' />
<SidebarMenu.Item title="Dropzone" to='/forms/dropzone' /> |
<<<<<<<
import { SidebarTop } from './parts/SidebarTop'
import { SidebarBottom } from './parts/SidebarBottom'
=======
import { LogoThemed } from './../LogoThemed/LogoThemed';
import { SidebarTop } from './../Sidebar/SidebarTop'
import { SidebarBottom } from './../Sidebar/SidebarBottom'
>>>>>>>
import { LogoThemed } from './../LogoThemed/LogoThemed';
import { SidebarTop } from './parts/SidebarTop'
import { SidebarBottom } from './parts/SidebarBottom'
<<<<<<<
<Link to="/" className="h4 fw-600 sidebar__brand">
react.bs4
=======
{ /* START SIDEBAR: Only for Desktop */ }
<Link to="/" className="sidebar__brand">
<LogoThemed checkBackground />
>>>>>>>
{ /* START SIDEBAR: Only for Desktop */ }
<Link to="/" className="sidebar__brand">
<LogoThemed checkBackground /> |
<<<<<<<
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
import Toggles from './Forms/Toggles';
=======
import Editor from './Forms/Editor';
>>>>>>>
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
import Toggles from './Forms/Toggles';
import Editor from './Forms/Editor';
<<<<<<<
<Route component={ Wizard } path="/forms/wizard" />
<Route component={ TextMask } path="/forms/text-mask" />
<Route component={ Typeahead } path="/forms/typeahead" />
<Route component={ Toggles } path="/forms/toggles" />
=======
<Route component={ Editor } path="/forms/editor" />
>>>>>>>
<Route component={ Wizard } path="/forms/wizard" />
<Route component={ TextMask } path="/forms/text-mask" />
<Route component={ Typeahead } path="/forms/typeahead" />
<Route component={ Toggles } path="/forms/toggles" />
<Route component={ Editor } path="/forms/editor" /> |
<<<<<<<
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
=======
import Typeahead from './Forms/Typeahead';
>>>>>>>
import Wizard from './Forms/Wizard';
import TextMask from './Forms/TextMask';
import Typeahead from './Forms/Typeahead';
<<<<<<<
<Route component={ Wizard } path="/forms/wizard" />
<Route component={ TextMask } path="/forms/text-mask" />
=======
<Route component={ Typeahead } path="/forms/typeahead" />
>>>>>>>
<Route component={ Wizard } path="/forms/wizard" />
<Route component={ TextMask } path="/forms/text-mask" />
<Route component={ Typeahead } path="/forms/typeahead" /> |
<<<<<<<
storage_month(month: Date): EnvironmentStorageMonth
hits_month(month: Date): EnviornmentHitsMonth
lagoon_route: String
lagoon_routes: String
monitoring_urls: String
=======
storageMonth(month: Date): EnvironmentStorageMonth
hitsMonth(month: Date): EnviornmentHitsMonth
>>>>>>>
storageMonth(month: Date): EnvironmentStorageMonth
hitsMonth(month: Date): EnviornmentHitsMonth
lagoon_route: String
lagoon_routes: String
monitoring_urls: String
<<<<<<<
environmentByName(name: String!, project: Int!): Environment
environmentByOpenshiftProjectName(openshiftProjectName: String!): Environment
=======
environmentByOpenshiftProjectName(
openshiftProjectName: String!
): Environment
>>>>>>>
environmentByName(name: String!, project: Int!): Environment
environmentByOpenshiftProjectName(
openshiftProjectName: String!
): Environment
<<<<<<<
deploy_type: DeployType
environment_type: EnvType
openshift_projectname: String
lagoon_route: String
lagoon_routes: String
monitoring_urls: String
=======
deployType: DeployType
environmentType: EnvType
openshiftProjectName: String
>>>>>>>
deployType: DeployType
environmentType: EnvType
openshiftProjectName: String
lagoon_route: String
lagoon_routes: String
monitoring_urls: String
<<<<<<<
name: String!
id: Int!
=======
id: Int!
>>>>>>>
id: Int! |
<<<<<<<
const addNotificationMicrosoftTeams = async (root, { input }, { sqlClient, hasPermission }) => {
await hasPermission('notification', 'add');
const prep = prepare(
sqlClient,
'CALL CreateNotificationMicrosoftTeams(:name, :webhook)',
);
const rows = await query(sqlClient, prep(input));
const microsoftTeams = R.path([0, 0], rows);
return microsoftTeams;
};
=======
const addNotificationEmail = async (root, { input }, { sqlClient, hasPermission }) => {
await hasPermission('notification', 'add');
console.log(input);
const prep = prepare(
sqlClient,
'CALL CreateNotificationEmail(:name, :email_address)',
);
const rows = await query(sqlClient, prep(input));
const email = R.path([0, 0], rows);
return email;
};
>>>>>>>
const addNotificationMicrosoftTeams = async (root, { input }, { sqlClient, hasPermission }) => {
await hasPermission('notification', 'add');
const prep = prepare(
sqlClient,
'CALL CreateNotificationMicrosoftTeams(:name, :webhook)',
);
const rows = await query(sqlClient, prep(input));
const microsoftTeams = R.path([0, 0], rows);
return microsoftTeams;
const addNotificationEmail = async (root, { input }, { sqlClient, hasPermission }) => {
await hasPermission('notification', 'add');
console.log(input);
const prep = prepare(
sqlClient,
'CALL CreateNotificationEmail(:name, :email_address)',
);
const rows = await query(sqlClient, prep(input));
const email = R.path([0, 0], rows);
return email;
};
<<<<<<<
const deleteNotificationMicrosoftTeams = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'delete');
const { name } = input;
const nids = await Helpers(sqlClient).getAssignedNotificationIds({
name,
type: 'microsoftTeams',
});
if (R.length(nids) > 0) {
throw new Error("Can't delete notification linked to projects");
}
const prep = prepare(sqlClient, 'CALL DeleteNotificationMicrosoftTeams(:name)');
await query(sqlClient, prep(input));
// TODO: maybe check rows for changed result
return 'success';
};
=======
const deleteNotificationEmail = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'delete');
const { name } = input;
const nids = await Helpers(sqlClient).getAssignedNotificationIds({
name,
type: 'email',
});
if (R.length(nids) > 0) {
throw new Error("Can't delete notification linked to projects");
}
const prep = prepare(sqlClient, 'CALL DeleteNotificationEmail(:name)');
await query(sqlClient, prep(input));
// TODO: maybe check rows for changed result
return 'success';
};
>>>>>>>
const deleteNotificationMicrosoftTeams = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'delete');
const { name } = input;
const nids = await Helpers(sqlClient).getAssignedNotificationIds({
name,
type: 'microsoftTeams',
});
if (R.length(nids) > 0) {
throw new Error("Can't delete notification linked to projects");
}
const prep = prepare(sqlClient, 'CALL DeleteNotificationMicrosoftTeams(:name)');
await query(sqlClient, prep(input));
// TODO: maybe check rows for changed result
return 'success';
};
const deleteNotificationEmail = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'delete');
const { name } = input;
const nids = await Helpers(sqlClient).getAssignedNotificationIds({
name,
type: 'email',
});
if (R.length(nids) > 0) {
throw new Error("Can't delete notification linked to projects");
}
const prep = prepare(sqlClient, 'CALL DeleteNotificationEmail(:name)');
await query(sqlClient, prep(input));
// TODO: maybe check rows for changed result
return 'success';
};
<<<<<<<
const NOTIFICATION_TYPES = ['slack', 'rocketchat', 'microsoftteams'];
=======
const NOTIFICATION_TYPES = ['slack', 'rocketchat', 'email'];
>>>>>>>
const NOTIFICATION_TYPES = ['slack', 'rocketchat', 'microsoftteams', 'email'];
<<<<<<<
const updateNotificationMicrosoftTeams = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'update');
const { name } = input;
if (isPatchEmpty(input)) {
throw new Error('input.patch requires at least 1 attribute');
}
await query(sqlClient, Sql.updateNotificationMicrosoftTeams(input));
const rows = await query(
sqlClient,
Sql.selectNotificationMicrosoftTeamsByName(name),
);
return R.prop(0, rows);
};
=======
const updateNotificationEmail = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'update');
const { name } = input;
if (isPatchEmpty(input)) {
throw new Error('input.patch requires at least 1 attribute');
}
await query(sqlClient, Sql.updateNotificationEmail(input));
const rows = await query(
sqlClient,
Sql.selectNotificationEmailByName(name),
);
return R.prop(0, rows);
};
>>>>>>>
const updateNotificationMicrosoftTeams = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'update');
const { name } = input;
if (isPatchEmpty(input)) {
throw new Error('input.patch requires at least 1 attribute');
}
await query(sqlClient, Sql.updateNotificationMicrosoftTeams(input));
const rows = await query(
sqlClient,
Sql.selectNotificationMicrosoftTeamsByName(name),
);
return R.prop(0, rows);
};
const updateNotificationEmail = async (
root,
{ input },
{
sqlClient,
hasPermission,
},
) => {
await hasPermission('notification', 'update');
const { name } = input;
if (isPatchEmpty(input)) {
throw new Error('input.patch requires at least 1 attribute');
}
await query(sqlClient, Sql.updateNotificationEmail(input));
const rows = await query(
sqlClient,
Sql.selectNotificationEmailByName(name),
);
return R.prop(0, rows);
};
<<<<<<<
deleteAllNotificationMicrosoftTeams,
=======
deleteAllNotificationEmails,
>>>>>>>
deleteAllNotificationMicrosoftTeams,
deleteAllNotificationEmails, |
<<<<<<<
<SidebarMenu.Item title="Notifications" to='/interface/notifications' />
<SidebarMenu.Item title="Crop Image" to='/interface/crop-image' />
<SidebarMenu.Item title="Drag & Drop Elements" to='/interface/drag-and-drop-elements' />
=======
<SidebarMenu.Item title="Calendar" to='/interface/calendar' />
>>>>>>>
<SidebarMenu.Item title="Notifications" to='/interface/notifications' />
<SidebarMenu.Item title="Crop Image" to='/interface/crop-image' />
<SidebarMenu.Item title="Drag & Drop Elements" to='/interface/drag-and-drop-elements' />
<SidebarMenu.Item title="Calendar" to='/interface/calendar' /> |
<<<<<<<
middleware: [],
strict: true
=======
findOneAndUpdate: true,
middleware: []
>>>>>>>
middleware: [],
strict: true
findOneAndUpdate: true, |
<<<<<<<
const properties = source._decodeUnboundProperties();
expect(properties.cartodb_id[0]).toEqual(0);
=======
const properties = source._decodeProperties();
expect(properties.cartodb_id[0]).toEqual(-0);
>>>>>>>
const properties = source._decodeUnboundProperties();
expect(properties.cartodb_id[0]).toEqual(-0);
<<<<<<<
const props = source._decodeUnboundProperties();
expect(props.cartodb_id[0]).toEqual(0);
expect(props.cartodb_id[1]).toEqual(1);
expect(props.cartodb_id[2]).toEqual(2);
=======
const props = source._decodeProperties();
expect(props.cartodb_id[0]).toEqual(-0);
expect(props.cartodb_id[1]).toEqual(-1);
expect(props.cartodb_id[2]).toEqual(-2);
>>>>>>>
const props = source._decodeUnboundProperties();
expect(props.cartodb_id[0]).toEqual(-0);
expect(props.cartodb_id[1]).toEqual(-1);
expect(props.cartodb_id[2]).toEqual(-2); |
<<<<<<<
import IdentityCodec from '../codecs/Identity';
=======
import { FP32_DESIGNATED_NULL_VALUE } from './viz/expressions/constants';
>>>>>>>
import IdentityCodec from '../codecs/Identity';
import { FP32_DESIGNATED_NULL_VALUE } from './viz/expressions/constants'; |
<<<<<<<
// we want to limit production environments, without making it configurable currently
var productionEnvironmentsLimit = 2
// we want to make sure we can deploy the `production` env, and also the env defined as standby
if (
environments.project.productionEnvironment === branchName
|| environments.project.standbyProductionEnvironment === branchName
) {
// get a list of production environments
const prod_environments = environments.project.environments
.filter(e => e.environmentType === 'production')
.map(e => e.name);
=======
case 'lagoon_kubernetesBuildDeploy':
if (environments.project.productionEnvironment === branchName) {
>>>>>>>
case 'lagoon_kubernetesBuildDeploy':
// we want to limit production environments, without making it configurable currently
var productionEnvironmentsLimit = 2
// we want to make sure we can deploy the `production` env, and also the env defined as standby
if (
environments.project.productionEnvironment === branchName
|| environments.project.standbyProductionEnvironment === branchName
) {
// get a list of production environments
const prod_environments = environments.project.environments
.filter(e => e.environmentType === 'production')
.map(e => e.name); |
<<<<<<<
this.decodedGeom = decoder.decodeGeom(this.type, this.geom);
this.numVertex = type === 'point' ? size * 3 : this.decodedGeom.vertices.length / 2;
=======
this.decodedGeom = decodeGeom(this.type, this.geom);
this.numVertex = type === 'point' ? size : this.decodedGeom.vertices.length / 2;
>>>>>>>
this.decodedGeom = decodeGeom(this.type, this.geom);
this.numVertex = type === 'point' ? size * 3 : this.decodedGeom.vertices.length / 2; |
<<<<<<<
updateProject: ({ permissions: { projects } }, { id, patch }) =>
knex('project')
=======
updateProject: (input) => {
const { id, patch } = input;
const ret = knex('project')
>>>>>>>
updateProject: ({ id, patch }) =>
knex('project')
<<<<<<<
.whereIn('id', projects)
.update(patch)
.toString(),
selectProject: (id /* : number */) =>
=======
.update(patch);
return ret.toString();
},
selectProject: id =>
>>>>>>>
.update(patch)
.toString(),
selectProject: (id /* : number */) =>
<<<<<<<
await query(sqlClient, Sql.updateProject(cred, input));
return Helpers.getProjectById(pid);
=======
await query(sqlClient, Sql.updateProject(input));
const rows = await query(sqlClient, Sql.selectProject(pid));
const project = R.path([0], rows);
return project;
>>>>>>>
await query(sqlClient, Sql.updateProject(input));
return Helpers.getProjectById(pid); |
<<<<<<<
const source = new carto.source.GeoJSON(sources['points']);
const viz = new carto.Viz(`
color: ramp(top(@prop, @num), PRISM)
width: 50
@prop: $cat
@num: 2
`);
=======
const source = new carto.source.GeoJSON(sources['points3']);
const viz = new carto.Viz('color: ramp(top($cat, @num), PRISM), width: 50, @num: 1');
>>>>>>>
const source = new carto.source.GeoJSON(sources['points3']);
const viz = new carto.Viz(`
color: ramp(top(@prop, @num), PRISM)
width: 50
@prop: $cat
@num: 2
`); |
<<<<<<<
resetViewportAgg(metadata) {
if (!this.viewportFeature) {
=======
_resetViewportAgg(metadata) {
if (!this._FeatureProxy) {
>>>>>>>
resetViewportAgg(metadata) {
if (!this._FeatureProxy) { |
<<<<<<<
=======
const Queries = {
addOrUpdateEnvironment,
addOrUpdateEnvironmentStorage,
getEnvironmentByName,
getEnvironmentByOpenshiftProjectName,
getEnvironmentHoursMonthByEnvironmentId,
getEnvironmentStorageByEnvironmentId,
getEnvironmentStorageMonthByEnvironmentId,
getEnvironmentHitsMonthByEnvironmentId,
getEnvironmentByEnvironmentStorageId,
deleteEnvironment,
getEnvironmentsByProjectId,
updateEnvironment,
getAllEnvironments,
};
>>>>>>> |
<<<<<<<
class Tri {
constructor(gl) {
compileProgram.call(this, gl, rendererGLSL.tris.VS, rendererGLSL.tris.FS);
this.vertexPositionAttribute = gl.getAttribLocation(this.program, 'vertexPosition');
this.featureIdAttr = gl.getAttribLocation(this.program, 'featureID');
this.vertexScaleUniformLocation = gl.getUniformLocation(this.program, 'vertexScale');
this.vertexOffsetUniformLocation = gl.getUniformLocation(this.program, 'vertexOffset');
this.colorTexture = gl.getUniformLocation(this.program, 'colorTex');
this.colorStrokeTexture = gl.getUniformLocation(this.program, 'colorStrokeTex');
this.strokeWidthTexture = gl.getUniformLocation(this.program, 'strokeWidthTex');
this.widthTexture = gl.getUniformLocation(this.program, 'widthTex');
}
=======
function Tri(gl) {
compileProgram.call(this, gl, rendererGLSL.tris.VS, rendererGLSL.tris.FS);
this.vertexPositionAttribute = gl.getAttribLocation(this.program, 'vertexPosition');
this.featureIdAttr = gl.getAttribLocation(this.program, 'featureID');
this.vertexScaleUniformLocation = gl.getUniformLocation(this.program, 'vertexScale');
this.vertexOffsetUniformLocation = gl.getUniformLocation(this.program, 'vertexOffset');
this.colorTexture = gl.getUniformLocation(this.program, 'colorTex');
>>>>>>>
class Tri {
constructor(gl) {
compileProgram.call(this, gl, rendererGLSL.tris.VS, rendererGLSL.tris.FS);
this.vertexPositionAttribute = gl.getAttribLocation(this.program, 'vertexPosition');
this.featureIdAttr = gl.getAttribLocation(this.program, 'featureID');
this.vertexScaleUniformLocation = gl.getUniformLocation(this.program, 'vertexScale');
this.vertexOffsetUniformLocation = gl.getUniformLocation(this.program, 'vertexOffset');
this.colorTexture = gl.getUniformLocation(this.program, 'colorTex');
} |
<<<<<<<
import CartoValidationError, { CartoValidationTypes as cvt } from '../../../../errors/carto-validation-error';
=======
import ListTransform from '../ListTransform';
>>>>>>>
import ListTransform from '../ListTransform';
import CartoValidationError, { CartoValidationTypes as cvt } from '../../../../errors/carto-validation-error'; |
<<<<<<<
import * as schema from '../../schema';
=======
import Property from './property';
import { checkInstance, checkType } from './utils';
>>>>>>>
import * as schema from '../../schema';
import Property from './property';
import { checkInstance, checkType } from './utils';
<<<<<<<
this._aggName = aggName;
=======
this.type = aggType;
>>>>>>>
this._aggName = aggName;
this.type = aggType; |
<<<<<<<
describe('.eval', () => {
const fakeMetadata = {
columns: [{
type: 'category',
name: 'category',
categoryNames: ['cat0', 'cat1', 'cat2']
}],
categoryIDs: {
'cat0': 0,
'cat1': 1,
'cat2': 2,
}
};
it('should return the value from the metadata', () => {
const categoryExpresion = s.category('cat0');
categoryExpresion._compile(fakeMetadata);
const actual = categoryExpresion.eval();
expect(actual).toEqual('cat0');
});
});
=======
>>>>>>>
describe('.eval', () => {
const fakeMetadata = {
columns: [{
type: 'category',
name: 'category',
categoryNames: ['cat0', 'cat1', 'cat2']
}],
categoryIDs: {
'cat0': 0,
'cat1': 1,
'cat2': 2,
}
};
it('should return the value from the metadata', () => {
const categoryExpresion = s.category('cat0');
categoryExpresion._compile(fakeMetadata);
const actual = categoryExpresion.eval();
expect(actual).toEqual('cat0');
});
}); |
<<<<<<<
const response = await getSQL(q, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(q));
>>>>>>>
const response = await getSQL(q, conf);
<<<<<<<
const response = await getSQL(q, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(q));
>>>>>>>
const response = await getSQL(q, conf);
<<<<<<<
console.log('>>>> CT',conf.sqlServerURL,columnListQuery);
const response = await getSQL(columnListQuery, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(columnListQuery));
>>>>>>>
const response = await getSQL(columnListQuery, conf);
<<<<<<<
const response = await getSQL(columnListQuery, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(columnListQuery));
>>>>>>>
const response = await getSQL(columnListQuery, conf);
<<<<<<<
const response = await getSQL(numericsQuery, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(numericsQuery));
>>>>>>>
const response = await getSQL(numericsQuery, conf);
<<<<<<<
const response = await getSQL(numericsQuery, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(numericsQuery));
>>>>>>>
const response = await getSQL(numericsQuery, conf);
<<<<<<<
const response = await getSQL(catQuery, conf);
=======
const response = await fetch(`${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(catQuery));
>>>>>>>
const response = await getSQL(catQuery, conf);
<<<<<<<
const endpoint = (conf, path='') => {
let url = `${conf.mapsServerURL}/api/v1/map`;
if (path) {
url += '/' + path;
}
url = authURL(url, conf);
return url;
=======
const endpoint = (conf) => {
return `${conf.mapsServerURL}/api/v1/map`;
>>>>>>>
const endpoint = (conf, path='') => {
let url = `${conf.mapsServerURL}/api/v1/map`;
if (path) {
url += '/' + path;
}
url = authURL(url, conf);
return url;
<<<<<<<
return authURL(`${urlTemplates.url}/${conf.username}/api/v1/map/${layergroup.layergroupid}/${layerIndex}/{z}/{x}/{y}.mvt`, conf);
}
return endpoint(conf, `${layergroup.layergroupid}/${layerIndex}/{z}/{x}/{y}.mvt`);
}
function getSQL(query, conf) {
let url = `${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(query);
url = authURL(url, conf);
return fetch(url);
}
function authURL(url, conf) {
if (conf.apiKey) {
const sep = url.includes('?') ? '&' : '?';
url += sep + 'api_key=' + encodeURIComponent(conf.apiKey);
=======
return `${urlTemplates.url}/${conf.username}/api/v1/map/${layergroup.layergroupid}/${layerIndex}/{z}/{x}/{y}.mvt`;
>>>>>>>
return authURL(`${urlTemplates.url}/${conf.username}/api/v1/map/${layergroup.layergroupid}/${layerIndex}/{z}/{x}/{y}.mvt`, conf);
}
return endpoint(conf, `${layergroup.layergroupid}/${layerIndex}/{z}/{x}/{y}.mvt`);
}
function getSQL(query, conf) {
let url = `${conf.sqlServerURL}/api/v2/sql?q=` + encodeURIComponent(query);
url = authURL(url, conf);
return fetch(url);
}
function authURL(url, conf) {
if (conf.apiKey) {
const sep = url.includes('?') ? '&' : '?';
url += sep + 'api_key=' + encodeURIComponent(conf.apiKey); |
<<<<<<<
return this.dataframes.filter(df => df.active && df.numVertex);
=======
this.dataframes = this.dataframes.filter(df => !df.freed);
return this.dataframes.filter(df => df.active);
>>>>>>>
this.dataframes = this.dataframes.filter(df => !df.freed);
return this.dataframes.filter(df => df.active && df.numVertex); |
<<<<<<<
* @IGNOREproperty {Order} order - rendering order of the features, only applicable to points
* @property {number} resolution - resolution of the property-aggregation functions, only applicable to points. Default resolution is 1. Custom values must be greater than 0 and lower than 256. A resolution of N means points are aggregated to grid cells NxN pixels. Unlinke {@link https://carto.com/developers/torque-js/guides/how-spatial-aggregation-works/|Torque resolution}, the aggregated points are placed in the centroid of the cluster, not in the center of the grid cell.
=======
* @property {Order} order - rendering order of the features, only applicable to points. See {@link carto.expressions.asc}, {@link carto.expressions.desc} and {@link carto.expressions.noOrder}
* @property {number} resolution - resolution of the property-aggregation functions, a value of 4 means to produce aggregation on grid cells of 4x4 pixels, only applicable to points
>>>>>>>
* @property {Order} order - rendering order of the features, only applicable to points. See {@link carto.expressions.asc}, {@link carto.expressions.desc} and {@link carto.expressions.noOrder}
* @property {number} resolution - resolution of the property-aggregation functions, only applicable to points. Default resolution is 1. Custom values must be greater than 0 and lower than 256. A resolution of N means points are aggregated to grid cells NxN pixels. Unlinke {@link https://carto.com/developers/torque-js/guides/how-spatial-aggregation-works/|Torque resolution}, the aggregated points are placed in the centroid of the cluster, not in the center of the grid cell.
<<<<<<<
* @IGNOREproperty {Order} order - rendering order of the features, only applicable to points
* @property {number} resolution - resolution of the property-aggregation functions. It is only applicable to points. It is 1 by default, and must be greater than 0 and lower than 256. A value of N means to produce aggregation on grid cells of NxN pixels. Unlinke {@link https://carto.com/developers/torque-js/guides/how-spatial-aggregation-works/|Torque resolution}, the aggregated points are placed in the centroid of the cluster, not in the center of the grid cell.
=======
* @property {Order} order - rendering order of the features, only applicable to points. See {@link carto.expressions.asc}, {@link carto.expressions.desc} and {@link carto.expressions.noOrder}
* @property {number} resolution - resolution of the property-aggregation functions, a value of 4 means to produce aggregation on grid cells of 4x4 pixels, only applicable to points
>>>>>>>
* @IGNOREproperty {Order} order - rendering order of the features, only applicable to points
* @property {Order} order - rendering order of the features, only applicable to points. See {@link carto.expressions.asc}, {@link carto.expressions.desc} and {@link carto.expressions.noOrder}
* @property {number} resolution - resolution of the property-aggregation functions, only applicable to points. Default resolution is 1. Custom values must be greater than 0 and lower than 256. A resolution of N means points are aggregated to grid cells NxN pixels. Unlinke {@link https://carto.com/developers/torque-js/guides/how-spatial-aggregation-works/|Torque resolution}, the aggregated points are placed in the centroid of the cluster, not in the center of the grid cell. |
<<<<<<<
// The geom will be an array of coordinates in this case`
export function decodeGeom(geomType, geom) {
if (geomType == 'point') {
=======
// The geom will be an array of coordinates in this case
export function decodeGeom (geomType, geom) {
if (geomType === 'point') {
>>>>>>>
// The geom will be an array of coordinates in this case`
export function decodeGeom (geomType, geom) {
if (geomType === 'point') {
<<<<<<<
=======
function getLineNormal (a, b) {
const dx = b[0] - a[0];
const dy = b[1] - a[1];
return normalize([-dy, dx]);
}
function getJointNormal (a, b, c) {
const u = normalize([a[0] - b[0], a[1] - b[1]]);
const v = normalize([c[0] - b[0], c[1] - b[1]]);
const sin = -u[1] * v[0] + u[0] * v[1];
if (sin !== 0) {
return [(u[0] + v[0]) / sin, (u[1] + v[1]) / sin];
}
}
function normalize (v) {
const s = Math.sqrt(v[0] * v[0] + v[1] * v[1]);
return [v[0] / s, v[1] / s];
}
>>>>>>> |
<<<<<<<
const DEFAULT_SYMBOL_EXPRESSION = () => { const expr = s.FALSE; expr._default = true; return expr; };
const DEFAULT_SYMBOLPLACEMENT_EXPRESSION = () => s.BOTTOM;
=======
const DEFAULT_RESOLUTION = () => 1;
>>>>>>>
const DEFAULT_SYMBOL_EXPRESSION = () => { const expr = s.FALSE; expr._default = true; return expr; };
const DEFAULT_SYMBOLPLACEMENT_EXPRESSION = () => s.BOTTOM;
const DEFAULT_RESOLUTION = () => 1;
<<<<<<<
'variables',
'symbol',
'symbolPlacement',
=======
'resolution',
'variables'
>>>>>>>
'symbol',
'symbolPlacement',
'resolution',
'variables'
<<<<<<<
_fetch() {
return Promise.all(this._getRootExpressions().map(expr => expr._fetch()));
}
/**
* Return the resolution.
*
* @return {number}
*
* @memberof carto.Viz
* @instance
* @api
*/
getResolution() {
return this.resolution;
}
/**
* Return the color expression.
*
* @return {carto.expressions.Base}
*
* @memberof carto.Viz
* @instance
* @api
*/
getColor() {
return this.color;
}
/**
* Return the width expression.
*
* @return {carto.expressions.Base}
*
* @memberof carto.Viz
* @instance
* @api
*/
getWidth() {
return this.width;
}
/**
* Return the strokeColor expression.
*
* @return {carto.expressions.Base}
*
* @memberof carto.Viz
* @instance
* @api
*/
getStrokeColor() {
return this.strokeColor;
}
/**
* Return the strokeWidth expression.
*
* @return {carto.expressions.Base}
*
* @memberof carto.Viz
* @instance
* @api
*/
getStrokeWidth() {
return this.strokeWidth;
}
/**
* Return the order expression.
*
* @return {carto.expressions.Base}
*
* @memberof carto.Viz
* @instance
* @api
*/
getOrder() {
return this.order;
}
/**
* Return the filter expression.
*
* @return {carto.expressions.Base}
*
* @memberof carto.Viz
* @instance
* @api
*/
getFilter() {
return this.filter;
=======
_updateRootExpressions() {
this._getRootExpressions().forEach(expr => {
expr.parent = this;
expr.notify = this._changed.bind(this);
});
>>>>>>>
_updateRootExpressions() {
this._getRootExpressions().forEach(expr => {
expr.parent = this;
expr.notify = this._changed.bind(this);
});
<<<<<<<
return this._getRootExpressions().some(rootExpr => rootExpr.isAnimated());
=======
return this.color.isAnimated() ||
this.width.isAnimated() ||
this.strokeColor.isAnimated() ||
this.strokeWidth.isAnimated() ||
this.filter.isAnimated();
>>>>>>>
return this.color.isAnimated() ||
this.width.isAnimated() ||
this.strokeColor.isAnimated() ||
this.strokeWidth.isAnimated() ||
this.filter.isAnimated() ||
this.symbol.isAnimated() ||
this.symbolPlacement.isAnimated();
<<<<<<<
=======
compileShaders(gl, metadata) {
this._compileColorShader(gl, metadata);
this._compileWidthShader(gl, metadata);
this._compileStrokeColorShader(gl, metadata);
this._compileStrokeWidthShader(gl, metadata);
this._compileFilterShader(gl, metadata);
Object.values(this.variables).map(v => {
v._bind(metadata);
});
}
setDefaultsIfRequired(geomType) {
let defaults = this._getDefaultGeomStyle(geomType);
if (defaults) {
if (this.color.default) {
this.color = defaults.COLOR_EXPRESSION();
}
if (this.width.default) {
this.width = defaults.WIDTH_EXPRESSION();
}
if (this.strokeColor.default) {
this.strokeColor = defaults.STROKE_COLOR_EXPRESSION();
}
if (this.strokeWidth.default) {
this.strokeWidth = defaults.STROKE_WIDTH_EXPRESSION();
}
this._updateRootExpressions();
}
}
_getDefaultGeomStyle(geomType) {
if (geomType === 'point') {
return {
COLOR_EXPRESSION: () => _markDefault(s.hex('#EE4D5A')),
WIDTH_EXPRESSION: () => _markDefault(s.number(7)),
STROKE_COLOR_EXPRESSION: () => _markDefault(s.hex('#FFF')),
STROKE_WIDTH_EXPRESSION: () => _markDefault(s.number(1))
};
}
if (geomType === 'line') {
return {
COLOR_EXPRESSION: () => _markDefault(s.hex('#4CC8A3')),
WIDTH_EXPRESSION: () => _markDefault(s.number(1.5)),
STROKE_COLOR_EXPRESSION: () => _markDefault(s.hex('#FFF')), // Not used in lines
STROKE_WIDTH_EXPRESSION: () => _markDefault(s.number(1)) // Not used in lines
};
}
if (geomType === 'polygon') {
return {
COLOR_EXPRESSION: () => _markDefault(s.hex('#826DBA')),
WIDTH_EXPRESSION: () => _markDefault(s.number(1)), // Not used in polygons
STROKE_COLOR_EXPRESSION: () => _markDefault(s.hex('#FFF')),
STROKE_WIDTH_EXPRESSION: () => _markDefault(s.number(1))
};
}
}
>>>>>>>
setDefaultsIfRequired(geomType) {
let defaults = this._getDefaultGeomStyle(geomType);
if (defaults) {
if (this.color.default) {
this.color = defaults.COLOR_EXPRESSION();
}
if (this.width.default) {
this.width = defaults.WIDTH_EXPRESSION();
}
if (this.strokeColor.default) {
this.strokeColor = defaults.STROKE_COLOR_EXPRESSION();
}
if (this.strokeWidth.default) {
this.strokeWidth = defaults.STROKE_WIDTH_EXPRESSION();
}
this._updateRootExpressions();
}
}
_getDefaultGeomStyle(geomType) {
if (geomType === 'point') {
return {
COLOR_EXPRESSION: () => _markDefault(s.hex('#EE4D5A')),
WIDTH_EXPRESSION: () => _markDefault(s.number(7)),
STROKE_COLOR_EXPRESSION: () => _markDefault(s.hex('#FFF')),
STROKE_WIDTH_EXPRESSION: () => _markDefault(s.number(1))
};
}
if (geomType === 'line') {
return {
COLOR_EXPRESSION: () => _markDefault(s.hex('#4CC8A3')),
WIDTH_EXPRESSION: () => _markDefault(s.number(1.5)),
STROKE_COLOR_EXPRESSION: () => _markDefault(s.hex('#FFF')), // Not used in lines
STROKE_WIDTH_EXPRESSION: () => _markDefault(s.number(1)) // Not used in lines
};
}
if (geomType === 'polygon') {
return {
COLOR_EXPRESSION: () => _markDefault(s.hex('#826DBA')),
WIDTH_EXPRESSION: () => _markDefault(s.number(1)), // Not used in polygons
STROKE_COLOR_EXPRESSION: () => _markDefault(s.hex('#FFF')),
STROKE_WIDTH_EXPRESSION: () => _markDefault(s.number(1))
};
}
}
<<<<<<<
vizSpec.resolution = util.isUndefined(vizSpec.resolution) ? DEFAULT_RESOLUTION() : vizSpec.resolution;
vizSpec.color = vizSpec.color || DEFAULT_COLOR_EXPRESSION();
vizSpec.width = vizSpec.width || DEFAULT_WIDTH_EXPRESSION();
vizSpec.strokeColor = vizSpec.strokeColor || DEFAULT_STROKE_COLOR_EXPRESSION();
vizSpec.strokeWidth = vizSpec.strokeWidth || DEFAULT_STROKE_WIDTH_EXPRESSION();
vizSpec.order = vizSpec.order || DEFAULT_ORDER_EXPRESSION();
vizSpec.filter = vizSpec.filter || DEFAULT_FILTER_EXPRESSION();
vizSpec.symbol = vizSpec.symbol || DEFAULT_SYMBOL_EXPRESSION();
vizSpec.symbolPlacement = vizSpec.symbolPlacement || DEFAULT_SYMBOLPLACEMENT_EXPRESSION();
=======
if (util.isUndefined(vizSpec.color)) {
vizSpec.color = DEFAULT_COLOR_EXPRESSION();
}
if (util.isUndefined(vizSpec.width)) {
vizSpec.width = DEFAULT_WIDTH_EXPRESSION();
}
if (util.isUndefined(vizSpec.strokeColor)) {
vizSpec.strokeColor = DEFAULT_STROKE_COLOR_EXPRESSION();
}
if (util.isUndefined(vizSpec.strokeWidth)) {
vizSpec.strokeWidth = DEFAULT_STROKE_WIDTH_EXPRESSION();
}
if (util.isUndefined(vizSpec.order)) {
vizSpec.order = DEFAULT_ORDER_EXPRESSION();
}
if (util.isUndefined(vizSpec.filter)) {
vizSpec.filter = DEFAULT_FILTER_EXPRESSION();
}
if (util.isUndefined(vizSpec.resolution)) {
vizSpec.resolution = DEFAULT_RESOLUTION();
}
>>>>>>>
if (util.isUndefined(vizSpec.color)) {
vizSpec.color = DEFAULT_COLOR_EXPRESSION();
}
if (util.isUndefined(vizSpec.width)) {
vizSpec.width = DEFAULT_WIDTH_EXPRESSION();
}
if (util.isUndefined(vizSpec.strokeColor)) {
vizSpec.strokeColor = DEFAULT_STROKE_COLOR_EXPRESSION();
}
if (util.isUndefined(vizSpec.strokeWidth)) {
vizSpec.strokeWidth = DEFAULT_STROKE_WIDTH_EXPRESSION();
}
if (util.isUndefined(vizSpec.order)) {
vizSpec.order = DEFAULT_ORDER_EXPRESSION();
}
if (util.isUndefined(vizSpec.filter)) {
vizSpec.filter = DEFAULT_FILTER_EXPRESSION();
}
if (util.isUndefined(vizSpec.resolution)) {
vizSpec.resolution = DEFAULT_RESOLUTION();
}
if (util.isUndefined(vizSpec.symbol)) {
vizSpec.symbol = DEFAULT_SYMBOL_EXPRESSION();
}
if (util.isUndefined(vizSpec.symbolPlacement)) {
vizSpec.symbolPlacement = DEFAULT_SYMBOLPLACEMENT_EXPRESSION();
}
<<<<<<<
vizSpec.symbolPlacement = implicitCast(vizSpec.symbolPlacement);
=======
vizSpec.filter = implicitCast(vizSpec.filter);
>>>>>>>
vizSpec.symbolPlacement = implicitCast(vizSpec.symbolPlacement);
vizSpec.filter = implicitCast(vizSpec.filter); |
<<<<<<<
MICROSOFTTEAMS
=======
EMAIL
>>>>>>>
MICROSOFTTEAMS
EMAIL
<<<<<<<
union Notification = NotificationRocketChat | NotificationSlack | NotificationMicrosoftTeams
=======
union Notification = NotificationRocketChat | NotificationSlack | NotificationEmail
>>>>>>>
union Notification = NotificationRocketChat | NotificationSlack | NotificationMicrosoftTeams | NotificationEmail
<<<<<<<
input AddNotificationMicrosoftTeamsInput {
name: String!
webhook: String!
}
=======
input AddNotificationEmailInput {
name: String!
emailAddress: String!
}
>>>>>>>
input AddNotificationMicrosoftTeamsInput {
name: String!
webhook: String!
}
input AddNotificationEmailInput {
name: String!
emailAddress: String!
}
<<<<<<<
input DeleteNotificationMicrosoftTeamsInput {
name: String!
}
=======
input DeleteNotificationEmailInput {
name: String!
}
>>>>>>>
input DeleteNotificationMicrosoftTeamsInput {
name: String!
}
input DeleteNotificationEmailInput {
name: String!
}
<<<<<<<
input UpdateNotificationMicrosoftTeamsPatchInput {
name: String
webhook: String
channel: String
}
=======
input UpdateNotificationEmailPatchInput {
name: String
emailAddress: String
}
>>>>>>>
input UpdateNotificationMicrosoftTeamsPatchInput {
name: String
webhook: String
channel: String
}
input UpdateNotificationEmailPatchInput {
name: String
emailAddress: String
}
<<<<<<<
input UpdateNotificationMicrosoftTeamsInput {
name: String!
patch: UpdateNotificationMicrosoftTeamsPatchInput
}
=======
input UpdateNotificationEmailInput {
name: String!
patch: UpdateNotificationEmailPatchInput
}
>>>>>>>
input UpdateNotificationMicrosoftTeamsInput {
name: String!
patch: UpdateNotificationMicrosoftTeamsPatchInput
}
input UpdateNotificationEmailInput {
name: String!
patch: UpdateNotificationEmailPatchInput
}
<<<<<<<
addNotificationMicrosoftTeams(
input: AddNotificationMicrosoftTeamsInput!
): NotificationMicrosoftTeams
updateNotificationMicrosoftTeams(
input: UpdateNotificationMicrosoftTeamsInput!
): NotificationMicrosoftTeams
deleteNotificationMicrosoftTeams(
input: DeleteNotificationMicrosoftTeamsInput!
): String
deleteAllNotificationMicrosoftTeams: String
=======
addNotificationEmail(
input: AddNotificationEmailInput!
): NotificationEmail
updateNotificationEmail(
input: UpdateNotificationEmailInput!
): NotificationEmail
deleteNotificationEmail(
input: DeleteNotificationEmailInput!
): String
deleteAllNotificationEmails: String
>>>>>>>
addNotificationMicrosoftTeams(
input: AddNotificationMicrosoftTeamsInput!
): NotificationMicrosoftTeams
updateNotificationMicrosoftTeams(
input: UpdateNotificationMicrosoftTeamsInput!
): NotificationMicrosoftTeams
deleteNotificationMicrosoftTeams(
input: DeleteNotificationMicrosoftTeamsInput!
): String
deleteAllNotificationMicrosoftTeams: String
addNotificationEmail(
input: AddNotificationEmailInput!
): NotificationEmail
updateNotificationEmail(
input: UpdateNotificationEmailInput!
): NotificationEmail
deleteNotificationEmail(
input: DeleteNotificationEmailInput!
): String
deleteAllNotificationEmails: String |
<<<<<<<
if (mix.type != 'float') {
throw new Error(`Blending cannot be performed by '${mix.type}'`);
}
if (__WEBPACK_IMPORTED_MODULE_1__schema__["b" /* checkschemaMatch */](a.schema, b.schema)) {
=======
if (__WEBPACK_IMPORTED_MODULE_1__schema__["b" /* checkSchemaMatch */](a.schema, b.schema)) {
>>>>>>>
if (mix.type != 'float') {
throw new Error(`Blending cannot be performed by '${mix.type}'`);
}
if (__WEBPACK_IMPORTED_MODULE_1__schema__["b" /* checkSchemaMatch */](a.schema, b.schema)) { |
<<<<<<<
lowerCaseFunctions.center = functions.CENTER;
lowerCaseFunctions.bottom = functions.BOTTOM;
=======
lowerCaseFunctions.pi = functions.PI;
lowerCaseFunctions.e = functions.E;
>>>>>>>
lowerCaseFunctions.center = functions.CENTER;
lowerCaseFunctions.bottom = functions.BOTTOM;
lowerCaseFunctions.pi = functions.PI;
lowerCaseFunctions.e = functions.E; |
<<<<<<<
import { runViewportAggregations } from './viz/expressions/aggregation/viewport/ViewportAggCalculator';
=======
import { GEOMETRY_TYPE } from '../utils/geometry';
>>>>>>>
import { runViewportAggregations } from './viz/expressions/aggregation/viewport/ViewportAggCalculator';
import { GEOMETRY_TYPE } from '../utils/geometry'; |
<<<<<<<
if (Math.random() > 0.999) {
console.log(metadataPropertyName, name, this.value.expr);
}
=======
this.value._preDraw(drawMetadata, gl);
>>>>>>>
<<<<<<<
if (Math.random() > 0.99) {
console.log(`percentile${this.percentile}`, name, this.value.expr);
}
this.value._preDraw(program, drawMetadata, gl);
=======
this.value._preDraw(drawMetadata, gl);
>>>>>>>
this.value._preDraw(program, drawMetadata, gl); |
<<<<<<<
* @param {Number|number} value - Numeric expression that is going to be tested against the [lowerLimit, upperLimit] range
* @param {Number|number} lowerLimit - Numeric expression with the lower limit of the range
* @param {Number|number} upperLimit - Numeric expression with the upper limit of the range
* @return {Number} Numeric expression with the result of the check
=======
* This returns a numeric expression where 0 means `false` and 1 means `true`.
*
* @param {carto.expressions.Base|number} value - Numeric expression that is going to be tested against the [lowerLimit, upperLimit] range
* @param {carto.expressions.Base|number} lowerLimit - Numeric expression with the lower limit of the range
* @param {carto.expressions.Base|number} upperLimit - Numeric expression with the upper limit of the range
* @return {carto.expressions.Base} Numeric expression with the result of the check
>>>>>>>
* This returns a numeric expression where 0 means `false` and 1 means `true`.
*
* @param {Number|number} value - Numeric expression that is going to be tested against the [lowerLimit, upperLimit] range
* @param {Number|number} lowerLimit - Numeric expression with the lower limit of the range
* @param {Number|number} upperLimit - Numeric expression with the upper limit of the range
* @return {Number} Numeric expression with the result of the check |
<<<<<<<
// Note the required 1 on 1 relationship between layer & viz
throw new CartoValidationError(`${cvt.INCORRECT_VALUE} The given Viz object is already bound to another layer. Vizs cannot be shared between different layers.`);
=======
// Not the required 1 on 1 relationship between layer & viz
throw new CartoValidationError(
'The given Viz object is already bound to another layer. Vizs cannot be shared between different layers.',
CartoValidationErrorTypes.INCORRECT_VALUE
);
>>>>>>>
// Note the required 1 on 1 relationship between layer & viz
throw new CartoValidationError(
'The given Viz object is already bound to another layer. Vizs cannot be shared between different layers.',
CartoValidationErrorTypes.INCORRECT_VALUE
); |
<<<<<<<
_updateDrawMetadata(drawMetadata){
const column = drawMetadata.columns.find(c => c.name == this.property.name);
=======
_preDraw(drawMetadata, gl) {
const name = this._getColumnName();
const column = drawMetadata.columns.find(c => c.name === name);
>>>>>>>
_updateDrawMetadata(drawMetadata){
const name = this._getColumnName();
const column = drawMetadata.columns.find(c => c.name === name);
<<<<<<<
_preDraw(program, drawMetadata, gl) {
// TODO use _updateDrawMetadata
=======
_preDraw(drawMetadata, gl) {
const name = this._getColumnName();
>>>>>>>
_preDraw(program, drawMetadata, gl) {
// TODO use _updateDrawMetadata
const name = this._getColumnName(); |
<<<<<<<
let colorValues = new Uint8Array(4 * width);
const metaColumn = this._meta.columns.find(c => c.name == this.property.name);
metaColumn.categoryNames.map((name, i) => {
=======
let pixels = new Uint8Array(4 * width);
const metaColumn = this._meta.properties[this.property.name];
const orderedCategoryNames = [...metaColumn.categories].sort((a, b) =>
b.frequency - a.frequency
);
orderedCategoryNames.map((cat, i) => {
>>>>>>>
let colorValues = new Uint8Array(4 * width);
const metaColumn = this._meta.properties[this.property.name];
const orderedCategoryNames = [...metaColumn.categories].sort((a, b) =>
b.frequency - a.frequency
);
orderedCategoryNames.map((cat, i) => {
<<<<<<<
colorValues[4 * this._meta.categoryIDs[name] + 3] = (i + 1);
=======
pixels[4 * this._meta.categoryToID.get(cat.name) + 3] = (i + 1);
>>>>>>>
colorValues[4 * this._meta.categoryToID.get(cat.name) + 3] = (i + 1); |
<<<<<<<
}
);
catFields.map((name, i) => fieldMap[name] = i);
numFields.map((name, i) => fieldMap[name] = i + catFields.length);
dateFields.map((name, i) => fieldMap[name] = i + catFields.length + numFields.length);
=======
});
catFieldsReal.map((name, i) => fieldMap[name] = i);
numFieldsReal.map((name, i) => fieldMap[name] = i + catFields.length);
>>>>>>>
});
catFields.map((name, i) => fieldMap[name] = i);
numFields.map((name, i) => fieldMap[name] = i + catFields.length);
dateFields.map((name, i) => fieldMap[name] = i + catFields.length + numFields.length); |
<<<<<<<
viewportAABB.minx -= vizOffset[0] * widthScale;
viewportAABB.maxx -= vizOffset[0] * widthScale;
viewportAABB.miny -= vizOffset[1] * widthScale;
viewportAABB.maxy -= vizOffset[1] * widthScale;
=======
viewportAABB = {
minx: viewportAABB.minx,
miny: viewportAABB.miny,
maxx: viewportAABB.maxx,
maxy: viewportAABB.maxy
};
viewportAABB.minx -= offset[0] * widthScale;
viewportAABB.maxx -= offset[0] * widthScale;
viewportAABB.miny -= offset[1] * widthScale;
viewportAABB.maxy -= offset[1] * widthScale;
>>>>>>>
viewportAABB = {
minx: viewportAABB.minx,
miny: viewportAABB.miny,
maxx: viewportAABB.maxx,
maxy: viewportAABB.maxy
};
viewportAABB.minx -= vizOffset[0] * widthScale;
viewportAABB.maxx -= vizOffset[0] * widthScale;
viewportAABB.miny -= vizOffset[1] * widthScale;
viewportAABB.maxy -= vizOffset[1] * widthScale; |
<<<<<<<
if (renderLayer.type === 'point') {
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
} else {
// lines & polygon (antialiasing)
=======
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
if (renderLayer.type !== GEOMETRY_TYPE.POINT) {
>>>>>>>
if (renderLayer.type === GEOMETRY_TYPE.POINT) {
gl.bindFramebuffer(gl.FRAMEBUFFER, null);
gl.viewport(0, 0, gl.drawingBufferWidth, gl.drawingBufferHeight);
} else {
// lines & polygon (antialiasing)
<<<<<<<
if (dataframe.type === 'line' || dataframe.type === 'polygon') {
gl.clear(gl.DEPTH_BUFFER_BIT); // antialising-related
=======
if (dataframe.type === GEOMETRY_TYPE.LINE || dataframe.type === GEOMETRY_TYPE.POLYGON) {
gl.clear(gl.DEPTH_BUFFER_BIT);
>>>>>>>
if (dataframe.type === GEOMETRY_TYPE.LINE || dataframe.type === GEOMETRY_TYPE.POLYGON) {
gl.clear(gl.DEPTH_BUFFER_BIT); // antialising-related |
<<<<<<<
import { RGB, RGBA } from './expressions/rgb';
import { HSV, HSVA } from './expressions/hsv';
import { HSL, HSLA } from './expressions/hsl';
import NamedColor from './expressions/named-color';
=======
import {RGB, RGBA} from './expressions/rgb';
import {HSV, HSVA} from './expressions/hsv';
import {HSL, HSLA} from './expressions/hsl';
import Hex from './expressions/hex';
>>>>>>>
import {RGB, RGBA} from './expressions/rgb';
import {HSV, HSVA} from './expressions/hsv';
import {HSL, HSLA} from './expressions/hsl';
import Hex from './expressions/hex';
import NamedColor from './expressions/named-color'; |
<<<<<<<
const featureClassCache = new Map();
=======
const AABBTestResults = {
INSIDE: 1,
OUTSIDE: -1,
INTERSECTS: 0
};
>>>>>>>
const featureClassCache = new Map();
const AABBTestResults = {
INSIDE: 1,
OUTSIDE: -1,
INTERSECTS: 0
};
<<<<<<<
const feature = new this._cls(index, this);
=======
>>>>>>>
const feature = new this._cls(index, this);
<<<<<<<
getPropertyTexture (propertyName) {
if (this.propertyTex[propertyName]) {
return this.propertyTex[propertyName];
}
const propertiesFloat32Array = this.properties[propertyName];
// Dataframe is already bound to this context, "hot update" it
const gl = this.renderer.gl;
const width = this.renderer.RTT_WIDTH;
const height = Math.ceil(this.numFeatures / width);
this.height = height;
this.propertyTex[propertyName] = gl.createTexture();
gl.bindTexture(gl.TEXTURE_2D, this.propertyTex[propertyName]);
gl.texImage2D(gl.TEXTURE_2D, 0, gl.ALPHA,
width, height, 0, gl.ALPHA, gl.FLOAT,
propertiesFloat32Array);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_S, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_WRAP_T, gl.CLAMP_TO_EDGE);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
return this.propertyTex[propertyName];
}
// Add new properties to the dataframe or overwrite previously stored ones.
// `properties` is of the form: {propertyName: Float32Array}
addProperties (properties) {
for (let i = 0; i < this.metadata.propertyKeys.length; i++) {
const propertyName = this.metadata.propertyKeys[i];
this._addProperty(propertyName);
}
this._genFeatureClass();
}
=======
>>>>>>>
// Add new properties to the dataframe or overwrite previously stored ones.
// `properties` is of the form: {propertyName: Float32Array}
addProperties (properties) {
for (let i = 0; i < this.metadata.propertyKeys.length; i++) {
const propertyName = this.metadata.propertyKeys[i];
this._addProperty(propertyName);
}
this._genFeatureClass();
} |
<<<<<<<
validateStaticTypeErrors('opacity', ['number']);
validateStaticTypeErrors('opacity', ['number', 'number']);
=======
validateStaticTypeErrors('opacity', ['float']);
validateDynamicTypeErrors('opacity', ['float', 'float']);
>>>>>>>
validateStaticTypeErrors('opacity', ['number']);
validateDynamicTypeErrors('opacity', ['number', 'number']); |
<<<<<<<
properties[name][i] = this._metadata.decode(name, f.properties[name]);
=======
const numericValue = Number(f.properties[name]);
properties[name][i] = Number.isNaN(numericValue)
? Number.MIN_SAFE_INTEGER
: numericValue;
});
dateFields.forEach(name => {
const property = this._properties[name];
// dates in Dataframes are mapped to [0,1] to maximize precision
const d = util.castDate(f.properties[name]).getTime();
const min = property.min;
const max = property.max;
const n = (d - min.getTime()) / (max.getTime() - min.getTime());
properties[name][i] = n;
>>>>>>>
properties[name][i] = this._metadata.decode(name, f.properties[name]);
const numericValue = Number(f.properties[name]);
properties[name][i] = Number.isNaN(numericValue)
? Number.MIN_SAFE_INTEGER
: numericValue;
});
dateFields.forEach(name => {
const property = this._properties[name];
// dates in Dataframes are mapped to [0,1] to maximize precision
const d = util.castDate(f.properties[name]).getTime();
const min = property.min;
const max = property.max;
const n = (d - min.getTime()) / (max.getTime() - min.getTime());
properties[name][i] = n; |
<<<<<<<
// window.ieShivDebug = true;
// uncomment above if you want to test
(function(exports) {
=======
(function (exports) {
>>>>>>>
(function (exports) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
}
=======
}
>>>>>>>
} |
<<<<<<<
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolve files and exclude
basePath = '..';
// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,
'test/lib/jquery/jquery-1.7.2.js',
'test/lib/jquery/jquery-ui-1.8.18.js',
'test/lib/angular-1.0.1/angular.js',
'test/lib/angular-1.0.1/angular-mocks.js',
'test/lib/codemirror/codemirror.js',
'test/lib/tinymce/tiny_mce.js',
'test/lib/tinymce/jquery.tinymce.js',
'test/lib/googlemaps/googlemaps.js',
'test/lib/bootstrap/bootstrap-modal.js',
'test/lib/select2/select2.js',
'test/lib/maskedinput/jquery.maskedinput-1.3.js',
'common/module.js',
'modules/*/*/*.js',
'modules/*/*/test/*.js',
'templates/*.js',
'templates/test/*.js'
];
// list of files to exclude
exclude = [];
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots' || 'progress'
reporter = 'dots';
// these are default values, just to show available options
// web server port
port = 8080;
// cli runner port
runnerPort = 9100;
// enable / disable colors in the output (reporters and logs)
colors = true;
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_DEBUG;
// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// polling interval in ms (ignored on OS that support inotify)
autoWatchInterval = 0;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
=======
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolve files and exclude
basePath = '..';
// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,
'test/lib/jquery/jquery-1.7.2.js',
'test/lib/jquery/jquery-ui-1.8.18.js',
'test/lib/angular-1.0.1/angular.js',
'test/lib/angular-1.0.1/angular-mocks.js',
'test/lib/codemirror/codemirror.js',
'test/lib/tinymce/jquery.tinymce.js',
'test/lib/googlemaps/googlemaps.js',
'test/lib/bootstrap/bootstrap-modal.js',
'test/lib/calendar/calendar.js.min',
'common/module.js',
'modules/*/*/*.js',
'modules/*/*/test/*.js',
'templates/*.js',
'templates/test/*.js'
];
// list of files to exclude
exclude = [];
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots' || 'progress'
reporter = 'dots';
// these are default values, just to show available options
// web server port
port = 8080;
// cli runner port
runnerPort = 9100;
// enable / disable colors in the output (reporters and logs)
colors = true;
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_DEBUG;
// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// polling interval in ms (ignored on OS that support inotify)
autoWatchInterval = 0;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS
>>>>>>>
// Sample Testacular configuration file, that contain pretty much all the available options
// It's used for running client tests on Travis (http://travis-ci.org/#!/vojtajina/testacular)
// Most of the options can be overriden by cli arguments (see testacular --help)
// base path, that will be used to resolve files and exclude
basePath = '..';
// list of files / patterns to load in the browser
files = [
JASMINE,
JASMINE_ADAPTER,
'test/lib/jquery/jquery-1.7.2.js',
'test/lib/jquery/jquery-ui-1.8.18.js',
'test/lib/angular-1.0.1/angular.js',
'test/lib/angular-1.0.1/angular-mocks.js',
'test/lib/codemirror/codemirror.js',
'test/lib/tinymce/tiny_mce.js',
'test/lib/tinymce/jquery.tinymce.js',
'test/lib/googlemaps/googlemaps.js',
'test/lib/bootstrap/bootstrap-modal.js',
'test/lib/select2/select2.js',
'test/lib/maskedinput/jquery.maskedinput-1.3.js',
'test/lib/calendar/calendar.js.min',
'common/module.js',
'modules/*/*/*.js',
'modules/*/*/test/*.js',
'templates/*.js',
'templates/test/*.js'
];
// list of files to exclude
exclude = [];
// use dots reporter, as travis terminal does not support escaping sequences
// possible values: 'dots' || 'progress'
reporter = 'dots';
// these are default values, just to show available options
// web server port
port = 8080;
// cli runner port
runnerPort = 9100;
// enable / disable colors in the output (reporters and logs)
colors = true;
// level of logging
// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
logLevel = LOG_DEBUG;
// enable / disable watching file and executing tests whenever any file changes
autoWatch = false;
// polling interval in ms (ignored on OS that support inotify)
autoWatchInterval = 0;
// Start these browsers, currently available:
// - Chrome
// - ChromeCanary
// - Firefox
// - Opera
// - Safari
// - PhantomJS |
<<<<<<<
let context = { bakerPath: env_address };
await connector.ready(context);
=======
try {
await connector.ready();
} catch (error) {
console.error(chalk.red(` => ${error}`));
process.exit(1);
}
>>>>>>>
let context = { bakerPath: env_address };
try {
await connector.ready(context);
} catch (error) {
console.error(chalk.red(` => ${error}`));
process.exit(1);
} |
<<<<<<<
=======
test('class prefix', async function(assert) {
assert.expect(1);
await render(hbs`<SelectBox::SelectedOptions @classNamePrefix="foo" />`);
assert
.dom('.foo__selected-options')
.exists({ count: 1 }, 'can override the class prefix');
});
test('data component attribute', async function(assert) {
assert.expect(1);
await render(hbs`<SelectBox::SelectedOptions />`);
assert
.dom('[data-component="selected-options"]')
.exists({ count: 1 }, 'has a data attribute signifying its type');
});
>>>>>>>
test('data component attribute', async function(assert) {
assert.expect(1);
await render(hbs`<SelectBox::SelectedOptions />`);
assert
.dom('[data-component="selected-options"]')
.exists({ count: 1 }, 'has a data attribute signifying its type');
}); |
<<<<<<<
=======
test('class prefix attr', async function(assert) {
assert.expect(9);
await render(hbs`
<SelectBox @classNamePrefix="foo" as |sb|>
<sb.Input />
<sb.SelectedOptions>
<sb.SelectedOption />
</sb.SelectedOptions>
<sb.Options>
<sb.Group>
<sb.Option />
</sb.Group>
</sb.Options>
</SelectBox>
`);
assert.dom('.foo').exists({ count: 1 });
assert.dom('.foo__input').exists({ count: 1 });
assert.dom('.foo__options').exists({ count: 1 });
assert.dom('.foo__selected-options').exists({ count: 1 });
assert.dom('.foo__group').exists({ count: 1 });
assert.dom('.foo__group-label').exists({ count: 1 });
assert.dom('.foo__group-options').exists({ count: 1 });
assert.dom('.foo__option').exists({ count: 1 });
assert.dom('.foo__selected-option').exists({ count: 1 });
});
test('data component attribute', async function(assert) {
assert.expect(1);
await render(hbs`<SelectBox />`);
assert
.dom('[data-component="select-box"]')
.exists({ count: 1 }, 'has a data attribute signifying its type');
});
>>>>>>>
test('data component attribute', async function(assert) {
assert.expect(1);
await render(hbs`<SelectBox />`);
assert
.dom('[data-component="select-box"]')
.exists({ count: 1 }, 'has a data attribute signifying its type');
}); |
<<<<<<<
=======
test('class prefix', async function(assert) {
assert.expect(2);
await render(hbs`<NativeSelectBox @classNamePrefix="foo" />`);
assert.dom('.foo').exists({ count: 1 }, 'can override the class prefix');
await render(hbs`
<NativeSelectBox @classNamePrefix="foo" as |sb|>
<sb.Group>
<sb.Option />
</sb.Group>
</NativeSelectBox>
`);
assert.ok(
findAll('.foo__group').length === 1 &&
findAll('.foo__option').length === 1,
'class prefix trickles down to children'
);
});
test('data component attribute', async function(assert) {
assert.expect(1);
await render(hbs`<NativeSelectBox />`);
assert
.dom('[data-component="select-box"]')
.exists({ count: 1 }, 'has a data attribute signifying its type');
});
>>>>>>>
test('data component attribute', async function(assert) {
assert.expect(1);
await render(hbs`<NativeSelectBox />`);
assert
.dom('[data-component="select-box"]')
.exists({ count: 1 }, 'has a data attribute signifying its type');
}); |
<<<<<<<
import { Select, Card, Stack, Button, ButtonGroup } from "@shopify/polaris";
=======
import { Select, Card, Stack, Button, ButtonGroup, RangeSlider } from "@shopify/polaris";
import {
bandpassFilter,
epoch,
fft,
sliceFFT,
powerByBand
} from "@neurosity/pipes";
import {Subject} from "rxjs";
import { catchError, multicast } from "rxjs/operators";
>>>>>>>
import { Select, Card, Stack, Button, ButtonGroup, RangeSlider } from "@shopify/polaris";
import {
bandpassFilter,
epoch,
fft,
sliceFFT,
powerByBand
} from "@neurosity/pipes";
import {Subject} from "rxjs";
import { catchError, multicast } from "rxjs/operators";
<<<<<<<
=======
import { generateXTics, numOptions, bandLabels, standardDeviation } from "./utils/chartUtils";
>>>>>>>
import { generateXTics, numOptions, bandLabels, standardDeviation } from "./utils/chartUtils";
<<<<<<<
=======
function setupRaw() {
console.log("Subscribing to Raw");
if (window.multicastRaw$) {
window.subscriptionRaw$ = window.multicastRaw$.subscribe(data => {
setRawData(rawData => {
Object.values(rawData).forEach((channel, index) => {
if (index < 4) {
channel.datasets[0].data = data.data[index];
channel.xLabels = generateXTics(rawPipeSettings.srate, rawPipeSettings.duration);
channel.datasets[0].qual = standardDeviation(data.data[index])
}
});
return {
ch0: rawData.ch0,
ch1: rawData.ch1,
ch2: rawData.ch2,
ch3: rawData.ch3
};
});
});
window.multicastRaw$.connect();
console.log("Subscribed to Raw");
}
}
function setupSpectra() {
console.log("Subscribing to Spectra");
if (window.multicastSpectra$) {
window.subscriptionSpectra$ = window.multicastSpectra$.subscribe(data => {
setSpectraData(spectraData => {
Object.values(spectraData).forEach((channel, index) => {
if (index < 4) {
channel.datasets[0].data = data.psd[index];
channel.xLabels = data.freqs;
}
});
return {
ch0: spectraData.ch0,
ch1: spectraData.ch1,
ch2: spectraData.ch2,
ch3: spectraData.ch3
};
});
});
window.multicastSpectra$.connect();
console.log("Subscribed to Spectra");
}
}
function setupBands() {
console.log("Subscribing to Bands");
if (window.multicastBands$) {
window.subscriptionBands$ = window.multicastBands$.subscribe(data => {
setBandsData(bandsData => {
Object.values(bandsData).forEach((channel, index) => {
if (index < 4) {
channel.datasets[0].data = [
data.delta[index],
data.theta[index],
data.alpha[index],
data.beta[index],
data.gamma[index]
];
channel.xLabels = bandLabels;
}
});
return {
ch0: bandsData.ch0,
ch1: bandsData.ch1,
ch2: bandsData.ch2,
ch3: bandsData.ch3
};
});
});
window.multicastBands$.connect();
console.log("Subscribed to Bands");
}
}
function pipeRawData() {
if (window.subscriptionRaw$) window.subscriptionRaw$.unsubscribe();
window.pipeRaw$ = null;
window.multicastRaw$ = null;
window.subscriptionRaw$ = null;
// Build Pipe Raw
window.pipeRaw$ = zipSamples(window.source$.eegReadings).pipe(
bandpassFilter({ cutoffFrequencies: [rawPipeSettings.cutOffLow, rawPipeSettings.cutOffHigh], nbChannels: rawPipeSettings.nbChannels }),
epoch({
duration: rawPipeSettings.duration,
interval: rawPipeSettings.interval,
samplingRate: rawPipeSettings.srate
}),
catchError(err => {
console.log(err);
})
);
window.multicastRaw$ = window.pipeRaw$.pipe(
multicast(() => new Subject())
);
}
function pipeSpectraData() {
if (window.subscriptionSpectra$) window.subscriptionSpectra$.unsubscribe();
window.pipeSpectra$ = null;
window.multicastSpectra$ = null;
window.subscriptionSpectra$ = null;
window.pipeSpectra$ = zipSamples(window.source$.eegReadings).pipe(
bandpassFilter({ cutoffFrequencies: [spectraPipeSettings.cutOffLow, spectraPipeSettings.cutOffHigh], nbChannels: spectraPipeSettings.nbChannels }),
epoch({
duration: spectraPipeSettings.duration,
interval: spectraPipeSettings.interval,
samplingRate: spectraPipeSettings.srate
}),
fft({ bins: spectraPipeSettings.bins }),
sliceFFT([spectraPipeSettings.sliceFFTLow, spectraPipeSettings.sliceFFTHigh]),
catchError(err => {
console.log(err);
})
);
window.multicastSpectra$ = window.pipeSpectra$.pipe(
multicast(() => new Subject())
);
}
function pipeBandsData() {
if (window.subscriptionBands$) window.subscriptionBands$.unsubscribe();
window.pipeBands$ = null;
window.multicastBands$ = null;
window.subscriptionBands$ = null;
window.pipeBands$ = zipSamples(window.source$.eegReadings).pipe(
bandpassFilter({ cutoffFrequencies: [2, 20], nbChannels: 4 }),
epoch({
duration: numOptions.duration,
interval: 100,
samplingRate: numOptions.srate
}),
fft({ bins: 256 }),
powerByBand(),
catchError(err => {
console.log(err);
})
);
window.multicastBands$ = window.pipeBands$.pipe(
multicast(() => new Subject())
);
}
>>>>>>>
<<<<<<<
buildPipeRaw();
buildPipeSpectra();
buildPipeBands();
=======
// Build Pipe Raw
pipeRawData();
// Build Pipe Spectra
setupSpectra();
pipeSpectraData();
// Build Pipe Bands
pipeBandsData();
>>>>>>>
buildPipeRaw();
buildPipeSpectra();
buildPipeBands(); |
<<<<<<<
=======
// let delta = 0;
// let theta = 0;
>>>>>>>
<<<<<<<
=======
// let gamma = 0;
>>>>>>>
<<<<<<<
alpha = Math.floor((props.alpha/5) * p.width);
beta = Math.floor((props.beta/2) * p.height);
=======
// delta = Math.floor(props.delta);
// theta = Math.floor(100*props.theta);
alpha = Math.floor(100*props.alpha);
beta = Math.floor(300*props.beta);
// gamma = Math.floor(props.gamma);
>>>>>>>
alpha = Math.floor((props.alpha/5) * p.width);
beta = Math.floor((props.beta/2) * p.height); |
<<<<<<<
,bg: 'Помпа'
=======
,ro: 'Pompă'
>>>>>>>
,bg: 'Помпа'
,ro: 'Pompă'
<<<<<<<
,de: 'Sensor-Alter'
,bg: 'Възраст на сензора'
=======
,de: 'Sensora-Alter'
,ro: 'Vechimea senzorului'
>>>>>>>
,de: 'Sensor-Alter'
,bg: 'Възраст на сензора'
,ro: 'Vechimea senzorului'
<<<<<<<
,bg: 'Възраст на инсулина'
=======
,ro: 'Vechimea insulinei'
>>>>>>>
,bg: 'Възраст на инсулина'
,ro: 'Vechimea insulinei'
<<<<<<<
,bg: 'Временни граници'
=======
,ro: 'Țintă temporală'
>>>>>>>
,bg: 'Временни граници'
,ro: 'Țintă temporală'
<<<<<<<
,bg: 'Горе'
=======
,ro: 'Deasupra'
>>>>>>>
,bg: 'Горе'
,ro: 'Deasupra'
<<<<<<<
,bg: 'Долу'
=======
,ro: 'Sub'
>>>>>>>
,bg: 'Долу'
,ro: 'Sub'
<<<<<<<
,bg: 'Активност'
=======
,ro: 'Activitate'
>>>>>>>
,bg: 'Активност'
,ro: 'Activitate'
<<<<<<<
,bg: 'Граници'
=======
,ro: 'Ținte'
>>>>>>>
,bg: 'Граници'
,ro: 'Ținte' |
<<<<<<<
env.settings.enable.should.containEql('pushover');
=======
env.enable.should.containEql('pushover');
env.extendedSettings.pushover.apiToken.should.equal('abc12345');
>>>>>>>
env.settings.enable.should.containEql('pushover');
env.extendedSettings.pushover.apiToken.should.equal('abc12345');
<<<<<<<
env.settings.enable.should.containEql('pushover');
=======
env.enable.should.containEql('pushover');
env.extendedSettings.pushover.apiToken.should.equal('abc12345');
>>>>>>>
env.settings.enable.should.containEql('pushover');
env.extendedSettings.pushover.apiToken.should.equal('abc12345'); |
<<<<<<<
if (!isTimeAgoAlarmType(currentAlarmType)) {
bg_title = alarmMessage + ': ' + generateTitle();
}
} else if (browserSettings.customTitle) {
$('.customTitle').text(browserSettings.customTitle);
=======
} else if (currentAnnouncement) {
announcementInProgress = Date.now() - currentAnnouncement.received < FIVE_MINS_IN_MS;
bg_title = generateTitle();
if (announcementInProgress) {
var aMessage = currentAnnouncement.message.length > 1 ? currentAnnouncement.message : currentAnnouncement.title;
bg_title = aMessage + ': ' + bg_title;
$('.customTitle').text(aMessage);
} else {
currentAnnouncement = null;
console.info('clearing announcement');
}
>>>>>>>
if (!isTimeAgoAlarmType(currentAlarmType)) {
bg_title = alarmMessage + ': ' + generateTitle();
}
} else if (currentAnnouncement) {
announcementInProgress = Date.now() - currentAnnouncement.received < FIVE_MINS_IN_MS;
bg_title = generateTitle();
if (announcementInProgress) {
var aMessage = currentAnnouncement.message.length > 1 ? currentAnnouncement.message : currentAnnouncement.title;
bg_title = aMessage + ': ' + generateTitle();
$('.customTitle').text(aMessage);
} else {
currentAnnouncement = null;
$('.customTitle').text(bg_title);
console.info('cleared announcement');
}
<<<<<<<
if (bg_title === undefined) {
bg_title = generateTitle();
=======
container.toggleClass('announcing', announcementInProgress);
if (!skipPageTitle) {
$(document).attr('title', bg_title);
>>>>>>>
container.toggleClass('announcing', announcementInProgress);
if (bg_title === undefined) {
bg_title = generateTitle(); |
<<<<<<<
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
=======
,bg: 'временните базали трябва да са показани за да се покаже тази това'
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
>>>>>>>
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
,bg: 'временните базали трябва да са показани за да се покаже тази това'
,he: 'חובה לאפשר רמה בזלית זמנית כדי לרות דוח זה'
<<<<<<<
,he: 'נורמלי'
=======
,he: 'נורמלי'
>>>>>>>
,he: 'נורמלי'
<<<<<<<
,he: 'דוח אחוזון סוכר'
=======
,he: 'דוח אחוזון סוכר'
>>>>>>>
,he: 'דוח אחוזון סוכר'
<<<<<<<
,he: 'הצלחה שבועית'
=======
,he: 'הצלחה שבועית'
>>>>>>>
,he: 'הצלחה שבועית'
<<<<<<<
,he: 'עורך אוכל'
=======
,he: 'עורך אוכל'
>>>>>>>
,he: 'עורך אוכל'
<<<<<<<
,he:'הכנס את הסיסמא הסודית של ה API'
=======
,he:'הכנס את הסיסמא הסודית של ה API'
>>>>>>>
,he:'הכנס את הסיסמא הסודית של ה API'
<<<<<<<
,he: 'בסיס נתונים נטען'
=======
,he: 'בסיס נתונים נטען'
>>>>>>>
,he: 'בסיס נתונים נטען'
<<<<<<<
,he: 'GI'
=======
,he: 'GI'
>>>>>>>
,he: 'GI'
<<<<<<<
,he:' הסיסמא הסודית חייבת להיות באורך של 12 תווים לפחות'
=======
,he:' הסיסמא הסודית חייבת להיות באורך של 12 תווים לפחות'
>>>>>>>
,he:' הסיסמא הסודית חייבת להיות באורך של 12 תווים לפחות'
<<<<<<<
,he: ' הסיסמא הסודית אינה חוקית'
=======
,he: ' הסיסמא הסודית אינה חוקית'
>>>>>>>
,he: ' הסיסמא הסודית אינה חוקית'
<<<<<<<
,he: ' הסיסמא הסודית נשמרה'
=======
,he: ' הסיסמא הסודית נשמרה'
>>>>>>>
,he: ' הסיסמא הסודית נשמרה'
<<<<<<<
,he: 'לא נטען'
=======
,he: 'לא נטען'
>>>>>>>
,he: 'לא נטען'
<<<<<<<
,he: 'עורך מזון'
=======
,he: 'עורך מזון'
>>>>>>>
,he: 'עורך מזון'
<<<<<<<
,he: 'הסיסמא הסודית שלך'
=======
,he: 'הסיסמא הסודית שלך'
>>>>>>>
,he: 'הסיסמא הסודית שלך'
<<<<<<<
,he:'שמור סיסמא הסודית על המחשב ( יש להשתמש רק על מחשב פרטי)'
=======
,he:'שמור סיסמא הסודית על המחשב ( יש להשתמש רק על מחשב פרטי)'
>>>>>>>
,he:'שמור סיסמא הסודית על המחשב ( יש להשתמש רק על מחשב פרטי)' |
<<<<<<<
, de: 'Oberes Ziel'
=======
, tr: 'Hedef Üst'
>>>>>>>
, de: 'Oberes Ziel'
, tr: 'Hedef Üst'
<<<<<<<
, de: 'Unteres Ziel'
=======
, tr: 'Hedef Alt'
>>>>>>>
, de: 'Unteres Ziel'
, tr: 'Hedef Alt'
<<<<<<<
, de: 'Abgebrochen'
=======
, tr: 'İptal edildi'
>>>>>>>
, de: 'Abgebrochen'
, tr: 'İptal edildi'
<<<<<<<
, de: 'Wert Blutzuckermessgerät'
=======
, tr: 'Glikometre KŞ'
>>>>>>>
, de: 'Wert Blutzuckermessgerät'
, tr: 'Glikometre KŞ'
<<<<<<<
, de: 'vorhergesagt'
=======
, tr: 'tahmin'
>>>>>>>
, de: 'vorhergesagt'
, tr: 'tahmin'
<<<<<<<
, de: 'Zukunft'
=======
, tr: 'gelecek'
>>>>>>>
, de: 'Zukunft'
, tr: 'gelecek'
<<<<<<<
, de: 'vor'
=======
, tr: 'önce'
>>>>>>>
, de: 'vor'
, tr: 'önce'
<<<<<<<
, de: 'Zuletzt Daten empfangen'
=======
, tr: 'Son veri alındı'
>>>>>>>
, de: 'Zuletzt Daten empfangen'
, tr: 'Son veri alındı' |
<<<<<<<
'alexaLoopForecast': {
bg: 'According to the loop forecast you are expected to be %1 over the next %2'
, cs: 'Podle přepovědi smyčky je očekávána glykémie %1 během následujících %2'
, en: 'According to the loop forecast you are expected to be %1 over the next %2'
, hr: 'According to the loop forecast you are expected to be %1 over the next %2'
, de: 'Entsprechend der Loop Vorhersage landest du bei %1 während der nächsten %2'
, dk: 'Ifølge Loops forudsigelse forventes du at blive %1 i den næste %2'
, ko: 'According to the loop forecast you are expected to be %1 over the next %2'
, nl: 'Volgens de Loop voorspelling is je waarde %1 over de volgnede %2'
,zh_cn: '根据loop的预测，在接下来的%2你的血糖将会是%1'
, sv: 'Enligt Loops förutsägelse förväntas du bli %1 inom %2'
, fi: 'Ennusteen mukaan olet %1 seuraavan %2 ajan'
, ro: 'Potrivit previziunii date de loop se estiemază %1 pentru următoarele %2'
, pl: 'Zgodnie z prognozą pętli, glikemia %1 będzie podczas następnego %2'
, ru: 'по прогнозу алгоритма ЗЦ ожидается %1 в последующие %2'
, tr: 'Döngü tahminine göre sonraki %2 ye göre %1 olması bekleniyor'
=======
'virtAsstLoopForecastAround': {
bg: 'According to the loop forecast you are expected to be around %1 over the next %2'
, cs: 'Podle přepovědi smyčky je očekávána glykémie around %1 během následujících %2'
, en: 'According to the loop forecast you are expected to be around %1 over the next %2'
, hr: 'According to the loop forecast you are expected to be around %1 over the next %2'
, de: 'Entsprechend der Loop Vorhersage landest du bei around %1 während der nächsten %2'
, dk: 'Ifølge Loops forudsigelse forventes du at blive around %1 i den næste %2'
, ko: 'According to the loop forecast you are expected to be around %1 over the next %2'
, nl: 'Volgens de Loop voorspelling is je waarde around %1 over de volgnede %2'
, zh_cn: '根据loop的预测，在接下来的%2你的血糖将会是around %1'
, sv: 'Enligt Loops förutsägelse förväntas du bli around %1 inom %2'
, fi: 'Ennusteen mukaan olet around %1 seuraavan %2 ajan'
, ro: 'Potrivit previziunii date de loop se estiemază around %1 pentru următoarele %2'
, pl: 'Zgodnie z prognozą pętli, glikemia around %1 będzie podczas następnego %2'
, ru: 'по прогнозу алгоритма ЗЦ ожидается around %1 за последующие %2'
, tr: 'Döngü tahminine göre sonraki %2 ye göre around %1 olması bekleniyor'
},
'virtAsstLoopForecastBetween': {
bg: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, cs: 'Podle přepovědi smyčky je očekávána glykémie between %1 and %2 během následujících %3'
, en: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, hr: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, de: 'Entsprechend der Loop Vorhersage landest du bei between %1 and %2 während der nächsten %3'
, dk: 'Ifølge Loops forudsigelse forventes du at blive between %1 and %2 i den næste %3'
, ko: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, nl: 'Volgens de Loop voorspelling is je waarde between %1 and %2 over de volgnede %3'
, zh_cn: '根据loop的预测，在接下来的%3你的血糖将会是between %1 and %2'
, sv: 'Enligt Loops förutsägelse förväntas du bli between %1 and %2 inom %3'
, fi: 'Ennusteen mukaan olet between %1 and %2 seuraavan %3 ajan'
, ro: 'Potrivit previziunii date de loop se estiemază between %1 and %2 pentru următoarele %3'
, pl: 'Zgodnie z prognozą pętli, glikemia between %1 and %2 będzie podczas następnego %3'
, ru: 'по прогнозу алгоритма ЗЦ ожидается between %1 and %2 за последующие %3'
, tr: 'Döngü tahminine göre sonraki %3 ye göre between %1 and %2 olması bekleniyor'
},
'virtAsstAR2ForecastAround': {
bg: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, cs: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, en: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, hr: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, de: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, dk: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, ko: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, nl: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, zh_cn: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, sv: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, fi: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, ro: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, pl: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, ru: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, tr: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
>>>>>>>
'virtAsstLoopForecastAround': {
bg: 'According to the loop forecast you are expected to be around %1 over the next %2'
, cs: 'Podle přepovědi smyčky je očekávána glykémie around %1 během následujících %2'
, en: 'According to the loop forecast you are expected to be around %1 over the next %2'
, hr: 'According to the loop forecast you are expected to be around %1 over the next %2'
, de: 'Entsprechend der Loop Vorhersage landest du bei around %1 während der nächsten %2'
, dk: 'Ifølge Loops forudsigelse forventes du at blive around %1 i den næste %2'
, ko: 'According to the loop forecast you are expected to be around %1 over the next %2'
, nl: 'Volgens de Loop voorspelling is je waarde around %1 over de volgnede %2'
, zh_cn: '根据loop的预测，在接下来的%2你的血糖将会是around %1'
, sv: 'Enligt Loops förutsägelse förväntas du bli around %1 inom %2'
, fi: 'Ennusteen mukaan olet around %1 seuraavan %2 ajan'
, ro: 'Potrivit previziunii date de loop se estiemază around %1 pentru următoarele %2'
, pl: 'Zgodnie z prognozą pętli, glikemia around %1 będzie podczas następnego %2'
, ru: 'по прогнозу алгоритма ЗЦ ожидается around %1 за последующие %2'
, tr: 'Döngü tahminine göre sonraki %2 ye göre around %1 olması bekleniyor'
},
'virtAsstLoopForecastBetween': {
bg: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, cs: 'Podle přepovědi smyčky je očekávána glykémie between %1 and %2 během následujících %3'
, en: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, hr: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, de: 'Entsprechend der Loop Vorhersage landest du bei between %1 and %2 während der nächsten %3'
, dk: 'Ifølge Loops forudsigelse forventes du at blive between %1 and %2 i den næste %3'
, ko: 'According to the loop forecast you are expected to be between %1 and %2 over the next %3'
, nl: 'Volgens de Loop voorspelling is je waarde between %1 and %2 over de volgnede %3'
, zh_cn: '根据loop的预测，在接下来的%3你的血糖将会是between %1 and %2'
, sv: 'Enligt Loops förutsägelse förväntas du bli between %1 and %2 inom %3'
, fi: 'Ennusteen mukaan olet between %1 and %2 seuraavan %3 ajan'
, ro: 'Potrivit previziunii date de loop se estiemază between %1 and %2 pentru următoarele %3'
, pl: 'Zgodnie z prognozą pętli, glikemia between %1 and %2 będzie podczas następnego %3'
, ru: 'по прогнозу алгоритма ЗЦ ожидается between %1 and %2 за последующие %3'
, tr: 'Döngü tahminine göre sonraki %3 ye göre between %1 and %2 olması bekleniyor'
},
'virtAsstAR2ForecastAround': {
bg: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, cs: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, en: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, hr: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, de: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, dk: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, ko: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, nl: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, zh_cn: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, sv: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, fi: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, ro: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, pl: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, ru: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
, tr: 'According to the AR2 forecast you are expected to be around %1 over the next %2'
<<<<<<<
,ru: 'Белки'
=======
,he: 'חלבון'
>>>>>>>
,ru: 'Белки'
,he: 'חלבון'
<<<<<<<
,ru: 'Жиры'
=======
,he: 'שמן'
>>>>>>>
,ru: 'Жиры'
,he: 'שמן'
<<<<<<<
,ru: 'Средний белок'
=======
,he: 'חלבון ממוצע'
>>>>>>>
,ru: 'Средний белок'
,he: 'חלבון ממוצע'
<<<<<<<
,ru: 'Средний жир'
=======
,he: 'שמן ממוצע'
>>>>>>>
,ru: 'Средний жир'
,he: 'שמן ממוצע'
<<<<<<<
,ru: 'Всего углеводов'
=======
,he: 'כל פחמימות'
>>>>>>>
,ru: 'Всего углеводов'
,he: 'כל פחמימות'
<<<<<<<
,ru: 'Всего белков'
=======
,he: 'כל חלבונים'
>>>>>>>
,ru: 'Всего белков'
,he: 'כל חלבונים'
<<<<<<<
,ru: 'Всего жиров'
=======
,he: 'כל שומנים'
>>>>>>>
,ru: 'Всего жиров'
,he: 'כל שומנים' |
<<<<<<<
renderer.addBasals(client);
renderer.addTreatmentProfiles(client);
=======
>>>>>>>
renderer.addTreatmentProfiles(client); |
<<<<<<<
var units = require('./units')();
=======
var ObjectID = require('mongodb').ObjectID;
>>>>>>>
var units = require('./units')();
var ObjectID = require('mongodb').ObjectID; |
<<<<<<<
,it: 'Tempo in fluttuazione'
=======
,ru: 'время флуктуаций'
>>>>>>>
,it: 'Tempo in fluttuazione'
,ru: 'время флуктуаций'
<<<<<<<
,it: 'Tempo in rapida fluttuazione'
=======
,ru: 'время быстрых флуктуаций'
>>>>>>>
,it: 'Tempo in rapida fluttuazione'
,ru: 'время быстрых флуктуаций'
<<<<<<<
,it: 'Questa è solo un\'approssimazione che può essere molto inaccurata e che non sostituisce la misurazione capillare. La formula usata è presa da:'
=======
,ru: 'Это приблизительная оценка не заменяющая фактический анализ крови. Используемая формула взята из:'
>>>>>>>
,it: 'Questa è solo un\'approssimazione che può essere molto inaccurata e che non sostituisce la misurazione capillare. La formula usata è presa da:'
,ru: 'Это приблизительная оценка не заменяющая фактический анализ крови. Используемая формула взята из:'
<<<<<<<
,it: 'Filtra per ore'
=======
,ru: 'почасовой фильтр'
>>>>>>>
,it: 'Filtra per ore'
,ru: 'почасовой фильтр'
<<<<<<<
,it: 'Tempo in fluttuazione e Tempo in rapida fluttuazione misurano la % di tempo durante il periodo esaminato, durante il quale la glicemia stà variando velocemente o rapidamente. Bassi valori sono migliori.'
=======
,ru: 'время флуктуаций и время быстрых флуктуаций означает % времени в рассматриваемый период в течение которого СК менялся относительно быстро или просто быстро. Более низкие значения предпочтительней'
>>>>>>>
,it: 'Tempo in fluttuazione e Tempo in rapida fluttuazione misurano la % di tempo durante il periodo esaminato, durante il quale la glicemia stà variando velocemente o rapidamente. Bassi valori sono migliori.'
,ru: 'время флуктуаций и время быстрых флуктуаций означает % времени в рассматриваемый период в течение которого СК менялся относительно быстро или просто быстро. Более низкие значения предпочтительней'
<<<<<<<
,it: 'Media Totale Giornaliera Variazioni è la somma dei valori assoluti di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di giorni. Bassi valori sono migliori.'
=======
,ru: 'усредненное ежедневное изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество дней. Меньшая величина предпочтительней'
>>>>>>>
,it: 'Media Totale Giornaliera Variazioni è la somma dei valori assoluti di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di giorni. Bassi valori sono migliori.'
,ru: 'усредненное ежедневное изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество дней. Меньшая величина предпочтительней'
<<<<<<<
fi: 'Keskimääräinen tunti kertoo kerkimääräisen tuntitason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.'
,it: 'Media Oraria Variazioni è la somma del valore assoluto di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di ore. Bassi valori sono migliori.'
=======
fi: 'Keskimääräinen tunti kertoo kerkimääräisen tuntitason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.'
,ru: 'усредненное часовое изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество часов в этот период. Более низкое предпочтительней'
>>>>>>>
fi: 'Keskimääräinen tunti kertoo kerkimääräisen tuntitason verensokerimuutoksien yhteenlasketun arvon. Pienempi arvo on parempi.'
,it: 'Media Oraria Variazioni è la somma del valore assoluto di tutte le escursioni glicemiche per il periodo esaminato, diviso per il numero di ore. Bassi valori sono migliori.'
,ru: 'усредненное часовое изменение это сумма абсолютных величин всех отклонений СК в рассматриваемый период, деленное на количество часов в этот период. Более низкое предпочтительней'
<<<<<<<
fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">täällä</a>..'
,it: 'GVI e PGS sono misure sviluppate da Dexcom, dettagliate <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">qui</a>.'
=======
fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">täällä</a>.'
,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
>>>>>>>
fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">täällä</a>..'
,it: 'GVI e PGS sono misure sviluppate da Dexcom, dettagliate <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">qui</a>.'
,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
<<<<<<<
,it: 'Media Totale Giornaliera Variazioni'
=======
,ru: 'усредненное изменение за день'
>>>>>>>
,it: 'Media Totale Giornaliera Variazioni'
,ru: 'усредненное изменение за день'
<<<<<<<
,it: 'Media Oraria Variazioni'
=======
,ru: 'усредненное изменение за час'
>>>>>>>
,it: 'Media Oraria Variazioni'
,ru: 'усредненное изменение за час' |
<<<<<<<
var latestSGV,
=======
var retrospectivePredictor = true,
latestSGV,
errorCode,
>>>>>>>
var latestSGV,
errorCode,
<<<<<<<
var futureOpacity = d3.scale.linear( )
.domain([TWENTY_FIVE_MINS_IN_MS, SIXTY_MINS_IN_MS])
.range([0.8, 0.1]);
=======
//TODO: get these from the config
var targetTop = 180,
targetBottom = 80;
>>>>>>>
//TODO: get these from the config
var targetTop = 180,
targetBottom = 80;
var futureOpacity = d3.scale.linear( )
.domain([TWENTY_FIVE_MINS_IN_MS, SIXTY_MINS_IN_MS])
.range([0.8, 0.1]);
<<<<<<<
} else {
=======
$('#lastEntry').text("RETRO").removeClass('current');
$('.container #noButton .currentBG').css({color: 'grey'});
$('.container #noButton .currentDirection').css({color: 'grey'});
} else {
>>>>>>>
$('#lastEntry').text("RETRO").removeClass('current');
$('.container #noButton .currentBG').css({color: 'grey'});
$('.container #noButton .currentDirection').css({color: 'grey'});
} else {
<<<<<<<
data = d[0].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), direction: obj.direction, color: 'grey'} });
// TODO: This is a kludge to advance the time as data becomes stale by making old predictor clear (using color = 'none')
// This shouldn't have to be sent and can be fixed by using xScale.domain([x0,x1]) function with
// 2 days before now as x0 and 30 minutes from now for x1 for context plot, but this will be
// required to happen when "now" event is sent from websocket.js every minute. When fixed,
// remove all "color != 'none'" code
data = data.concat(d[1].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), color: 'none'} }));
=======
data = d[0].map(function (obj) {
return { date: new Date(obj.x), sgv: scaleBg(obj.y), direction: obj.direction, color: sgvToColor(obj.y)}
});
data = data.concat(d[1].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), color: 'blue'} }));
>>>>>>>
data = d[0].map(function (obj) {
return { date: new Date(obj.x), sgv: scaleBg(obj.y), direction: obj.direction, color: sgvToColor(obj.y)}
});
// TODO: This is a kludge to advance the time as data becomes stale by making old predictor clear (using color = 'none')
// This shouldn't have to be sent and can be fixed by using xScale.domain([x0,x1]) function with
// 2 days before now as x0 and 30 minutes from now for x1 for context plot, but this will be
// required to happen when "now" event is sent from websocket.js every minute. When fixed,
// remove all "color != 'none'" code
data = data.concat(d[1].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), color: 'none'} })); |
<<<<<<<
cs: 'Energie [kJ]'
,de: 'Energie [kJ]'
,fi: 'Energia [kJ]'
,es: 'Energía [Kj]'
,fr: 'Énergie [kJ]'
,ro: 'Energie [g]'
,ru: 'энергетика'
,it: 'Energia [kJ]'
},
'Clock Views': {
fi: 'Kellonäkymä'
,es: 'Vista del reloj'
,fr: 'Vue Horloge'
,ro: 'Vedere tip ceas'
,ru: 'цифры крупно'
,it: 'Vista orologio'
},
'Clock': {
fr: 'L\'horloge'
},
'Color': {
fr: 'Couleur'
},
'Simple': {
fr: 'Simple'
=======
cs: 'Energie [kJ]'
,de: 'Energie [kJ]'
, fi: 'Energia [kJ]'
, nl: 'Energie [kJ]'
, es: 'Energía [Kj]'
,fr: 'Énergie [kJ]'
,ro: 'Energie [g]'
,ru: 'энергетика'
,it: 'Energia [kJ]'
}
,
'Clock View': {
cs: 'Hodiny'
,fi: 'Kellonäkymä'
,nl: 'Klokweergave'
,es: 'Vista del reloj'
,fr: 'Vue Horloge'
,ro: 'Vedere tip ceas'
,ru: 'цифры крупно'
,it: 'Vista orologio'
}
,
'TDD average': {
cs: 'Průměrná denní dávka'
}
,
'Carbs average': {
cs: 'Průměrné množství sacharidů'
>>>>>>>
cs: 'Energie [kJ]'
,de: 'Energie [kJ]'
,fi: 'Energia [kJ]'
,es: 'Energía [Kj]'
,fr: 'Énergie [kJ]'
,ro: 'Energie [g]'
,ru: 'энергетика'
,it: 'Energia [kJ]'
, nl: 'Energie [kJ]'
},
'Clock View': {
cs: 'Hodiny'
,fi: 'Kellonäkymä'
,nl: 'Klokweergave'
,es: 'Vista del reloj'
,fr: 'Vue Horloge'
,ro: 'Vedere tip ceas'
,ru: 'цифры крупно'
,it: 'Vista orologio'
},
'Clock': {
fr: 'L\'horloge'
},
'Color': {
fr: 'Couleur'
},
'Simple': {
fr: 'Simple'
}
,
'TDD average': {
cs: 'Průměrná denní dávka'
}
,
'Carbs average': {
cs: 'Průměrné množství sacharidů' |
<<<<<<<
const rnInstall = await reactNative.install({ name })
=======
const rnInstall = await reactNative.install({ name, skipJest: true, version: REACT_NATIVE_VERSION })
>>>>>>>
const rnInstall = await reactNative.install({ name, version: REACT_NATIVE_VERSION }) |
<<<<<<<
function remove (_id, fn) {
api( ).remove({ '_id': new ObjectID(_id) }, fn);
ctx.bus.emit('data-received');
}
function save (obj, fn) {
obj._id = new ObjectID(obj._id);
prepareData(obj);
api().save(obj, fn);
ctx.bus.emit('data-received');
}
=======
function query_for (opts) {
return find_options(opts, storage.queryOpts);
}
>>>>>>>
function query_for (opts) {
return find_options(opts, storage.queryOpts);
}
function remove (_id, fn) {
api( ).remove({ '_id': new ObjectID(_id) }, fn);
ctx.bus.emit('data-received');
}
function save (obj, fn) {
obj._id = new ObjectID(obj._id);
prepareData(obj);
api().save(obj, fn);
ctx.bus.emit('data-received');
}
<<<<<<<
api.indexedFields = ['created_at', 'eventType', 'insulin', 'carbs', 'glucose', 'enteredBy', 'boluscalc.foods._id', 'notes'];
api.remove = remove;
api.save = save;
=======
api.query_for = query_for;
api.indexedFields = ['created_at', 'eventType', 'insulin', 'carbs', 'glucose'];
>>>>>>>
api.query_for = query_for;
api.indexedFields = [
'created_at'
, 'eventType'
, 'insulin'
, 'carbs'
, 'glucose'
, 'enteredBy'
, 'boluscalc.foods._id'
, 'notes'
];
api.remove = remove;
api.save = save; |
<<<<<<<
=======
client.utils = require('../utils')({
settings: client.settings
, language: language
});
//After plugins are initialized with browser settings;
browserSettings.loadAndWireForm();
>>>>>>>
client.utils = require('../utils')({
settings: client.settings
, language: language
}); |
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
=======
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
>>>>>>>
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
sandbox.stub(settings.cache, 'get', function (name, callback) {
callback(null);
});
<<<<<<<
it('should be possible to set encrypted password', function(done) {
=======
it('should be possible to get title', function(done) {
sandbox.stub(fs, 'readFile', function (file, encoding, callback) {
callback(null, JSON.stringify({
title: title,
storage: {
localstoragepath: path.join(__dirname, '/uploads/')
}
}));
});
>>>>>>>
it('should be possible to set encrypted password', function(done) {
// Prevent push event during test
sandbox.stub(settings, 'emit').withArgs('settings.push');
<<<<<<<
settings.push({
general: {
myPassword: 'secret'
}
}, function(err) {
=======
sandbox.stub(nconf, 'get').returns({ title: 'title', storage: {} });
settings.get(function(err, output) {
>>>>>>>
settings.push({
general: {
myPassword: 'secret'
}
}, function(err) { |
<<<<<<<
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var core = __importStar(__webpack_require__(470));
var action_1 = __webpack_require__(960);
<<<<<<< HEAD
var token = core.getInput('pal-repo-token', { required: true });
var repoName = core.getInput('pal-repo-name', { required: true });
var actionDirectory = core.getInput('pal-action-directory', { required: false });
=======
var token = core.getInput('repo-token', { required: true });
var repoName = core.getInput('repo-name', { required: true });
var actionDirectory = core.getInput('action-directory', { required: false });
>>>>>>> 873fcc0... Develop (#8)
var workDirectory = './.private-action';
action_1.runAction({
token: token,
repoName: repoName,
actionDirectory: actionDirectory,
workDirectory: workDirectory,
})
.then(function () {
core.info('Action completed successfully');
})
.catch(function (e) {
core.setFailed(e.toString());
});
=======
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var core = __importStar(__webpack_require__(470));
var action_1 = __webpack_require__(960);
var token = core.getInput('repo-token', { required: true });
var repoName = core.getInput('repo-name', { required: true });
var actionDirectory = core.getInput('action-directory', { required: false });
var workDirectory = './.private-action';
action_1.runAction({
token: token,
repoName: repoName,
actionDirectory: actionDirectory,
workDirectory: workDirectory,
})
.then(function () {
core.info('Action completed successfully');
})
.catch(function (e) {
core.setFailed(e.toString());
});
>>>>>>>
var __importStar = (this && this.__importStar) || function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
result["default"] = mod;
return result;
};
Object.defineProperty(exports, "__esModule", { value: true });
var core = __importStar(__webpack_require__(470));
var action_1 = __webpack_require__(960);
var token = core.getInput('pal-repo-token', { required: true });
var repoName = core.getInput('pal-repo-name', { required: true });
var actionDirectory = core.getInput('pal-action-directory', { required: false });
var workDirectory = './.private-action';
action_1.runAction({
token: token,
repoName: repoName,
actionDirectory: actionDirectory,
workDirectory: workDirectory,
})
.then(function () {
core.info('Action completed successfully');
})
.catch(function (e) {
core.setFailed(e.toString());
}); |
<<<<<<<
{ type: 'console' }
=======
{ type: "stdout" }
>>>>>>>
{ type: 'stdout' }
<<<<<<<
let appenders = {};
=======
>>>>>>>
let appenders = {};
<<<<<<<
function doesLevelEntryContainsLogger(levelCategory, loggerCategory) {
const normalizedLevelCategory = normalizeCategory(levelCategory);
const normalizedLoggerCategory = normalizeCategory(loggerCategory);
return normalizedLoggerCategory.substring(0, normalizedLevelCategory.length) === normalizedLevelCategory;
=======
function doesLevelEntryContainsLogger (levelCategory, loggerCategory) {
var normalizedLevelCategory = normalizeCategory(levelCategory);
var normalizedLoggerCategory = normalizeCategory(loggerCategory);
return normalizedLoggerCategory.substring(0, normalizedLevelCategory.length) == normalizedLevelCategory; //jshint ignore:line
>>>>>>>
function doesLevelEntryContainsLogger(levelCategory, loggerCategory) {
const normalizedLevelCategory = normalizeCategory(levelCategory);
const normalizedLoggerCategory = normalizeCategory(loggerCategory);
return normalizedLoggerCategory.substring(0, normalizedLevelCategory.length) === normalizedLevelCategory;
<<<<<<<
args.forEach(appenderCategory => {
=======
args.forEach(function(appenderCategory) {
>>>>>>>
args.forEach(appenderCategory => {
<<<<<<<
=======
>>>>>>>
<<<<<<<
`Problem reading log4js config ${util.inspect(config)}. Error was '${e.message}' (${e.stack})`
=======
"Problem reading log4js config " + util.inspect(config) +
". Error was \"" + e.message + "\" (" + e.stack + ")"
>>>>>>>
`Problem reading log4js config ${util.inspect(config)}. Error was '${e.message}' (${e.stack})`
<<<<<<<
/**
* @name log4js
* @namespace Log4js
* @property getBufferedLogger
* @property getLogger
* @property getDefaultLogger
* @property hasLogger
* @property addAppender
* @property loadAppender
* @property clearAppenders
* @property configure
* @property shutdown
* @property replaceConsole
* @property restoreConsole
* @property levels
* @property setGlobalLogLevel
* @property layouts
* @property appenders
* @property appenderMakers
* @property connectLogger
*/
const log4js = {
getBufferedLogger,
getLogger,
getDefaultLogger,
hasLogger,
addAppender,
loadAppender,
clearAppenders,
configure,
shutdown,
replaceConsole,
restoreConsole,
levels,
setGlobalLogLevel,
layouts,
=======
module.exports = {
getBufferedLogger: getBufferedLogger,
getLogger: getLogger,
getDefaultLogger: getDefaultLogger,
hasLogger: hasLogger,
addAppender: addAppender,
loadAppender: loadAppender,
clearAppenders: clearAppenders,
configure: configure,
shutdown: shutdown,
replaceConsole: replaceConsole,
restoreConsole: restoreConsole,
levels: levels,
setGlobalLogLevel: setGlobalLogLevel,
layouts: layouts,
>>>>>>>
/**
* @name log4js
* @namespace Log4js
* @property getBufferedLogger
* @property getLogger
* @property getDefaultLogger
* @property hasLogger
* @property addAppender
* @property loadAppender
* @property clearAppenders
* @property configure
* @property shutdown
* @property replaceConsole
* @property restoreConsole
* @property levels
* @property setGlobalLogLevel
* @property layouts
* @property appenders
* @property appenderMakers
* @property connectLogger
*/
const log4js = {
getBufferedLogger,
getLogger,
getDefaultLogger,
hasLogger,
addAppender,
loadAppender,
clearAppenders,
configure,
shutdown,
replaceConsole,
restoreConsole,
levels,
setGlobalLogLevel,
layouts, |
<<<<<<<
const sandbox = require('@log4js-node/sandboxed-module');
=======
const childProcess = require('child_process');
const sandbox = require('sandboxed-module');
>>>>>>>
const childProcess = require('child_process');
const sandbox = require('@log4js-node/sandboxed-module'); |
<<<<<<<
module.exports.configure = configure;
=======
function shutdown(cb) {
let completed = 0;
let error;
const complete = (err) => {
error = error || err;
completed++; // eslint-disable-line no-plusplus
if (completed >= openFiles.length) {
cb(error);
}
};
if (!openFiles.length) {
return cb();
}
return openFiles.forEach((file) => {
file.write('', 'utf-8', () => {
file.end(complete);
});
});
}
module.exports.appender = appender;
module.exports.configure = configure;
module.exports.shutdown = shutdown;
>>>>>>>
module.exports.appender = appender;
module.exports.configure = configure; |
<<<<<<<
const sandbox = require('@log4js-node/sandboxed-module');
=======
const sandbox = require('sandboxed-module');
const appender = require('../../lib/appenders/logFaces-HTTP');
>>>>>>>
const sandbox = require('@log4js-node/sandboxed-module');
const appender = require('../../lib/appenders/logFaces-HTTP'); |
<<<<<<<
const defaultTokens = [];
defaultTokens.push({ token: ':url', replacement: req.originalUrl });
defaultTokens.push({ token: ':protocol', replacement: req.protocol });
defaultTokens.push({ token: ':hostname', replacement: req.hostname });
defaultTokens.push({ token: ':method', replacement: req.method });
defaultTokens.push({ token: ':status', replacement: res.__statusCode || res.statusCode });
defaultTokens.push({ token: ':response-time', replacement: res.responseTime });
defaultTokens.push({ token: ':date', replacement: new Date().toUTCString() });
defaultTokens.push({
=======
var default_tokens = [];
default_tokens.push({ token: ':url', replacement: getUrl(req) });
default_tokens.push({ token: ':protocol', replacement: req.protocol });
default_tokens.push({ token: ':hostname', replacement: req.hostname });
default_tokens.push({ token: ':method', replacement: req.method });
default_tokens.push({ token: ':status', replacement: res.__statusCode || res.statusCode });
default_tokens.push({ token: ':response-time', replacement: res.responseTime });
default_tokens.push({ token: ':date', replacement: new Date().toUTCString() });
default_tokens.push({
>>>>>>>
const defaultTokens = [];
defaultTokens.push({ token: ':url', replacement: getUrl(req) });
defaultTokens.push({ token: ':protocol', replacement: req.protocol });
defaultTokens.push({ token: ':hostname', replacement: req.hostname });
defaultTokens.push({ token: ':method', replacement: req.method });
defaultTokens.push({ token: ':status', replacement: res.__statusCode || res.statusCode });
defaultTokens.push({ token: ':response-time', replacement: res.responseTime });
defaultTokens.push({ token: ':date', replacement: new Date().toUTCString() });
defaultTokens.push({ |
<<<<<<<
`${path.join(mainPath, '../../node_modules/tap/node_modules/nyc/bin/cheese')}`
] = testAppender('correct', result);
const sandboxedLog4js = sandbox.require('../../lib/log4js', sandboxConfig);
=======
`${path.join(mainPath, '../../node_modules/nyc/bin/cheese')}`
] = testAppender('correct');
const SandboxedConfiguration = sandbox.require('../../lib/configuration', sandboxConfig);
>>>>>>>
`${path.join(mainPath, '../../node_modules/nyc/bin/cheese')}`
] = testAppender('correct', result);
const sandboxedLog4js = sandbox.require('../../lib/log4js', sandboxConfig); |
<<<<<<<
$("#editEntryButton").off("click");
$("#editEntryButton").click(editTestCaseModalSaveHandler);
=======
>>>>>>>
$("#editEntryButton").off("click");
$("#editEntryButton").click(editTestCaseModalSaveHandler);
<<<<<<<
=======
var jqxhr = $.post("UpdateTestCase2", formEdit.serialize());
$.when(jqxhr).then(function (data) {
hideLoaderInModal("#editTestCaseModal");
if (getAlertType(data.messageType) === 'success') {
var oTable = $("#testCaseTable").dataTable();
oTable.fnDraw(false);
showMessage(data);
$("#editTestCaseModal").modal('hide');
} else {
showMessage(data, $("#editTestCaseModal"));
}
}).fail(handleErrorAjaxAfterTimeout);
>>>>>>> |
<<<<<<<
BEST.scene('creative:twitter', {
=======
const Tweets = [
{
imageURL: "assets/images/users/1.png",
displayName: "Opbeat",
userName: "@opbeat",
tweetContent: "Slack + Opbeat = ❤️ - Native @SlackHQ integration is here! <span class='tweet-link'>https://opbeat.com/blog/posts/better-slacking-with-opbeat/ ... </span>",
tweetImage: "assets/images/tweets/1.png",
tweetAge: "19h",
retweets: 14,
favorites: 24
},
{
imageURL: "assets/images/users/2.png",
displayName: "The Next Web",
userName: "@TheNextWeb",
tweetContent: "Facebook threatens Europe with crappy features if regulators don't back off <span class='tweet-link'>http://tnw.co/1Kt1lVS</span>",
tweetImage: "assets/images/tweets/2.png",
tweetAge: "7m",
retweets: 432,
favorites: 1
},
{
imageURL: "assets/images/users/4.png",
displayName: "Huffington Post",
userName: "@HuffingtonPost",
tweetContent: "Queen Latifah sounds off on the gay community <span class='tweet-link'>http://huff.to/1DI2gNN</span>",
tweetAge: "11m",
retweets: 43,
favorites: 109
},
{
imageURL: "assets/images/users/5.png",
displayName: "Design Learn Bot",
userName: "@DesignLearnBot",
tweetContent: "<span class='tweet-link'>http://hemuhemu2013.web.fc2.com/</span> #html #HTML #html5 #HTML5 #css #CSS #css3 #CSS3 #html #web #WEB #follow #Rt #rt",
tweetAge: "32m",
retweets: 87,
favorites: 742
},
{
imageURL: "assets/images/users/6.png",
displayName: "The Verge",
userName: "@verge",
tweetContent: "James Cameron may have accidentally written a fifth Avatar movie already <span class='tweet-link'>http://theverge.com/e/8275680</span>",
tweetImage: "assets/images/tweets/6.png",
tweetAge: "1h",
retweets: 872,
favorites: 22
},
{
imageURL: "assets/images/users/7.png",
displayName: "The New York Times",
userName: "@nytimes",
tweetContent: "Meet a man condemned to be executed in Iran who won a rare pardon <span class='tweet-link'>http://nyti.ms/1bSduIJ</span>",
tweetImage: "assets/images/tweets/7.png",
tweetAge: "4d",
retweets: 342,
favorites: 42
},
{
imageURL: "assets/images/users/8.png",
displayName: "The Verge",
userName: "@verge",
tweetContent: "European cars will automatically call emergency services after a crash <span class='tweet-link'>http://theverge.com/e/8276886</span>",
tweetImage: "assets/images/tweets/8.png",
tweetAge: "28m",
retweets: 22,
favorites: 62
},
{
imageURL: "assets/images/users/9.png",
displayName: "OXITS",
userName: "@OXITS",
tweetContent: "DDoS-ers Top 330Gbps in Massive Attack <span class='tweet-link'>http://goo.gl/o9AruH</span> #Cyber #Wearables",
tweetImage: "assets/images/tweets/9.png",
tweetAge: "31m",
retweets: 22,
favorites: 492
},
{
imageURL: "assets/images/users/10.png",
displayName: "Forbes News",
userName: "@ForbesTech",
tweetContent: "\"The evidence of Ulbricht's guilt was, in all respects, overwhelming.\" <span class='tweet-link'>http://onforb.es/1DxStsa</span>",
tweetImage: "assets/images/tweets/10.png",
tweetAge: "37m",
retweets: 14,
favorites: 24
},
{
imageURL: "assets/images/users/11.png",
displayName: "Mashable",
userName: "@mashable",
tweetContent: "Is it possible to predict where and when earthquakes will strike? <span class='tweet-link'>http://on.mash.to/1EnlYkj</span> @conversationuk",
tweetAge: "40m",
retweets: 432,
favorites: 1
},
{
imageURL: "assets/images/users/12.png",
displayName: "Engadget",
userName: "@engadget",
tweetContent: "Movie streaming service Popcorn Time blocked by UK court <span class='tweet-link'>http://engt.co/1GGJmwT</span>",
tweetImage: "assets/images/tweets/12.png",
tweetAge: "41m",
retweets: 43,
favorites: 109
},
{
imageURL: "assets/images/users/13.png",
displayName: "The Next Web",
userName: "@TheNextWeb",
tweetContent: "UX designers: Side drawer navigation could cost you 50% of your user engagement <span class='tweet-link'>http://tnw.me/w0JrUHR</span>",
tweetImage: "assets/images/tweets/13.png",
tweetAge: "1h",
retweets: 87,
favorites: 742
},
{
imageURL: "assets/images/users/14.png",
displayName: "Meteor",
userName: "@meteorjs",
tweetContent: "\"Two weeks with @reactjs + #meteorjs,\" a talk by @MaxHarris9 <span class='tweet-link'>https://www.meteor.com/blog/2015/04/29/two-weeks-with-react-and-meteor ...</span>",
tweetAge: "1h",
retweets: 872,
favorites: 22
},
{
imageURL: "assets/images/users/15.png",
displayName: "TechCrunch",
userName: "@TechCrunch",
tweetContent: "IBM Researchers Can Now Spot Errors In Quantum Calculations <span class='tweet-link'>http://tcrn.ch/1drCV4i</span> by @kylebrussell",
tweetAge: "1h",
retweets: 342,
favorites: 42
},
{
imageURL: "assets/images/users/16.png",
displayName: "The New York Times",
userName: "@nytimes",
tweetContent: "Excerpts from the #SCOTUS same-sex marriage arguments <span class='tweet-link'>http://nyti.ms/1bSdsR7</span>",
tweetImage: "assets/images/tweets/16.png",
tweetAge: "1h",
retweets: 22,
favorites: 62
},
{
imageURL: "assets/images/users/17.png",
displayName: "WIRED",
userName: "WIRED",
tweetContent: "Holograms could bring videogame-like navigation to your car <span class='tweet-link'>http://wrd.cm/1AcY2MD</span>",
tweetImage: "assets/images/tweets/17.png",
tweetAge: "2h",
retweets: 22,
favorites: 492
},
{
imageURL: "assets/images/users/18.png",
displayName: "Tobias Mauel",
userName: "@TobiasMauel",
tweetContent: "Some have Disneyland, I have #TNWEurope. So excited to be here!",
tweetImage: "assets/images/tweets/18.png",
tweetAge: "2h",
retweets: 14,
favorites: 24
}
];
BEST.scene('creative:twitter', 'HEAD', {
>>>>>>>
const Tweets = [
{
imageURL: "assets/images/users/1.png",
displayName: "Opbeat",
userName: "@opbeat",
tweetContent: "Slack + Opbeat = ❤️ - Native @SlackHQ integration is here! <span class='tweet-link'>https://opbeat.com/blog/posts/better-slacking-with-opbeat/ ... </span>",
tweetImage: "assets/images/tweets/1.png",
tweetAge: "19h",
retweets: 14,
favorites: 24
},
{
imageURL: "assets/images/users/2.png",
displayName: "The Next Web",
userName: "@TheNextWeb",
tweetContent: "Facebook threatens Europe with crappy features if regulators don't back off <span class='tweet-link'>http://tnw.co/1Kt1lVS</span>",
tweetImage: "assets/images/tweets/2.png",
tweetAge: "7m",
retweets: 432,
favorites: 1
},
{
imageURL: "assets/images/users/4.png",
displayName: "Huffington Post",
userName: "@HuffingtonPost",
tweetContent: "Queen Latifah sounds off on the gay community <span class='tweet-link'>http://huff.to/1DI2gNN</span>",
tweetAge: "11m",
retweets: 43,
favorites: 109
},
{
imageURL: "assets/images/users/5.png",
displayName: "Design Learn Bot",
userName: "@DesignLearnBot",
tweetContent: "<span class='tweet-link'>http://hemuhemu2013.web.fc2.com/</span> #html #HTML #html5 #HTML5 #css #CSS #css3 #CSS3 #html #web #WEB #follow #Rt #rt",
tweetAge: "32m",
retweets: 87,
favorites: 742
},
{
imageURL: "assets/images/users/6.png",
displayName: "The Verge",
userName: "@verge",
tweetContent: "James Cameron may have accidentally written a fifth Avatar movie already <span class='tweet-link'>http://theverge.com/e/8275680</span>",
tweetImage: "assets/images/tweets/6.png",
tweetAge: "1h",
retweets: 872,
favorites: 22
},
{
imageURL: "assets/images/users/7.png",
displayName: "The New York Times",
userName: "@nytimes",
tweetContent: "Meet a man condemned to be executed in Iran who won a rare pardon <span class='tweet-link'>http://nyti.ms/1bSduIJ</span>",
tweetImage: "assets/images/tweets/7.png",
tweetAge: "4d",
retweets: 342,
favorites: 42
},
{
imageURL: "assets/images/users/8.png",
displayName: "The Verge",
userName: "@verge",
tweetContent: "European cars will automatically call emergency services after a crash <span class='tweet-link'>http://theverge.com/e/8276886</span>",
tweetImage: "assets/images/tweets/8.png",
tweetAge: "28m",
retweets: 22,
favorites: 62
},
{
imageURL: "assets/images/users/9.png",
displayName: "OXITS",
userName: "@OXITS",
tweetContent: "DDoS-ers Top 330Gbps in Massive Attack <span class='tweet-link'>http://goo.gl/o9AruH</span> #Cyber #Wearables",
tweetImage: "assets/images/tweets/9.png",
tweetAge: "31m",
retweets: 22,
favorites: 492
},
{
imageURL: "assets/images/users/10.png",
displayName: "Forbes News",
userName: "@ForbesTech",
tweetContent: "\"The evidence of Ulbricht's guilt was, in all respects, overwhelming.\" <span class='tweet-link'>http://onforb.es/1DxStsa</span>",
tweetImage: "assets/images/tweets/10.png",
tweetAge: "37m",
retweets: 14,
favorites: 24
},
{
imageURL: "assets/images/users/11.png",
displayName: "Mashable",
userName: "@mashable",
tweetContent: "Is it possible to predict where and when earthquakes will strike? <span class='tweet-link'>http://on.mash.to/1EnlYkj</span> @conversationuk",
tweetAge: "40m",
retweets: 432,
favorites: 1
},
{
imageURL: "assets/images/users/12.png",
displayName: "Engadget",
userName: "@engadget",
tweetContent: "Movie streaming service Popcorn Time blocked by UK court <span class='tweet-link'>http://engt.co/1GGJmwT</span>",
tweetImage: "assets/images/tweets/12.png",
tweetAge: "41m",
retweets: 43,
favorites: 109
},
{
imageURL: "assets/images/users/13.png",
displayName: "The Next Web",
userName: "@TheNextWeb",
tweetContent: "UX designers: Side drawer navigation could cost you 50% of your user engagement <span class='tweet-link'>http://tnw.me/w0JrUHR</span>",
tweetImage: "assets/images/tweets/13.png",
tweetAge: "1h",
retweets: 87,
favorites: 742
},
{
imageURL: "assets/images/users/14.png",
displayName: "Meteor",
userName: "@meteorjs",
tweetContent: "\"Two weeks with @reactjs + #meteorjs,\" a talk by @MaxHarris9 <span class='tweet-link'>https://www.meteor.com/blog/2015/04/29/two-weeks-with-react-and-meteor ...</span>",
tweetAge: "1h",
retweets: 872,
favorites: 22
},
{
imageURL: "assets/images/users/15.png",
displayName: "TechCrunch",
userName: "@TechCrunch",
tweetContent: "IBM Researchers Can Now Spot Errors In Quantum Calculations <span class='tweet-link'>http://tcrn.ch/1drCV4i</span> by @kylebrussell",
tweetAge: "1h",
retweets: 342,
favorites: 42
},
{
imageURL: "assets/images/users/16.png",
displayName: "The New York Times",
userName: "@nytimes",
tweetContent: "Excerpts from the #SCOTUS same-sex marriage arguments <span class='tweet-link'>http://nyti.ms/1bSdsR7</span>",
tweetImage: "assets/images/tweets/16.png",
tweetAge: "1h",
retweets: 22,
favorites: 62
},
{
imageURL: "assets/images/users/17.png",
displayName: "WIRED",
userName: "WIRED",
tweetContent: "Holograms could bring videogame-like navigation to your car <span class='tweet-link'>http://wrd.cm/1AcY2MD</span>",
tweetImage: "assets/images/tweets/17.png",
tweetAge: "2h",
retweets: 22,
favorites: 492
},
{
imageURL: "assets/images/users/18.png",
displayName: "Tobias Mauel",
userName: "@TobiasMauel",
tweetContent: "Some have Disneyland, I have #TNWEurope. So excited to be here!",
tweetImage: "assets/images/tweets/18.png",
tweetAge: "2h",
retweets: 14,
favorites: 24
}
];
BEST.scene('creative:twitter', {
<<<<<<<
'creative:twitter': ['tweet2'],
'famous:demos:layouts': ['header-footer']
=======
'creative:twitter': ['tweet', 'message', 'notification', 'profile'],
'super.demo.day:layouts': ['header-footer']
>>>>>>>
'creative:twitter': ['tweet', 'message', 'notification', 'profile'],
'super.demo.day:layouts': ['header-footer'] |
<<<<<<<
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
=======
router.get("/teams", main.teams);
>>>>>>>
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
router.get("/teams", main.teams); |
<<<<<<<
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
=======
// error handler after that
router.use(function (err, req, res, cb) {
if (err.subject == "Unauthorized") {
requirejs(["views/signup_view"], safe.trap(cb, function (view) {
res.status(401);
res.renderX({view:view,route:req.route.path,data:{title:"Sign UP"}})
}), cb);
}
else cb()
})
router.use(function (err, req, res, cb) {
self.errHandler(err);
})
>>>>>>>
router.get("/project/:slug/ajax_rpm", main.ajax_rpm);
// error handler after that
router.use(function (err, req, res, cb) {
if (err.subject == "Unauthorized") {
requirejs(["views/signup_view"], safe.trap(cb, function (view) {
res.status(401);
res.renderX({view:view,route:req.route.path,data:{title:"Sign UP"}})
}), cb);
}
else cb()
})
router.use(function (err, req, res, cb) {
self.errHandler(err);
}) |
<<<<<<<
=======
{name:"stats",require:"./modules/statsapi.js"},
{name:"newrelic_server",require:"./modules/newrelic_agent"},
{name:"getsentry_server",require:"./modules/getsentry_agent"},
>>>>>>>
{name:"stats",require:"./modules/statsapi.js"}, |
<<<<<<<
router.use(function (err, req, res, next) {
switch (true) {
case err.subject == "Login required":
res.redirect('/web/signup')
break;
case err.subject == "Access forbidden":
res.redirect('/web/')
break;
}
self.errHandler(err);
})
=======
>>>>>>>
<<<<<<<
router.get("/signup", main.signup);
router.get("/teams", main.teams);
=======
// error handler after that
router.use(function (err, req, res, cb) {
if (err.subject == "Unauthorized") {
requirejs(["views/signup_view"], safe.trap(cb, function (view) {
res.status(401);
res.renderX({view:view,route:req.route.path,data:{title:"Sign UP"}})
}), cb);
}
else cb()
})
router.use(function (err, req, res, cb) {
self.errHandler(err);
})
>>>>>>>
router.get("/teams", main.teams);
// error handler after that
router.use(function (err, req, res, cb) {
if (err.subject) {
if (err.subject == "Unauthorized") {
requirejs(["views/signup_view"], safe.trap(cb, function (view) {
res.status(401);
res.renderX({view: view, route: req.route.path, data: {title: "Sign UP"}})
}), cb);
}
if (err.subject == "Access forbidden") {
res.redirect('/web/')
}
}
else
cb()
})
router.use(function (err, req, res, cb) {
self.errHandler(err);
}) |
<<<<<<<
create_add_task_dialog = function(entity_id){
=======
create_create_task_dialog = function(taskable_entity_id){
>>>>>>>
create_create_task_dialog = function(entity_id){
<<<<<<<
href: '/add/task/' + entity_id,
=======
href: '/create/task/' + taskable_entity_id,
>>>>>>>
href: '/create/task/' + entity_id, |
<<<<<<<
this.fd = fs.openSync(this.localPath, 0);
this.uploadedSize = 0;
this.networkParentDirPath = networkParentDirPath;
=======
this.networkParentDirPath = networkParentDirPath[ networkParentDirPath.length - 1 ] === '/' ?
networkParentDirPath : networkParentDirPath + '/';
>>>>>>>
this.fd = fs.openSync(this.localPath, 0);
this.uploadedSize = 0;
this.networkParentDirPath = networkParentDirPath[ networkParentDirPath.length - 1 ] === '/' ?
networkParentDirPath : networkParentDirPath + '/';
<<<<<<<
=======
this.uploader.api.modifyFileContent(this.networkParentDirPath + this.fileName, false,
new Uint8Array(fs.readFileSync(this.localPath)), 0, function(err) {
self._OnContentUploaded(err);
});
>>>>>>> |
<<<<<<<
function handleJoiningRaftNetwork(options, cb){
=======
function joinRaftNetwork(config, cb){
console.log('[*] Starting new network...')
let seqFunction = async.seq(
util.ClearDirectories,
util.CreateDirectories,
util.GetNewGethAccount,
displayGethAccount,
util.GenerateNodeKey,
util.DisplayEnode,
//getConfiguration, // TODO: Remove this
constellation.CreateNewKeys,
constellation.CreateConfig,
whisper.RequestNetworkMembership,
whisper.GetGenesisBlockConfig,
whisper.GetStaticNodesFile,
startRaftNode,
util.CreateWeb3Connection,
util.UnlockAllAccounts,
whisper.AddEnodeResponseHandler,
peerHandler.ListenForNewEnodes,
whisper.AddEtherResponseHandler,
fundingHandler.MonitorAccountBalances,
statistics.Setup
)
let result = {
localIpAddress: config.localIpAddress,
remoteIpAddress : config.remoteIpAddress,
folders: ['Blockchain', 'Blockchain/geth', 'Constellation'],
constellationKeySetup: [
{folderName: 'Constellation', fileName: 'node'},
{folderName: 'Constellation', fileName: 'nodeArch'},
],
constellationConfigSetup: {
configName: 'constellation.config',
folderName: 'Constellation',
localIpAddress : config.localIpAddress,
localPort : ports.constellation,
remoteIpAddress : config.remoteIpAddress,
remotePort : ports.constellation,
publicKeyFileName: 'node.pub',
privateKeyFileName: 'node.key',
publicArchKeyFileName: 'nodeArch.pub',
privateArchKeyFileName: 'nodeArch.key',
},
communicationNetwork: config.communicationNetwork,
"web3IPCHost": './Blockchain/geth.ipc',
"web3RPCProvider": 'http://localhost:'+ports.gethNodeRPC
}
seqFunction(result, function(err, res){
if (err) { return console.log('ERROR', err) }
console.log('[*] New network started')
cb(err, res)
})
}
function handleJoiningRaftNetwork(localIpAddress, cb){
>>>>>>>
function joinRaftNetwork(config, cb){
console.log('[*] Starting new network...')
let seqFunction = async.seq(
util.ClearDirectories,
util.CreateDirectories,
util.GetNewGethAccount,
displayGethAccount,
util.GenerateNodeKey,
util.DisplayEnode,
constellation.CreateNewKeys,
constellation.CreateConfig,
whisper.RequestNetworkMembership,
whisper.GetGenesisBlockConfig,
whisper.GetStaticNodesFile,
startRaftNode,
util.CreateWeb3Connection,
util.UnlockAllAccounts,
whisper.AddEnodeResponseHandler,
peerHandler.ListenForNewEnodes,
whisper.AddEtherResponseHandler,
fundingHandler.MonitorAccountBalances,
statistics.Setup
)
let result = {
localIpAddress: config.localIpAddress,
remoteIpAddress : config.remoteIpAddress,
folders: ['Blockchain', 'Blockchain/geth', 'Constellation'],
constellationKeySetup: [
{folderName: 'Constellation', fileName: 'node'},
{folderName: 'Constellation', fileName: 'nodeArch'},
],
constellationConfigSetup: {
configName: 'constellation.config',
folderName: 'Constellation',
localIpAddress : config.localIpAddress,
localPort : ports.constellation,
remoteIpAddress : config.remoteIpAddress,
remotePort : ports.constellation,
publicKeyFileName: 'node.pub',
privateKeyFileName: 'node.key',
publicArchKeyFileName: 'nodeArch.pub',
privateArchKeyFileName: 'nodeArch.key',
},
communicationNetwork: config.communicationNetwork,
"web3IPCHost": './Blockchain/geth.ipc',
"web3RPCProvider": 'http://localhost:'+ports.gethNodeRPC
}
seqFunction(result, function(err, res){
if (err) { return console.log('ERROR', err) }
console.log('[*] New network started')
cb(err, res)
})
}
function handleJoiningRaftNetwork(localIpAddress, cb){ |
<<<<<<<
Template.registerHelper('stoneIconPath', stoneIconPath);
export function setChartTheme(name) {
if (Highcharts.theme[name]) {
const themeOptions = Highcharts.theme[name];
const defaultOptions = Highcharts.getOptions();
for (const prop in defaultOptions) {
if (typeof defaultOptions[prop] !== 'function') {
delete defaultOptions[prop];
}
}
Highcharts.setOptions(Highcharts.theme.default);
Highcharts.setOptions(themeOptions);
Highcharts.setOptions({
global: {
useUTC: false,
timezoneOffset: new Date().getTimezoneOffset()
}
});
}
}
Template.registerHelper('setChartTheme', setChartTheme);
=======
Template.registerHelper('stoneIconPath', stoneIconPath);
export function productCenterByCompanyPath(companyId) {
return FlowRouter.path('productCenterByCompany', { companyId });
}
Template.registerHelper('productCenterByCompanyPath', productCenterByCompanyPath);
>>>>>>>
Template.registerHelper('stoneIconPath', stoneIconPath);
export function setChartTheme(name) {
if (Highcharts.theme[name]) {
const themeOptions = Highcharts.theme[name];
const defaultOptions = Highcharts.getOptions();
for (const prop in defaultOptions) {
if (typeof defaultOptions[prop] !== 'function') {
delete defaultOptions[prop];
}
}
Highcharts.setOptions(Highcharts.theme.default);
Highcharts.setOptions(themeOptions);
Highcharts.setOptions({
global: {
useUTC: false,
timezoneOffset: new Date().getTimezoneOffset()
}
});
}
}
Template.registerHelper('setChartTheme', setChartTheme);
export function productCenterByCompanyPath(companyId) {
return FlowRouter.path('productCenterByCompany', { companyId });
}
Template.registerHelper('productCenterByCompanyPath', productCenterByCompanyPath); |
<<<<<<<
$(".paymentForm").hide();
$(".paymentButton").show();
$(".paymentButton").click(function(){
$(".paymentButton").slideUp();
$(".paymentForm").slideDown();
return false;
});
$(".reclaimButton").click(tapiriik.PaymentReclaimDialogLinkClicked);
=======
if (tapiriik.User !== undefined) {
for (var i in tapiriik.ServiceInfo) {
if (tapiriik.ServiceInfo[i].Connected && tapiriik.ServiceInfo[i].Configurable && !tapiriik.ServiceInfo[i].Configured){
tapiriik.OpenConfigDialog(i);
break; // we can nag them again if there's >1
}
}
}
$.address.change(tapiriik.AddressChanged);
tapiriik.AddressChanged();
>>>>>>>
$(".paymentForm").hide();
$(".paymentButton").show();
$(".paymentButton").click(function(){
$(".paymentButton").slideUp();
$(".paymentForm").slideDown();
return false;
});
$(".reclaimButton").click(tapiriik.PaymentReclaimDialogLinkClicked);
if (tapiriik.User !== undefined) {
for (var i in tapiriik.ServiceInfo) {
if (tapiriik.ServiceInfo[i].Connected && tapiriik.ServiceInfo[i].Configurable && !tapiriik.ServiceInfo[i].Configured){
tapiriik.OpenConfigDialog(i);
break; // we can nag them again if there's >1
}
}
}
$.address.change(tapiriik.AddressChanged);
tapiriik.AddressChanged();
<<<<<<<
} else if (components[0]=="payments" && components[1]=="claim"){
tapiriik.OpenPaymentReclaimDialog();
return;
=======
} else if (components[0]=="configure") {
if (components[1]=="dropbox"){
if (unchangedDepth<=1) {
tapiriik.DropboxBrowserPath = tapiriik.ServiceInfo.dropbox.Config.SyncRoot;
$.address.value("configure/dropbox" + tapiriik.DropboxBrowserPath); // init directory, meh
tapiriik.OpenDropboxConfigDialog();
} else {
tapiriik.DropboxBrowserPath = "/" + components.slice(2).join("/");
tapiriik.PopulateDropboxBrowser();
}
return;
}
} else if (components[0] == "dropbox") {
if (components[1] == "info"){
tapiriik.OpenDropboxInfoDialog();
return;
}
>>>>>>>
} else if (components[0]=="payments" && components[1]=="claim"){
tapiriik.OpenPaymentReclaimDialog();
return;
} else if (components[0]=="configure") {
if (components[1]=="dropbox"){
if (unchangedDepth<=1) {
tapiriik.DropboxBrowserPath = tapiriik.ServiceInfo.dropbox.Config.SyncRoot;
$.address.value("configure/dropbox" + tapiriik.DropboxBrowserPath); // init directory, meh
tapiriik.OpenDropboxConfigDialog();
} else {
tapiriik.DropboxBrowserPath = "/" + components.slice(2).join("/");
tapiriik.PopulateDropboxBrowser();
}
return;
}
} else if (components[0] == "dropbox") {
if (components[1] == "info"){
tapiriik.OpenDropboxInfoDialog();
return;
}
<<<<<<<
tapiriik.OpenPaymentReclaimDialog = function(){
var form = $("<form><center><div class=\"error\">Unknown Transaction ID</div><label for=\"txn\" style=\"margin-bottom:7px\">PayPal Transaction ID</label><input type=\"text\" style=\"width:220px;text-align:center;\" placeholder=\"VADE0B248932\" id=\"txn\"><br/><button type=\"submit\" id=\"claim\">Claim</button><p>Your payment will be reassociated with the accounts you a currently connected to</p></center></form>");
var pending = false;
form.bind("submit", function(){
if (pending) return false;
pending = true;
$("button",form).addClass("disabled");
$.ajax({url:"/payments/claim-ajax",
type:"POST",
data:{txn: $("#txn",form).val()},
success: function(){
$.address.value("/");
window.location.reload();
},
error: function(data){
$(".error",form).show();
$("button",form).removeClass("disabled");
pending = false;
}});
return false;
});
tapiriik.CreateServiceDialog("tapiriik",form);
};
=======
tapiriik.OpenConfigDialog = function(svcId){
if (svcId == "dropbox" && !tapiriik.ServiceInfo.dropbox.Configured) {
$.address.value("dropbox/info");
return;
}
$.address.value("configure/" + svcId);
};
tapiriik.OpenDropboxConfigDialog = function(){
var configPanel = $("<form class=\"dropboxConfig\"><h1>Configure Dropbox Sync</h1><label>Select sync folder</label><div id=\"folderList\"></div><div id=\"folderStackOuter\">Will sync to <span id=\"folderStack\"></span></div><input type=\"checkbox\" id=\"syncAll\"><label for=\"syncAll\" style=\"display:inline-block\">Sync untagged activities</label></input><br/><button id=\"OK\">Save</button><button id=\"cancel\" class=\"cancel\">Cancel</button><button id=\"disconnect\" class=\"delete\">Disconnect</button></form>").addClass("dropboxConfig");
if (tapiriik.ServiceInfo.dropbox.Config.UploadUntagged) $("#syncAll", configPanel).attr("checked","");
$("#OK", configPanel).click(tapiriik.SaveDropboxConfig);
$("#cancel", configPanel).click(tapiriik.DismissServiceDialog);
if (!tapiriik.ServiceInfo.dropbox.Configured) $("#cancel", configPanel).hide();
$("#disconnect", configPanel).click(function(){
$.address.value("disconnect/dropbox");
return false;
});
tapiriik.CreateServiceDialog("dropbox", configPanel);
tapiriik.DropboxLastDepth = 1;
tapiriik.PopulateDropboxBrowser();
};
tapiriik.OpenDropboxInfoDialog = function(){
var infoPanel = $("<div style=\"max-width:500px\"><h1>You should know...</h1>\
<p>.GPX files don't include any information about what type of activity the contain, so <b>tapiriik needs your help! Just put what you were doing into the name of the file</b> or place the file into <b>an appropriately named subfolder</b>, e.g. <tt><b>cycling</b>-mar-12-2012.gpx</tt> or <tt><b>run</b>/oldcrow-10k.gpx</tt>. If you want you can <a href=\"/supported-activities\">see the complete list of activities and tags</a>, but don't worry, unrecognized activities will be left alone until you tag them.</p>\
<button>Sounds good</button></div>");
$("button", infoPanel).click(function(){
$.address.value("configure/dropbox");
});
tapiriik.CreateServiceDialog("dropbox", infoPanel);
};
tapiriik.SaveDropboxConfig = function(){
if (tapiriik.DropboxBrowserPath.length <= 1) {
return false; // need to select a directory
}
tapiriik.ServiceInfo.dropbox.Config.SyncRoot = tapiriik.DropboxBrowserPath;
tapiriik.ServiceInfo.dropbox.Config.UploadUntagged = $("#syncAll").is(":checked");
tapiriik.SaveConfig("dropbox", tapiriik.DismissServiceDialog);
return false;
};
tapiriik.PopulateDropboxBrowser = function(){
var cfgPanel = $("form.dropboxConfig");
var fstack = $("#folderStack", cfgPanel).text("");
var parts = tapiriik.DropboxBrowserPath.split('/');
parts.unshift('/');
var build = "/";
for (var i = 0; i < parts.length; i++) {
if (parts[i] == "") continue;
if (i !== 0) build += parts[i];
$("<a class=\"folder\"/>").text(parts[i]).attr("path", build).appendTo(fstack).click(tapiriik.DropboxBrowserNavigateDown);
}
if (tapiriik.DropboxBrowserPath.length<2) {
$("button#OK", cfgPanel).addClass("disabled");
} else {
$("button#OK", cfgPanel).removeClass("disabled");
}
if (tapiriik.DropboxBrowserPath == tapiriik.CurrentDropboxBrowserPath && $("#folderList").children().length) return;
var depth = tapiriik.DropboxBrowserPath.length; //cheap
tapiriik.DropboxNavigatingUp = depth <= tapiriik.DropboxLastDepth;
tapiriik.DropboxLastDepth = depth;
$("#folderList ul").animate({"margin-left":(tapiriik.DropboxNavigatingUp?1:-1)*$("#folderList").width()});
if (tapiriik.OutstandingDropboxNavigate !== undefined) tapiriik.OutstandingDropboxNavigate.abort();
tapiriik.OutstandingDropboxNavigate = $.ajax("/dropbox/browse-ajax/" + tapiriik.DropboxBrowserPath).success(tapiriik.PopulateDropboxBrowserCallback);
tapiriik.CurrentDropboxBrowserPath = tapiriik.DropboxBrowserPath;
};
tapiriik.PopulateDropboxBrowserCallback = function(data){
tapiriik.OutstandingDropboxNavigate = undefined;
$("#folderList").text("");
list = $("<ul>").appendTo($("#folderList")).css({"margin-left":(tapiriik.DropboxNavigatingUp?-1:1)*$("#folderList").width()});
if (data.length === 0) {
$("<h2>no subfolders</h2>").appendTo(list);
}
for (var i = 0; i < data.length; i++) {
var li = $("<li>").appendTo(list);
$("<a>").text(data[i].replace(tapiriik.DropboxBrowserPath,"").replace(/^\//,"")).attr("path",data[i]).appendTo(li).click(tapiriik.DropboxBrowserNavigateDown);
}
$("#folderList ul").animate({"margin-left":0});
};
tapiriik.DropboxBrowserNavigateDown = function(){
$.address.path("/configure/dropbox" + $(this).attr("path"));
};
>>>>>>>
tapiriik.OpenConfigDialog = function(svcId){
if (svcId == "dropbox" && !tapiriik.ServiceInfo.dropbox.Configured) {
$.address.value("dropbox/info");
return;
}
$.address.value("configure/" + svcId);
};
tapiriik.OpenDropboxConfigDialog = function(){
var configPanel = $("<form class=\"dropboxConfig\"><h1>Configure Dropbox Sync</h1><label>Select sync folder</label><div id=\"folderList\"></div><div id=\"folderStackOuter\">Will sync to <span id=\"folderStack\"></span></div><input type=\"checkbox\" id=\"syncAll\"><label for=\"syncAll\" style=\"display:inline-block\">Sync untagged activities</label></input><br/><button id=\"OK\">Save</button><button id=\"cancel\" class=\"cancel\">Cancel</button><button id=\"disconnect\" class=\"delete\">Disconnect</button></form>").addClass("dropboxConfig");
if (tapiriik.ServiceInfo.dropbox.Config.UploadUntagged) $("#syncAll", configPanel).attr("checked","");
$("#OK", configPanel).click(tapiriik.SaveDropboxConfig);
$("#cancel", configPanel).click(tapiriik.DismissServiceDialog);
if (!tapiriik.ServiceInfo.dropbox.Configured) $("#cancel", configPanel).hide();
$("#disconnect", configPanel).click(function(){
$.address.value("disconnect/dropbox");
return false;
});
tapiriik.CreateServiceDialog("dropbox", configPanel);
tapiriik.DropboxLastDepth = 1;
tapiriik.PopulateDropboxBrowser();
};
tapiriik.OpenDropboxInfoDialog = function(){
var infoPanel = $("<div style=\"max-width:500px\"><h1>You should know...</h1>\
<p>.GPX files don't include any information about what type of activity the contain, so <b>tapiriik needs your help! Just put what you were doing into the name of the file</b> or place the file into <b>an appropriately named subfolder</b>, e.g. <tt><b>cycling</b>-mar-12-2012.gpx</tt> or <tt><b>run</b>/oldcrow-10k.gpx</tt>. If you want you can <a href=\"/supported-activities\">see the complete list of activities and tags</a>, but don't worry, unrecognized activities will be left alone until you tag them.</p>\
<button>Sounds good</button></div>");
$("button", infoPanel).click(function(){
$.address.value("configure/dropbox");
});
tapiriik.CreateServiceDialog("dropbox", infoPanel);
};
tapiriik.SaveDropboxConfig = function(){
if (tapiriik.DropboxBrowserPath.length <= 1) {
return false; // need to select a directory
}
tapiriik.ServiceInfo.dropbox.Config.SyncRoot = tapiriik.DropboxBrowserPath;
tapiriik.ServiceInfo.dropbox.Config.UploadUntagged = $("#syncAll").is(":checked");
tapiriik.SaveConfig("dropbox", tapiriik.DismissServiceDialog);
return false;
};
tapiriik.PopulateDropboxBrowser = function(){
var cfgPanel = $("form.dropboxConfig");
var fstack = $("#folderStack", cfgPanel).text("");
var parts = tapiriik.DropboxBrowserPath.split('/');
parts.unshift('/');
var build = "/";
for (var i = 0; i < parts.length; i++) {
if (parts[i] == "") continue;
if (i !== 0) build += parts[i];
$("<a class=\"folder\"/>").text(parts[i]).attr("path", build).appendTo(fstack).click(tapiriik.DropboxBrowserNavigateDown);
}
if (tapiriik.DropboxBrowserPath.length<2) {
$("button#OK", cfgPanel).addClass("disabled");
} else {
$("button#OK", cfgPanel).removeClass("disabled");
}
if (tapiriik.DropboxBrowserPath == tapiriik.CurrentDropboxBrowserPath && $("#folderList").children().length) return;
var depth = tapiriik.DropboxBrowserPath.length; //cheap
tapiriik.DropboxNavigatingUp = depth <= tapiriik.DropboxLastDepth;
tapiriik.DropboxLastDepth = depth;
$("#folderList ul").animate({"margin-left":(tapiriik.DropboxNavigatingUp?1:-1)*$("#folderList").width()});
if (tapiriik.OutstandingDropboxNavigate !== undefined) tapiriik.OutstandingDropboxNavigate.abort();
tapiriik.OutstandingDropboxNavigate = $.ajax("/dropbox/browse-ajax/" + tapiriik.DropboxBrowserPath).success(tapiriik.PopulateDropboxBrowserCallback);
tapiriik.CurrentDropboxBrowserPath = tapiriik.DropboxBrowserPath;
};
tapiriik.PopulateDropboxBrowserCallback = function(data){
tapiriik.OutstandingDropboxNavigate = undefined;
$("#folderList").text("");
list = $("<ul>").appendTo($("#folderList")).css({"margin-left":(tapiriik.DropboxNavigatingUp?-1:1)*$("#folderList").width()});
if (data.length === 0) {
$("<h2>no subfolders</h2>").appendTo(list);
}
for (var i = 0; i < data.length; i++) {
var li = $("<li>").appendTo(list);
$("<a>").text(data[i].replace(tapiriik.DropboxBrowserPath,"").replace(/^\//,"")).attr("path",data[i]).appendTo(li).click(tapiriik.DropboxBrowserNavigateDown);
}
$("#folderList ul").animate({"margin-left":0});
};
tapiriik.DropboxBrowserNavigateDown = function(){
$.address.path("/configure/dropbox" + $(this).attr("path"));
};
tapiriik.OpenPaymentReclaimDialog = function(){
var form = $("<form><center><div class=\"error\">Unknown Transaction ID</div><label for=\"txn\" style=\"margin-bottom:7px\">PayPal Transaction ID</label><input type=\"text\" style=\"width:220px;text-align:center;\" placeholder=\"VADE0B248932\" id=\"txn\"><br/><button type=\"submit\" id=\"claim\">Claim</button><p>Your payment will be reassociated with the accounts you a currently connected to</p></center></form>");
var pending = false;
form.bind("submit", function(){
if (pending) return false;
pending = true;
$("button",form).addClass("disabled");
$.ajax({url:"/payments/claim-ajax",
type:"POST",
data:{txn: $("#txn",form).val()},
success: function(){
$.address.value("/");
window.location.reload();
},
error: function(data){
$(".error",form).show();
$("button",form).removeClass("disabled");
pending = false;
}});
return false;
});
tapiriik.CreateServiceDialog("tapiriik",form);
};
<<<<<<<
tapiriik.NextSync = data.NextSync !== null ? new Date(data.NextSync) : null;
tapiriik.LastSync = data.LastSync !== null ? new Date(data.LastSync) : null;
if (tapiriik.SyncErrorsCt != data.Errors && tapiriik.SyncErrorsCt !== undefined){
=======
tapiriik.NextSync = new Date(data.NextSync);
tapiriik.LastSync = new Date(data.LastSync);
if (tapiriik.SyncErrors !== undefined && tapiriik.SyncErrors.toString() != data.Errors.toString()){
>>>>>>>
tapiriik.NextSync = data.NextSync !== null ? new Date(data.NextSync) : null;
tapiriik.LastSync = data.LastSync !== null ? new Date(data.LastSync) : null;
if (tapiriik.SyncErrors !== undefined && tapiriik.SyncErrors.toString() != data.Errors.toString()){ |
<<<<<<<
var pc = []; // hold local peerconnection statuses
window.pc = pc;
const pcmap = new Map(); // A map of all peer ids to their peerconnections.
window.pcmap = pcmap;
=======
const pcMap = new Map(); // A map of all peer ids to their peerconnections.
>>>>>>>
const pcMap = new Map(); // A map of all peer ids to their peerconnections.
window.pcmap = pcmap;
<<<<<<<
pcmap.get(partnerName).close();
pcmap.delete(partnerName);
delete pc[partnerName];
=======
pcMap.get(partnerName).close();
pcMap.delete(partnerName);
>>>>>>>
pcMap.get(partnerName).close();
pcMap.delete(partnerName); |
<<<<<<<
import Comment from './demos/Comment'
=======
import Pulldown from './demos/Pulldown'
import Pullup from './demos/Pullup'
const FastClick = require('fastclick')
FastClick.attach(document.body)
>>>>>>>
import Comment from './demos/Comment'
import Pulldown from './demos/Pulldown'
import Pullup from './demos/Pullup'
const FastClick = require('fastclick')
FastClick.attach(document.body)
<<<<<<<
},
'/component/comment': {
component: Comment
=======
},
'/component/pulldown': {
component: Pulldown
},
'/component/pullup': {
component: Pullup
>>>>>>>
},
'/component/comment': {
component: Comment
},
'/component/pulldown': {
component: Pulldown
},
'/component/pullup': {
component: Pullup |
<<<<<<<
.get('/products/studio', (_, res) => res.render('products/studio'))
// .get('/pro/teams', (_, res) => res.render('pro/teams'))
.get('/products/enterprise-core', (_, res) => res.render('products/enterprise-core'))
=======
.get('/pro/teams', (_, res) => res.render('pro/teams'))
>>>>>>>
// .get('/pro/teams', (_, res) => res.render('pro/teams'))
.get('/products/studio', (_, res) => res.render('products/studio'))
.get('/products/enterprise-core', (_, res) => res.render('products/enterprise-core')) |
<<<<<<<
const GPUPicker = require('./three/GPUPickers/GPUPicker')
const IKHelper = require('./three/IkHelper')
=======
>>>>>>>
const GPUPicker = require('./three/GPUPickers/GPUPicker')
const IKHelper = require('./three/IkHelper')
<<<<<<<
const ikHelper = useRef(null)
const getIkHelper = () => {
if(ikHelper.current === null) {
ikHelper.current = IKHelper.getInstance()
const updateCharacterSkeleton = (name, rotation) => { dispatch(updateCharacterSkeleton({
id: ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
name : name,
rotation:
{
x : rotation.x,
y : rotation.y,
z : rotation.z,
}
} ))}
const updateSkeleton = (skeleton) => { dispatch(updateCharacterIkSkeleton({
id: ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
skeleton: skeleton
} ))}
const updateCharacterPos = ({ x, y, z}) => dispatch(updateObject(
ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
{ x, y: z, z: y }
))
const updatePoleTarget = (poleTargets) => dispatch(updateCharacterPoleTargets({
id: ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
poleTargets: poleTargets
}
))
ikHelper.current.setUpdate(
updateCharacterSkeleton,
updateSkeleton,
updateCharacterPos,
updatePoleTarget
)
}
return ikHelper.current
}
=======
useEffect(() => {
// create a temporary mesh object to initialize the GPUPicker
let gpuPicker = getGpuPicker()
let geometry = new THREE.BoxBufferGeometry(2, 2, 2)
let material = new THREE.MeshBasicMaterial();
let mesh = new THREE.Mesh(geometry, material)
mesh.position.copy(camera.worldPosition())
mesh.position.z -= 1
scene.add(mesh)
let interactions = scene.__interaction.concat([mesh])
gpuPicker.setupScene(interactions, getExcludeList(scene))
let gpuCamera = gpuPicker.camera
gpuCamera.fov = 360
gpuCamera.updateProjectionMatrix()
gpuPicker.pick(camera.worldPosition(), camera.worldQuaternion())
scene.remove(mesh)
gpuCamera.fov = 1
gpuCamera.updateProjectionMatrix()
}, [])
>>>>>>>
const ikHelper = useRef(null)
const getIkHelper = () => {
if(ikHelper.current === null) {
ikHelper.current = IKHelper.getInstance()
const updateCharacterSkeleton = (name, rotation) => { dispatch(updateCharacterSkeleton({
id: ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
name : name,
rotation:
{
x : rotation.x,
y : rotation.y,
z : rotation.z,
}
} ))}
const updateSkeleton = (skeleton) => { dispatch(updateCharacterIkSkeleton({
id: ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
skeleton: skeleton
} ))}
const updateCharacterPos = ({ x, y, z}) => dispatch(updateObject(
ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
{ x, y: z, z: y }
))
const updatePoleTarget = (poleTargets) => dispatch(updateCharacterPoleTargets({
id: ikHelper.current.intializedSkinnedMesh.parent.parent.userData.id,
poleTargets: poleTargets
}
))
ikHelper.current.setUpdate(
updateCharacterSkeleton,
updateSkeleton,
updateCharacterPos,
updatePoleTarget
)
}
return ikHelper.current
}
useEffect(() => {
// create a temporary mesh object to initialize the GPUPicker
let gpuPicker = getGpuPicker()
let geometry = new THREE.BoxBufferGeometry(2, 2, 2)
let material = new THREE.MeshBasicMaterial();
let mesh = new THREE.Mesh(geometry, material)
mesh.position.copy(camera.worldPosition())
mesh.position.z -= 1
scene.add(mesh)
let interactions = scene.__interaction.concat([mesh])
gpuPicker.setupScene(interactions, getExcludeList(scene))
let gpuCamera = gpuPicker.camera
gpuCamera.fov = 360
gpuCamera.updateProjectionMatrix()
gpuPicker.pick(camera.worldPosition(), camera.worldQuaternion())
scene.remove(mesh)
gpuCamera.fov = 1
gpuCamera.updateProjectionMatrix()
}, [])
<<<<<<<
onPressEndB,
=======
onPressEndB,
onPressEndX
>>>>>>>
onPressEndB,
onPressEndX |
<<<<<<<
//console.log('scene objects changed, updating controls')
=======
// console.log('scene objects changed, updating controls')
>>>>>>>
<<<<<<<
let closest = null
=======
>>>>>>>
let closest = null
<<<<<<<
useEffect(() => {
camera = scene.children.find(child => child.userData.id === activeCamera)
// calculate distance to characters, get the closest
closest = getClosestCharacterInView (characters(scene), camera)
// console.log('closest: ', closest)
//we have to wait for them to be added to the stage
}, [sceneObjects, activeCamera])
const getClosestCharacterInView = (objects, camera) => {
let obj = null
let dist = 1000000
let allDistances = []
for (var char of objects)
{
let d = camera.position.distanceTo (new THREE.Vector3(char.position.x, camera.position.y, char.position.z))
allDistances.push({
object: char,
distance: d
})
}
let compare = (a,b) => {
if (a.distance < b.distance)
return -1;
if (a.distance > b.distance)
return 1;
return 0;
}
allDistances.sort(compare)
for (var i = 0; i< allDistances.length; i++)
{
if (checkIfCharacterInCameraView(allDistances[i].object, camera))
return allDistances[i]
}
return {
object: obj,
distance: dist !== 1000000 ? dist : 0
}
}
const checkIfCharacterInCameraView = (character, camera) => {
camera.updateMatrix();
camera.updateMatrixWorld();
var frustum = new THREE.Frustum();
frustum.setFromMatrix(new THREE.Matrix4().multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse));
for (var hitter of character.bonesHelper.hit_meshes)
{
if (frustum.intersectsBox(new THREE.Box3().setFromObject( hitter ))) {
return true
}
}
return false
}
closest = getClosestCharacterInView (characters(scene), camera)
let [distFeet, distInches] = metersAsFeetAndInches(closest.distance)
=======
>>>>>>>
useEffect(() => {
camera = scene.children.find(child => child.userData.id === activeCamera)
// calculate distance to characters, get the closest
closest = getClosestCharacterInView (characters(scene), camera)
// console.log('closest: ', closest)
//we have to wait for them to be added to the stage
}, [sceneObjects, activeCamera])
const getClosestCharacterInView = (objects, camera) => {
let obj = null
let dist = 1000000
let allDistances = []
for (var char of objects)
{
let d = camera.position.distanceTo (new THREE.Vector3(char.position.x, camera.position.y, char.position.z))
allDistances.push({
object: char,
distance: d
})
}
let compare = (a,b) => {
if (a.distance < b.distance)
return -1;
if (a.distance > b.distance)
return 1;
return 0;
}
allDistances.sort(compare)
for (var i = 0; i< allDistances.length; i++)
{
if (checkIfCharacterInCameraView(allDistances[i].object, camera))
return allDistances[i]
}
return {
object: obj,
distance: dist !== 1000000 ? dist : 0
}
}
const checkIfCharacterInCameraView = (character, camera) => {
camera.updateMatrix();
camera.updateMatrixWorld();
var frustum = new THREE.Frustum();
frustum.setFromMatrix(new THREE.Matrix4().multiplyMatrices(camera.projectionMatrix, camera.matrixWorldInverse));
for (var hitter of character.bonesHelper.hit_meshes)
{
if (frustum.intersectsBox(new THREE.Box3().setFromObject( hitter ))) {
return true
}
}
return false
}
closest = getClosestCharacterInView (characters(scene), camera)
let [distFeet, distInches] = metersAsFeetAndInches(closest.distance)
<<<<<<<
['br'],
closest.object ? `Closest character: ${closest.object ? shortId(closest.object.userData.id) : ''}, distance: ${feetAndInchesAsString(distFeet, distInches)} (${parseFloat(Math.round(closest.distance * 100) / 100).toFixed(2)}m)` : ''
=======
>>>>>>>
['br'],
closest.object ? `Closest character: ${closest.object ? shortId(closest.object.userData.id) : ''}, distance: ${feetAndInchesAsString(distFeet, distInches)} (${parseFloat(Math.round(closest.distance * 100) / 100).toFixed(2)}m)` : '' |
<<<<<<<
import { useExportToGltf, loadCameraModel } from '../../../hooks/use-export-to-gltf'
=======
import useSaveToStoryboarder from '../../hooks/use-save-to-storyboarder'
import { useExportToGltf } from '../../../hooks/use-export-to-gltf'
>>>>>>>
import { useExportToGltf, loadCameraModel } from '../../../hooks/use-export-to-gltf'
import useSaveToStoryboarder from '../../hooks/use-save-to-storyboarder'
<<<<<<<
useExportToGltf( mainCanvasData.scene, withState)
=======
const largeRenderFnRef = useRef()
const smallRenderFnRef = useRef()
const { insertNewShot, saveCurrentShot } = useSaveToStoryboarder(
largeRenderFnRef,
smallRenderFnRef
)
useEffect(() => {
ipcRenderer.on('requestSaveShot', saveCurrentShot)
return () => ipcRenderer.removeListener('requestSaveShot', saveCurrentShot)
}, [saveCurrentShot])
useEffect(() => {
ipcRenderer.on('requestInsertShot', insertNewShot)
return () => ipcRenderer.removeListener('requestInsertShot', insertNewShot)
}, [insertNewShot])
useExportToGltf(largeCanvasData.current.scene, withState)
>>>>>>>
const largeRenderFnRef = useRef()
const smallRenderFnRef = useRef()
const { insertNewShot, saveCurrentShot } = useSaveToStoryboarder(
largeRenderFnRef,
smallRenderFnRef
)
useEffect(() => {
ipcRenderer.on('requestSaveShot', saveCurrentShot)
return () => ipcRenderer.removeListener('requestSaveShot', saveCurrentShot)
}, [saveCurrentShot])
useEffect(() => {
ipcRenderer.on('requestInsertShot', insertNewShot)
return () => ipcRenderer.removeListener('requestInsertShot', insertNewShot)
}, [insertNewShot])
useExportToGltf( mainCanvasData.scene, withState) |
<<<<<<<
{
navigator.getGamepads()[controller.userData.gamepad.index] &&
navigator.getGamepads()[controller.userData.gamepad.index].hand === (switchHand ? 'left' : 'right') &&
<group>
<Controls
gltf={resources.controlsGltf}
mode={uiCurrent.value.controls}
hand={switchHand ? 'left' : 'right'}
getCanvasRenderer={getCanvasRenderer} />
{ showHelp && <Help
mode={uiCurrent.value.controls}
getCanvasRenderer={getCanvasRenderer} />
}
</group>
}
=======
{gamepadFor(controller).hand === (switchHand ? 'left' : 'right') &&
<Controls
gltf={resources.controlsGltf}
mode={uiCurrent.value.controls}
hand={switchHand ? 'left' : 'right'}
getCanvasRenderer={getCanvasRenderer} />
}
>>>>>>>
{gamepadFor(controller).hand === (switchHand ? 'left' : 'right') &&
<group>
<Controls
gltf={resources.controlsGltf}
mode={uiCurrent.value.controls}
hand={switchHand ? 'left' : 'right'}
getCanvasRenderer={getCanvasRenderer} />
{ showHelp && <Help
mode={uiCurrent.value.controls}
getCanvasRenderer={getCanvasRenderer} />
}
</group>
} |
<<<<<<<
const [poseSelector, setPoseSelector] = useState(false)
=======
const [helpToggle, setHelpToggle] = useState(false)
const [helpSlide, setHelpSlide] = useState(0)
>>>>>>>
const [poseSelector, setPoseSelector] = useState(false)
const [helpToggle, setHelpToggle] = useState(false)
const [helpSlide, setHelpSlide] = useState(0)
<<<<<<<
} else if (button === 'pose') {
setPoseSelector(oldValue => {
return !oldValue
})
=======
} else if (button === 'help') {
setHelpToggle(oldValue => {
return !oldValue
})
>>>>>>>
} else if (button === 'pose') {
setPoseSelector(oldValue => {
return !oldValue
})
} else if (button === 'help') {
setHelpToggle(oldValue => {
return !oldValue
})
<<<<<<<
<GUI {...{ aspectRatio, presets, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, flipHand, selectorOffset, poseSelector, guiCamFOV, vrControllers }} />
=======
<GUI {...{ aspectRatio, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, flipHand, helpToggle, helpSlide, guiCamFOV, vrControllers }} />
>>>>>>>
<GUI {...{ aspectRatio, presets, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, flipHand, selectorOffset, poseSelector, helpToggle, helpSlide, guiCamFOV, vrControllers }} /> |
<<<<<<<
let poleConstraints = this.chainObjects[i].poleConstraint;
if(poleConstraints != null)
{
let poleTarget = poleConstraints.poleTarget;
let polePosition = poleConstraints.poleTarget.mesh.position;
let targetPosition = new THREE.Vector3();
if(poleConstraints.poleTarget.mesh.userData.isInitialized) continue;
chain.joints[chain.joints.length - 2].bone.getWorldPosition(targetPosition);
poleConstraints.poleTarget.mesh.position.set(targetPosition.x + polePosition.x, targetPosition.y + polePosition.y, targetPosition.z + polePosition.z);
this.calculatePoleTargetOffset(poleTarget, chain);
poleTarget.initialize(poleTarget.poleOffset);
}
=======
>>>>>>> |
<<<<<<<
const dragInfo = useRef({prev: [0, 0], current: [0, 0]})
=======
const fakeCamera = useRef()
>>>>>>>
const dragInfo = useRef({prev: [0, 0], current: [0, 0]})
const fakeCamera = useRef() |
<<<<<<<
return <group
=======
return skinnedMesh ? (
<group
//visible={false}
>>>>>>>
return <group
//visible={false}
<<<<<<<
{
skinnedMesh && (
<group
ref={object}
bonesHelper={bonesHelper ? bonesHelper : null}
userData={{
id,
type,
originalHeight,
mesh,
skeleton,
boneLengthScale,
parentRotation,
parentPosition,
modelSettings: Object.assign({ rotation: props.rotation }, initialState.models[props.model]) || {
rotation: props.rotation
}
}}
>
<primitive userData={{ id, type }} object={skinnedMesh} />
<primitive object={armatures[0]} />
{props.children}
</group>
)
}
{(skinnedMesh && bonesHelper) && (
=======
<group
ref={object}
//visible={false}
bonesHelper={bonesHelper ? bonesHelper : null}
userData={{
id,
type,
originalHeight,
mesh,
skeleton,
boneLengthScale,
parentRotation,
parentPosition,
modelSettings: Object.assign({ rotation: props.rotation }, initialState.models[props.model]) || {
rotation: props.rotation
}
}}
>
<primitive userData={{ id, type }} object={skinnedMesh} />
<primitive object={armatures[0]} />
{props.children}
</group>
{bonesHelper && (
>>>>>>>
{
skinnedMesh && (
<group
//visible={false}
ref={object}
bonesHelper={bonesHelper ? bonesHelper : null}
userData={{
id,
type,
originalHeight,
mesh,
skeleton,
boneLengthScale,
parentRotation,
parentPosition,
modelSettings: Object.assign({ rotation: props.rotation }, initialState.models[props.model]) || {
rotation: props.rotation
}
}}
>
<primitive userData={{ id, type }} object={skinnedMesh} />
<primitive object={armatures[0]} />
{props.children}
</group>
)
}
{(skinnedMesh && bonesHelper) && (
<<<<<<<
</group>
}
=======
</group>
) : null
})
>>>>>>>
</group>
}) |
<<<<<<<
import ObjectRotationControl from '../shared/IK/objects/ObjectRotationControl'
=======
import RemoteProvider from "./components/RemoteProvider"
import RemoteClients from "./components/RemoteClients"
import XRClient from "./components/Three/XRClient"
>>>>>>>
import ObjectRotationControl from '../shared/IK/objects/ObjectRotationControl'
import RemoteProvider from "./components/RemoteProvider"
import RemoteClients from "./components/RemoteClients"
import XRClient from "./components/Three/XRClient" |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.