@things-factory/figure-ui 10.1.115 → 10.1.116

package/dist-client/modeller/figure-links.js

@@ -777,11 +777,13 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
           ${now.travel
                 ? html `<small>${i18next.t('figure.label.motion-travel-is', { part: now.travel.part, axis: now.travel.axis.toUpperCase(), plus: now.travel.plus ?? 0 })}</small>`
                 : nothing}
-          ${now.follows
-                ? html `<small>${i18next.t('figure.label.motion-follows', { joint: now.follows.joint, multiplier: now.follows.multiplier, offset: now.follows.offset ?? 0 })}</small>`
-                : now.control
-                    ? html `<small>${now.control.id} (${now.control.unit}) ${now.control.min} … ${now.control.max}</small>`
-                    : nothing}
+          ${now.follows?.sum.length === 1
+                ? html `<small>${i18next.t('figure.label.motion-follows', { joint: now.follows.sum[0].joint, multiplier: now.follows.sum[0].multiplier, offset: now.follows.offset })}</small>`
+                : now.follows
+                    ? html `<small>${i18next.t('figure.label.motion-follow')}: ${now.follows.sum.map(t => `${t.joint} × ${t.multiplier}`).join(' + ')} + ${now.follows.offset}</small>`
+                    : now.control
+                        ? html `<small>${now.control.id} (${now.control.unit}) ${now.control.min} … ${now.control.max}</small>`
+                        : nothing}
         </span>
         <button
           act
@@ -826,42 +828,53 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
           ${AXES.map(a => html `<option value=${a} ?selected=${a === m.axis}>${i18next.t('figure.label.motion-axis')} ${a.toUpperCase()}</option>`)}
         </select>
       </div>
-      ${leaders.length
+      ${m.followSum
             ? html `<div form>
             <span>${i18next.t('figure.label.motion-follow')}</span>
+            <span>${m.followSum.map(t => `${t.joint} × ${t.multiplier}`).join(' + ')}</span>
+            <span>${i18next.t('figure.label.motion-offset')} (${unit})</span>
+            <input type="number" step="any" .value=${String(m.offset)} @change=${(e) => (this.motion = { ...m, offset: Number(e.target.value) || 0 })} />
+          </div>`
+            : leaders.length
+                ? html `<div form>
+            <span>${i18next.t('figure.label.motion-follow')}</span>
             <select @change=${(e) => (this.motion = { ...m, follow: e.target.value })}>
               <option value="" ?selected=${!follow}>${i18next.t('figure.label.motion-own-control')}</option>
               ${leaders.map(j => html `<option value=${j.id} ?selected=${j.id === follow}>${j.body1.part}${j.state ? ` · ${j.state.id}` : ''}</option>`)}
             </select>
           </div>`
-            : nothing}
-      ${follow
-            ? html `<div form>
+                : nothing}
+      ${m.followSum
+            ? nothing
+            : follow
+                ? html `<div form>
             <span>${i18next.t('figure.label.motion-multiplier')}</span>
             <input type="number" step="any" .value=${String(m.multiplier)} @change=${(e) => (this.motion = { ...m, multiplier: Number(e.target.value) })} />
             <span>${i18next.t('figure.label.motion-offset')} (${unit})</span>
             <input type="number" step="any" .value=${String(m.offset)} @change=${(e) => (this.motion = { ...m, offset: Number(e.target.value) || 0 })} />
           </div>`
-            : html `<div form>
+                : html `<div form>
             ${m.kind === 'slide'
-                ? html `<span>${i18next.t('figure.label.motion-travel')}</span>
+                    ? html `<span>${i18next.t('figure.label.motion-travel')}</span>
                   <select @change=${(e) => (this.motion = { ...m, travel: e.target.value })}>
-                    <option value="" ?selected=${!m.travel}>${i18next.t('figure.label.motion-travel-mm')}</option>
+                    ${m.travelSum
+                        ? html `<option value="" ?selected=${!m.travel}>${m.travelSum.sum.map(t => `${t.from.of === 'input' ? t.from.input : `${t.from.of === 'part' ? t.from.part : i18next.t('figure.label.motion-travel')} · ${t.from.axis.toUpperCase()}`}${t.times !== undefined && t.times !== 1 ? ` × ${t.times}` : ''}`).join(' + ')}</option>`
+                        : html `<option value="" ?selected=${!m.travel}>${i18next.t('figure.label.motion-travel-mm')}</option>`}
                     ${asset.appearance
-                    .map(look => look.target)
-                    .filter(one => canFollow(asset, one))
-                    .flatMap(one => AXES.map(a => html `<option value=${`${one}:${a}`} ?selected=${m.travel === `${one}:${a}`}>${one} · ${a.toUpperCase()}</option>`))}
+                        .map(look => look.target)
+                        .filter(one => canFollow(asset, one))
+                        .flatMap(one => AXES.map(a => html `<option value=${`${one}:${a}`} ?selected=${m.travel === `${one}:${a}`}>${one} · ${a.toUpperCase()}</option>`))}
                   </select>
                   ${m.travel
-                    ? html `<span>${i18next.t('figure.label.follows-plus')}</span>
+                        ? html `<span>${i18next.t('figure.label.follows-plus')}</span>
                         <input type="number" step="any" .value=${String(m.travelPlus ?? 0)} @change=${(e) => (this.motion = { ...m, travelPlus: Number(e.target.value) || 0 })} />`
-                    : nothing}`
-                : nothing}
+                        : nothing}`
+                    : nothing}
             <span>${i18next.t('figure.label.control-id')}</span>
             <input .value=${m.id} placeholder=${`${this.partId}-${m.kind}`} @change=${(e) => (this.motion = { ...m, id: e.target.value.trim() })} />
-            ${m.kind === 'continuous' || (m.kind === 'slide' && m.travel)
-                ? nothing
-                : html `<span>${i18next.t('figure.label.control-range')} (${unit})</span>
+            ${m.kind === 'continuous' || (m.kind === 'slide' && (m.travel || m.travelSum))
+                    ? nothing
+                    : html `<span>${i18next.t('figure.label.control-range')} (${unit})</span>
                   <div pair>
                     <input type="number" step="any" .value=${String(m.min)} @change=${(e) => (this.motion = { ...m, min: Number(e.target.value) })} />
                     <input type="number" step="any" .value=${String(m.max)} @change=${(e) => (this.motion = { ...m, max: Number(e.target.value) })} />
@@ -869,7 +882,7 @@ let FigureLinks = class FigureLinks extends localize(i18next)(LitElement) {
           </div>`}
       <button
         act
-        ?disabled=${this.locked || (follow ? !(Number.isFinite(m.multiplier) && m.multiplier !== 0) : m.kind !== 'continuous' && !(m.kind === 'slide' && m.travel) && !(m.max > m.min && m.min <= 0 && 0 <= m.max))}
+        ?disabled=${this.locked || (m.followSum ? false : follow ? !(Number.isFinite(m.multiplier) && m.multiplier !== 0) : m.kind !== 'continuous' && !(m.kind === 'slide' && (m.travel || m.travelSum)) && !(m.max > m.min && m.min <= 0 && 0 <= m.max))}
         title=${!follow && m.kind !== 'continuous' && !(m.min <= 0 && 0 <= m.max) ? i18next.t('figure.text.joint-range-holds-zero') : ''}
         @click=${() => {
             this.command({ kind: 'set-joint', joint: motionJoint(joint, { ...m, follow }, this.partId) });