Add meta-key to select secondary time samples, in the C++.

Some initial attempts at exploring flex layout for primary app layout - much left to be done.

Author: wcjohns

InterSpec/InterSpec.h

@@ -1189,9 +1189,18 @@ class InterSpec : public Wt::WContainerWidget
   SpecMeasManager        *m_fileManager; // The file manager
   Wt::WGridLayout        *m_layout;
 
+// 20210604: started playing around with using FLEX layout for just the charts - its not there yet,
+//           but shows some promise.
+#define USE_FLEX_CHART_LAYOUT 0
+  
   //Note: m_chartsLayout may be eliminated; may even be able to eliminate
   //  m_toolsLayout...
+#if( USE_FLEX_CHART_LAYOUT )
+  Wt::WContainerWidget   *m_chartsDiv;
+#else
   Wt::WGridLayout        *m_chartsLayout;
+#endif
+  
   Wt::WGridLayout        *m_toolsLayout;
   Wt::WContainerWidget   *m_menuDiv; // The top menu bar.
 

src/D3SpectrumDisplayDiv.cpp

@@ -298,7 +298,21 @@ void D3SpectrumDisplayDiv::defineJavaScript()
   options += "}";
 
   setJavaScriptMember( "chart", "new SpectrumChartD3(" + jsRef() + "," + options + ");");
+  
+
+#if( USE_FLEX_CHART_LAYOUT )
+  doJavaScript( ""
+    "const resizeObs" + id() + " = new ResizeObserver(entries => {"
+    "for (let entry of entries) {"
+      "if( entry.target && (entry.target.id === '" + id() + "') )"
+        + m_jsgraph + ".handleResize();"
+      "}"
+    "});"
+    "resizeObs" + id() + ".observe(" + jsRef() + ");"
+  );
+#else
   setJavaScriptMember( "wtResize", "function(self, w, h, layout){" + m_jsgraph + ".handleResize();}" );
+#endif
 
 #if( RENDER_REFERENCE_PHOTOPEAKS_SERVERSIDE )
   updateReferncePhotoPeakLines();

src/D3TimeChart.cpp

