Compare commits

..

8 Commits

Author SHA1 Message Date
David Tsay
5000bcc849 removed deprecated consts 2022-04-22 16:48:22 -07:00
David Tsay
44d2c465ff Merge branch 'master' into sort-incoming-telemetry 2022-04-22 16:39:05 -07:00
David Tsay
237d458b07 Merge branch 'master' into sort-incoming-telemetry 2022-04-22 15:16:01 -07:00
David Tsay
7e41a4168f more clear naming for row merge 2022-04-22 15:09:00 -07:00
David Tsay
3918e808d8 Merge branch 'master' into sort-incoming-telemetry 2022-04-22 14:05:11 -07:00
Andrew Henry
fd71ce8c42 Merge branch 'master' into sort-incoming-telemetry 2022-04-12 13:54:37 -07:00
David Tsay
cc32cf43af add shortcut for merging to beginning or end of existing rows
change sort function to return first row instead of boolean

rename x and y to more common counters i and j
2022-04-12 13:42:37 -07:00
David Tsay
0551fc2e7c use sort and merge for larger data and use insertion only for small data (subscriptions) 2022-04-07 14:37:18 -07:00
6 changed files with 6 additions and 32 deletions

View File

@@ -172,7 +172,6 @@ export class TelemetryCollection extends EventEmitter {
* @private
*/
_processNewTelemetry(telemetryData) {
performance.mark('tlm:process:start');
if (telemetryData === undefined) {
return;
}
@@ -185,8 +184,8 @@ export class TelemetryCollection extends EventEmitter {
for (let datum of data) {
parsedValue = this.parseTime(datum);
beforeStartOfBounds = parsedValue <= this.lastBounds.start;
afterEndOfBounds = parsedValue >= this.lastBounds.end;
beforeStartOfBounds = parsedValue < this.lastBounds.start;
afterEndOfBounds = parsedValue > this.lastBounds.end;
if (!afterEndOfBounds && !beforeStartOfBounds) {
let isDuplicate = false;
@@ -353,7 +352,6 @@ export class TelemetryCollection extends EventEmitter {
* @todo handle subscriptions more granually
*/
_reset() {
performance.mark('tlm:reset');
this.boundedTelemetry = [];
this.futureBuffer = [];

View File

@@ -32,9 +32,7 @@ export default function GaugeViewProvider(openmct) {
return domainObject.type === 'gauge';
},
canEdit: function (domainObject) {
if (domainObject.type === 'gauge') {
return true;
}
return false;
},
view: function (domainObject) {
let component;

View File

@@ -225,9 +225,8 @@ define(
sortBy(sortOptions) {
if (arguments.length > 0) {
this.sortOptions = sortOptions;
performance.mark('table:row:sort:start');
this.rows = _.orderBy(this.rows, (row) => row.getParsedValue(sortOptions.key), sortOptions.direction);
performance.mark('table:row:sort:stop');
this.emit('sort');
}

View File

@@ -613,7 +613,6 @@ export default {
this.calculateScrollbarWidth();
},
sortBy(columnKey) {
performance.mark('table:sort');
// If sorting by the same column, flip the sort direction.
if (this.sortOptions.key === columnKey) {
if (this.sortOptions.direction === 'asc') {
@@ -670,7 +669,6 @@ export default {
this.setHeight();
},
rowsAdded(rows) {
performance.mark('row:added');
this.setHeight();
let sizingRow;
@@ -692,7 +690,6 @@ export default {
this.updateVisibleRows();
},
rowsRemoved(rows) {
performance.mark('row:removed');
this.setHeight();
this.updateVisibleRows();
},

View File

@@ -123,11 +123,4 @@
h2 {
font-size: 1.5em;
}
button {
color: #aaaaaa;
font-size: 0.7em;
}
button:active {
color: $colorBtnBgHov;
}
}

View File

@@ -23,14 +23,8 @@
<p>Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.</p>
<p>Open MCT includes source code licensed under additional open source licenses. See the Open Source Licenses file included with this distribution or <a @click="showLicenses">click here for third party licensing information</a>.</p>
</div>
<h2>Version Information<button
class="icon-export"
@click="copyVersionToClipboard"
></button></h2>
<ul
ref="versionInformation"
class="t-info l-info s-info"
>
<h2>Version Information</h2>
<ul class="t-info l-info s-info">
<li>Version: {{ buildInfo.version || 'Unknown' }}</li>
<li>Build Date: {{ buildInfo.buildDate || 'Unknown' }}</li>
<li>Revision: {{ buildInfo.revision || 'Unknown' }}</li>
@@ -52,11 +46,6 @@ export default {
methods: {
showLicenses() {
window.open('#/licenses');
},
copyVersionToClipboard(e) {
const versionInfoElement = this.$refs.versionInformation;
const versionInfoText = versionInfoElement.innerHTML;
window.navigator.clipboard.writeText(versionInfoText);
}
}
};