Merge remote-tracking branch 'origin/14-scene-introspection-sidebar' …

…into 13-pyrobird-cli-flask
eic · Oct 10, 2024 · d987ac8 · d987ac8
2 parents 977a267 + 927138a
commit d987ac8
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 179 deletions.
diff --git a/firebird-ng/src/app/app.component.html b/firebird-ng/src/app/app.component.html
@@ -51,55 +51,55 @@
 <!--      </li>-->
     </ul>
   </div>
-  <div class="phoenix-menu">
-    <!-- Event selector -->
-    <app-event-selector></app-event-selector>
+<!--  <div class="phoenix-menu">-->
+<!--    &lt;!&ndash; Event selector &ndash;&gt;-->
+<!--    <app-event-selector></app-event-selector>-->
 
-    <!-- Zoom in and zoom out controls -->
-    <app-zoom-controls></app-zoom-controls>
+<!--    &lt;!&ndash; Zoom in and zoom out controls &ndash;&gt;-->
+<!--    <app-zoom-controls></app-zoom-controls>-->
 
-    <app-view-options></app-view-options>
+<!--    <app-view-options></app-view-options>-->
 
-    <app-auto-rotate></app-auto-rotate>
+<!--    <app-auto-rotate></app-auto-rotate>-->
 
-    <!-- Dark theme toggle -->
-    <app-dark-theme></app-dark-theme>
+<!--    &lt;!&ndash; Dark theme toggle &ndash;&gt;-->
+<!--    <app-dark-theme></app-dark-theme>-->
 
-    <!-- Toggle for clipping geometries -->
-    <app-object-clipping></app-object-clipping>
+<!--    &lt;!&ndash; Toggle for clipping geometries &ndash;&gt;-->
+<!--    <app-object-clipping></app-object-clipping>-->
 
-    <!-- Main view toggle -->
-    <app-main-view-toggle></app-main-view-toggle>
+<!--    &lt;!&ndash; Main view toggle &ndash;&gt;-->
+<!--    <app-main-view-toggle></app-main-view-toggle>-->
 
-    <!-- Toggle for overlay panel -->
-    <app-overlay-view></app-overlay-view>
+<!--    &lt;!&ndash; Toggle for overlay panel &ndash;&gt;-->
+<!--    <app-overlay-view></app-overlay-view>-->
 
-    <!-- Toggle for selected object panel -->
-    <app-object-selection></app-object-selection>
+<!--    &lt;!&ndash; Toggle for selected object panel &ndash;&gt;-->
+<!--    <app-object-selection></app-object-selection>-->
 
-    <!-- Toggle for animating the event data -->
-    <app-animate-event></app-animate-event>
+<!--    &lt;!&ndash; Toggle for animating the event data &ndash;&gt;-->
+<!--    <app-animate-event></app-animate-event>-->
 
-    <!-- Toggle for collections info -->
-    <app-collections-info></app-collections-info>
+<!--    &lt;!&ndash; Toggle for collections info &ndash;&gt;-->
+<!--    <app-collections-info></app-collections-info>-->
 
-    <!-- Toggle for geometry browser -->
-    <app-geometry-browser></app-geometry-browser>
+<!--    &lt;!&ndash; Toggle for geometry browser &ndash;&gt;-->
+<!--    <app-geometry-browser></app-geometry-browser>-->
 
-    <!-- Toggle for performance -->
-    <app-performance-toggle></app-performance-toggle>
+<!--    &lt;!&ndash; Toggle for performance &ndash;&gt;-->
+<!--    <app-performance-toggle></app-performance-toggle>-->
 
-    <!-- Toggle for loading geometries modal-->
-    <eic-io-options></eic-io-options>
+<!--    &lt;!&ndash; Toggle for loading geometries modal&ndash;&gt;-->
+<!--    <eic-io-options></eic-io-options>-->
 
-    <!-- Toggle for shareable link constructor modal-->
-    <app-share-link></app-share-link>
+<!--    &lt;!&ndash; Toggle for shareable link constructor modal&ndash;&gt;-->
+<!--    <app-share-link></app-share-link>-->
 