@@ -463,7 +463,10 @@ D3TimeChart::~D3TimeChart()
 
 void D3TimeChart::defineJavaScript()
 {
-  //WWebWidget::doJavaScript( "$(" + jsRef() + ").append('<svg width=\"400\" height=\"75\"><rect width=\"300\" height=\"75\" style=\"fill:rgb(0,0,255);stroke-width:3;stroke:rgb(0,0,0)\" /></svg>' ); console.log( 'Added rect' );" );
+  //WWebWidget::doJavaScript( "$(" + m_chart->jsRef() + ").append('<svg width=\"400\" height=\"75\" style=\"box-sizing: border-box; \"><rect width=\"300\" height=\"75\" style=\"fill:rgb(0,0,255);stroke-width:3;stroke:rgb(0,0,0)\" /></svg>' ); console.log( 'Added rect' );" );
+  
+  //WWebWidget::doJavaScript( "$(" + m_chart->jsRef() + ").append('<div style=\"box-sizing: border-box; position: absolute; border: 1px solid blue; width: 100px; height: 75px;\" />' );" );
+  //cerr << "\n\nFor debugging - skipping D3TimeChart::defineJavaScript(...) - you need to fix this\n\n";
   //return;
 
   string options = "{";
@@ -513,6 +516,9 @@ void D3TimeChart::defineJavaScript()
 
 void D3TimeChart::doJavaScript( const std::string& js )
 {
+  //cerr << "\n\nFor debugging - skipping D3TimeChart::doJavaScript(...) - you need to fix this\n\n";
+  //return;
+  
   if( isRendered() )
     WContainerWidget::doJavaScript( js );
   else
@@ -1469,7 +1475,7 @@ void D3TimeChart::showFilters( const bool show )
     //}
   }//if( !show )
 
-  doJavaScript( "setTimeout( function(){" + m_jsgraph + ".handleResize();},0); " );
+  //doJavaScript( "setTimeout( function(){" + m_jsgraph + ".handleResize();},0); " );
 
   const auto mode = show ? m_options->interactionMode() : UserInteractionMode::Default;
   setUserInteractionMode( mode );

src/InterSpec.cpp

@@ -355,7 +355,11 @@ InterSpec::InterSpec( WContainerWidget *parent )
     m_warningsWindow( 0 ),
     m_fileManager( 0 ),
     m_layout( 0 ),
+#if( USE_FLEX_CHART_LAYOUT )
+    m_chartsDiv( nullptr ),
+#else
     m_chartsLayout( 0 ),
+#endif
     m_toolsLayout( 0 ),
     m_menuDiv( 0 ),
     m_peakInfoDisplay( 0 ),
@@ -526,14 +530,44 @@ InterSpec::InterSpec( WContainerWidget *parent )
 
   m_peakModel  = new PeakModel( this );
 #if( USE_SPECTRUM_CHART_D3 )
+
+#if( USE_FLEX_CHART_LAYOUT )
+  m_chartsDiv = new WContainerWidget();
+  m_chartsDiv->addStyleClass( "ChartsDiv" );
+  
+  /*
+   //If flex layout is used, need to add at least the below to the CSS
+   .ChartsDiv
+   {
+   display: flex;
+   flex-direction: column;
+   flex-wrap: nowrap;
+   }
+   
+   .ChartsDiv > .SpectrumDisplayDiv {
+   flex-grow: 3;
+   overflow: hidden;
+   }
+   
+   .ChartsDiv > .D3TimeChartParent {
+   flex-grow: 2;
+   overflow: hidden;
+   }
+
+   */
+  
+  m_spectrum   = new D3SpectrumDisplayDiv(m_chartsDiv);
+  m_timeSeries = new D3TimeChart(m_chartsDiv);
+#else
   m_spectrum   = new D3SpectrumDisplayDiv();
+  m_timeSeries = new D3TimeChart();
+#endif
+  
   m_peakModel->dataChanged().connect( m_spectrum, &D3SpectrumDisplayDiv::scheduleForegroundPeakRedraw );
   m_peakModel->rowsRemoved().connect( m_spectrum, &D3SpectrumDisplayDiv::scheduleForegroundPeakRedraw );
   m_peakModel->rowsInserted().connect( m_spectrum, &D3SpectrumDisplayDiv::scheduleForegroundPeakRedraw );
   m_peakModel->layoutChanged().connect( m_spectrum, &D3SpectrumDisplayDiv::scheduleForegroundPeakRedraw );
   m_peakModel->modelReset().connect( m_spectrum, &D3SpectrumDisplayDiv::scheduleForegroundPeakRedraw );
-  
-  m_timeSeries = new D3TimeChart();
 #else
   m_spectrum   = new SpectrumDisplayDiv();
   m_spectrum->setPlotAreaPadding( 80, 2, 10, 44 );
@@ -768,8 +802,13 @@ InterSpec::InterSpec( WContainerWidget *parent )
 
   if( m_menuDiv )
     m_layout->addWidget( m_menuDiv, m_layout->rowCount(), 0 );
+  
+#if( USE_FLEX_CHART_LAYOUT )
+  m_layout->addWidget( m_chartsDiv, m_layout->rowCount(), 0 );
+#else
   m_layout->addWidget( m_spectrum, m_layout->rowCount(), 0 );
   m_layout->addWidget( m_timeSeries, m_layout->rowCount(), 0 );
+#endif
 
 #if( USE_SPECTRUM_CHART_D3 )
   // No need to updated the default axis titles
@@ -780,6 +819,7 @@ InterSpec::InterSpec( WContainerWidget *parent )
   m_timeSeries->chartDragged().connect( this, &InterSpec::timeChartDragged );
   m_timeSeries->chartClicked().connect( this, &InterSpec::timeChartClicked );
 #else
+  
   m_timeSeries->enableLegend( false );
   m_timeSeries->showHistogramIntegralsInLegend( false );
   m_timeSeries->setMouseDragHighlights( true, true );
@@ -5534,8 +5574,13 @@ void InterSpec::setToolTabsVisible( bool showToolTabs )
   { //We are showing the tool tabs
     if( m_menuDiv )
       m_layout->removeWidget( m_menuDiv );
+    
+#if( USE_FLEX_CHART_LAYOUT )
+    m_layout->removeWidget( m_chartsDiv );
+#else
     m_layout->removeWidget( m_spectrum );
     m_layout->removeWidget( m_timeSeries );
+#endif
     m_layout->clear();
 
     //We have to completely replace m_layout or else the vertical spacing
@@ -5623,7 +5668,9 @@ void InterSpec::setToolTabsVisible( bool showToolTabs )
 
     m_energyCalTool->setWideLayout();
     m_toolsTabs->addTab( m_energyCalTool, CalibrationTabTitle, TabLoadPolicy );
-        
+    
+#if( USE_FLEX_CHART_LAYOUT )
+#else
     m_chartsLayout = new WGridLayout();
     m_chartsLayout->setContentsMargins( 0, 0, 0, 0 );
     m_chartsLayout->setHorizontalSpacing( 0 );
@@ -5635,11 +5682,12 @@ void InterSpec::setToolTabsVisible( bool showToolTabs )
       m_chartsLayout->setVerticalSpacing( 0 );
     }else
     {
-      m_chartsLayout->setRowStretch( 0, 3 );
+      m_chartsLayout->setRowStretch( 0, 20 );
       m_chartsLayout->setRowStretch( 1, 2 );
       m_chartsLayout->setRowResizable( 0 );
       m_chartsLayout->setVerticalSpacing( layoutVertSpacing );
     }
+#endif
 
     m_toolsLayout = new WGridLayout();
     m_toolsLayout->setContentsMargins( 0, 0, 0, 0 );
@@ -5650,7 +5698,13 @@ void InterSpec::setToolTabsVisible( bool showToolTabs )
     int row = 0;
     if( m_menuDiv )
       m_layout->addWidget( m_menuDiv,  row++, 0 );
+    
+#if( USE_FLEX_CHART_LAYOUT )
+    m_layout->addWidget( m_chartsDiv,  row, 0 );
+#else
     m_layout->addLayout( m_chartsLayout, row, 0 );
+#endif
+    
     m_layout->setRowResizable( row, true );
     m_layout->setRowStretch( row, 5 );
 
@@ -5706,8 +5760,13 @@ void InterSpec::setToolTabsVisible( bool showToolTabs )
   }else
   {
     //We are hidding the tool tabs
+#if( USE_FLEX_CHART_LAYOUT )
+    m_layout->removeWidget( m_chartsDiv );
+#else
     m_chartsLayout->removeWidget( m_spectrum );
     m_chartsLayout->removeWidget( m_timeSeries );
+    m_chartsLayout = nullptr;
+#endif
 
     if( m_menuDiv )
       m_layout->removeWidget( m_menuDiv );
@@ -5724,7 +5783,7 @@ void InterSpec::setToolTabsVisible( bool showToolTabs )
       m_referencePhotopeakLines->clearAllLines();
 
     m_toolsTabs = nullptr;
-    m_chartsLayout = nullptr;
+    
     if( !m_referencePhotopeakLinesWindow )
       m_referencePhotopeakLines = nullptr;
     m_toolsLayout = nullptr;
@@ -8247,12 +8306,12 @@ void InterSpec::timeChartDragged( const int sample_start_in, const int sample_en
     action = ActionType::AddSamples;
   else if( modifiers.testFlag(KeyboardModifier::ControlModifier) )
     action = ActionType::RemoveSamples;
-  //else if( modifiers.testFlag(KeyboardModifier::MetaModifier) )//Meta key pressed ("Windows" or "Command" (Mac) key)
-  //  action = ...;
 
-  const auto type = modifiers.testFlag(KeyboardModifier::AltModifier)
-                                 ? SpecUtils::SpectrumType::Background
-                                 : SpecUtils::SpectrumType::Foreground;
+  SpecUtils::SpectrumType type = SpecUtils::SpectrumType::Foreground;
+  if( modifiers.testFlag(KeyboardModifier::AltModifier) )
+    type = SpecUtils::SpectrumType::Background;
+  else if( modifiers.testFlag(KeyboardModifier::MetaModifier) )
+    type = SpecUtils::SpectrumType::SecondForeground;
 
   const int sample_start = std::min( sample_start_in, sample_end_in );
   const int sample_end = std::max( sample_start_in, sample_end_in );
@@ -10658,6 +10717,8 @@ vector<pair<float,int> > InterSpec::passthroughTimeToSampleNumber() const
 
 void InterSpec::setChartSpacing()
 {
+#if( USE_FLEX_CHART_LAYOUT )
+#else
   const int vertSpacing = (m_timeSeries->isHidden() ? 0 : (isMobile() ? 10 : 5));
 
   //Changing the vertical space doesnt seem to reliably trigger in Wt 3.3.4
@@ -10686,7 +10747,7 @@ void InterSpec::setChartSpacing()
     m_chartsLayout->setVerticalSpacing( vertSpacing );
     m_chartsLayout->addWidget( m_spectrum, 0, 0 );
     m_chartsLayout->addWidget( m_timeSeries, 1, 0 );
-    m_chartsLayout->setRowStretch( 0, 3 );
+    m_chartsLayout->setRowStretch( 0, 20 );
     m_chartsLayout->setRowStretch( 1, 2 );
     m_chartsLayout->setRowResizable( 0 );
 
@@ -10726,7 +10787,7 @@ void InterSpec::setChartSpacing()
   {
     m_spectrum->setMargin( 0, Wt::Top );
   }
-  
+#endif
 }//void setChartSpacing()