Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(exclude_objects): fix order of objects in map #1716

Merged
merged 2 commits into from
Dec 30, 2023
Merged

fix(exclude_objects): fix order of objects in map #1716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b9f923
refactor: refactor StatusPanel.vue
meteyou Dec 26, 2023
e92faa0
fix: fix order of objects to visible small parts in bigger parts
meteyou Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/components/panels/Status/ExcludeObject.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</div>
</div>
</v-container>
<v-divider class="mt-0 mb-0"></v-divider>
<v-divider class="mt-0 mb-0" />
<v-dialog v-model="boolShowExcludeObjectDialog" max-width="400">
<v-card>
<v-toolbar flat dense>
Expand All @@ -36,7 +36,7 @@
{{ $t('Panels.StatusPanel.ExcludeObject.ExcludeObjectText', { name: excludeObjectDialogName }) }}
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
<v-spacer />
<v-btn text @click="boolShowExcludeObjectDialog = false">
{{ $t('Panels.StatusPanel.ExcludeObject.Cancel') }}
</v-btn>
Expand All @@ -51,7 +51,7 @@
:exclude-object-dialog-name.sync="excludeObjectDialogName"
:exclude-object-dialog-bool.sync="boolShowExcludeObjectDialog"
@update:name="updateExcludeObjectDialogName"
@update:bool="updateExcludeObjectDialogBool"></status-panel-exclude-object-dialog>
@update:bool="updateExcludeObjectDialogBool" />
</div>
</template>

Expand Down
87 changes: 55 additions & 32 deletions src/components/panels/Status/ExcludeObjectDialogMap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
<style scoped>
svg {
border: 2px solid #888;
}

#tooltipObjectMap {
display: none;
position: absolute;
background: black;
border-radius: 3px;
color: white;
padding: 3px 7px;
z-index: 100;

&:before {
display: block;
content: ' ';
width: 0;
height: 0;
position: absolute;
bottom: -10px;
left: 10px;
border-top: 10px solid black;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
}
</style>

<template>
<div style="position: relative">
<div id="tooltipObjectMap" ref="tooltipObjectMap"></div>
<div id="tooltipObjectMap" ref="tooltipObjectMap" />
<svg
version="1.1"
xmlns="http://www.w3.org/2000/svg"
Expand Down Expand Up @@ -120,11 +91,34 @@ export default class StatusPanelObjectsDialogMap extends Mixins(BaseMixin) {
}

get printing_objects() {
return this.$store.state.printer.exclude_object?.objects ?? []
return (
(this.$store.state.printer.exclude_object?.objects ?? [])
.map((object: any) => {
let total = 0

if ('polygon' in object) {
for (let i = 0; i < object.polygon.length; i++) {
const pointA = object.polygon[i]
const pointB = i === object.polygon.length - 1 ? object.polygon[0] : object.polygon[i + 1]

total += pointA[0] * pointB[1] - pointA[1] * pointB[0]
}
}

return {
center: object.center,
name: object.name,
polygon: object.polygon,
size: Math.abs(total),
}
})
// sort all objects by size
.sort((a: any, b: any) => b.size - a.size)
)
}

get printing_objects_with_polygons() {
return this.printing_objects.filter((eobject: any) => 'polygon' in eobject)
return this.printing_objects.filter((object: any) => 'polygon' in object)
}

get current_object() {
Expand Down Expand Up @@ -249,3 +243,32 @@ export default class StatusPanelObjectsDialogMap extends Mixins(BaseMixin) {
}
}
</script>

<style scoped>
svg {
border: 2px solid #888;
}

#tooltipObjectMap {
display: none;
position: absolute;
background: black;
border-radius: 3px;
color: white;
padding: 3px 7px;
z-index: 100;

&:before {
display: block;
content: ' ';
width: 0;
height: 0;
position: absolute;
bottom: -10px;
left: 10px;
border-top: 10px solid black;
border-left: 10px solid transparent;
border-right: 10px solid transparent;
}
}
</style>
18 changes: 8 additions & 10 deletions src/components/panels/StatusPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<div>
<min-settings-panel></min-settings-panel>
<klippy-state-panel></klippy-state-panel>
<min-settings-panel />
<klippy-state-panel />
<panel
v-if="klipperReadyForGui"
:icon="mdiInformation"
Expand All @@ -16,7 +16,7 @@
:width="5"
:value="printPercent"
color="primary"
class="mr-3"></v-progress-circular>
class="mr-3" />
</template>
<template #buttons>
<v-btn
Expand Down Expand Up @@ -52,10 +52,8 @@
</v-list>
</v-menu>
</template>
<status-panel-printstatus-thumbnail></status-panel-printstatus-thumbnail>
<status-panel-exclude-object
:show-dialog.sync="boolShowObjects"
@update:showDialog="updateShowDialog"></status-panel-exclude-object>
<status-panel-printstatus-thumbnail />
<status-panel-exclude-object :show-dialog.sync="boolShowObjects" @update:showDialog="updateShowDialog" />
<status-panel-pause-at-layer-dialog :show-dialog.sync="boolShowPauseAtLayer" />
<template v-if="print_stats_message">
<v-container>
Expand All @@ -68,7 +66,7 @@
</v-col>
</v-row>
</v-container>
<v-divider class="mt-0 mb-0"></v-divider>
<v-divider class="mt-0 mb-0" />
</template>
<template v-if="display_message">
<v-container>
Expand All @@ -86,7 +84,7 @@
</v-col>
</v-row>
</v-container>
<v-divider class="mt-0 mb-0"></v-divider>
<v-divider class="mt-0 mb-0" />
</template>
<v-tabs v-model="activeTab" fixed-tabs>
<v-tab v-if="current_filename" href="#status">{{ $t('Panels.StatusPanel.Status') }}</v-tab>
Expand All @@ -97,7 +95,7 @@
</v-badge>
</v-tab>
</v-tabs>
<v-divider class="my-0"></v-divider>
<v-divider class="my-0" />
<v-tabs-items v-model="activeTab" class="_border-radius">
<v-tab-item v-if="current_filename" value="status">
<status-panel-printstatus />
Expand Down
Loading