-    <!-- Info panel -->
-    <app-info-panel></app-info-panel>
+<!--    &lt;!&ndash; Info panel &ndash;&gt;-->
+<!--    <app-info-panel></app-info-panel>-->
 
-    <!-- Extra options -->
-    <ng-content></ng-content>
-  </div>
+<!--    &lt;!&ndash; Extra options &ndash;&gt;-->
+<!--    <ng-content></ng-content>-->
+<!--  </div>-->
 </nav>
 <router-outlet></router-outlet>
diff --git a/firebird-ng/src/app/components/display-shell/display-shell.component.ts b/firebird-ng/src/app/components/display-shell/display-shell.component.ts
@@ -63,7 +63,7 @@ export class DisplayShellComponent {
   rightPaneWidth = 250;
 
   /** If left plane is visible or collapsed */
-  isLeftPaneVisible = true;
+  isLeftPaneVisible = false;
 
   /** If right plane is visible or collapsed */
   isRightPaneVisible = false;

diff --git a/firebird-ng/src/app/components/display-shell/display-shell.component.ts~ b/firebird-ng/src/app/components/display-shell/display-shell.component.ts~
diff --git a/firebird-ng/src/app/pages/main-display/main-display.component.html b/firebird-ng/src/app/pages/main-display/main-display.component.html
@@ -150,6 +150,56 @@
       </button>
   <!--    <button (click)="toggleRightPane()">Toggle Right Pane</button>-->
 <!--    </div>-->
+    <div class="phoenix-menu">
+      <!-- Event selector -->
+      <app-event-selector></app-event-selector>
+
+      <!-- Zoom in and zoom out controls -->
+      <app-zoom-controls></app-zoom-controls>
+
+      <app-view-options></app-view-options>
+
+      <app-auto-rotate></app-auto-rotate>
+
+      <!-- Dark theme toggle -->
+      <app-dark-theme></app-dark-theme>
+
+      <!-- Toggle for clipping geometries -->
+      <app-object-clipping></app-object-clipping>
+
+      <!-- Main view toggle -->
+      <app-main-view-toggle></app-main-view-toggle>
+
+      <!-- Toggle for overlay panel -->
+      <app-overlay-view></app-overlay-view>
+
+      <!-- Toggle for selected object panel -->
+      <app-object-selection></app-object-selection>
+
+      <!-- Toggle for animating the event data -->
+      <app-animate-event></app-animate-event>
+
+      <!-- Toggle for collections info -->
+      <app-collections-info></app-collections-info>
+
+      <!-- Toggle for geometry browser -->
+      <app-geometry-browser></app-geometry-browser>
+
+      <!-- Toggle for performance -->
+      <app-performance-toggle></app-performance-toggle>
+
+      <!-- Toggle for loading geometries modal-->
+      <eic-io-options></eic-io-options>
+
+      <!-- Toggle for shareable link constructor modal-->
+      <app-share-link></app-share-link>
+
+      <!-- Info panel -->
+      <app-info-panel></app-info-panel>
+
+      <!-- Extra options -->
+      <ng-content></ng-content>
+    </div>
 
   </ng-container>
 

diff --git a/firebird-ng/src/app/pages/main-display/main-display.component.scss b/firebird-ng/src/app/pages/main-display/main-display.component.scss
@@ -46,3 +46,14 @@ mat-slider{
   width: 200px;
 }
 
+.phoenix-menu{
+  position: fixed;
+  top: 10px;
+  left: 50%;
+  transform: translateX(-50%);
+  flex: 1 1 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #2e2e2e;
+}
diff --git a/firebird-ng/src/app/pages/main-display/main-display.component.ts b/firebird-ng/src/app/pages/main-display/main-display.component.ts
@@ -104,8 +104,7 @@ export class MainDisplayComponent implements OnInit, AfterViewInit {
   selectedEventKey: string|undefined;
   private beamAnimationTime: number = 1000;
 
-  private isHandlerDragging = false;
-  isLeftPaneOpen: boolean = true;
+  isLeftPaneOpen: boolean = false;
 
   private painter: DataModelPainter = new DataModelPainter();
 
@@ -664,6 +663,8 @@ export class MainDisplayComponent implements OnInit, AfterViewInit {
       console.log((e as KeyboardEvent).key);
 
     });
+
+
   }