HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1365:19075a214d07

Refac + clang-format...

jeandet -

r1365:19075a214d07

parent child

Context file:

r1365:19075a214d07

.clang-format +4 -4

              # See http://clang.llvm.org/docs/ClangFormatStyleOptions.html for a definition
              # of the options
              Language: Cpp
-             BasedOnStyle:  LLVM
+             BasedOnStyle:  WebKit
              # Line length
              ColumnLimit: 100
              AccessModifierOffset: -4 # -IndentWidth
              ConstructorInitializerIndentWidth: 8 # 2 * IndentWidth
-             # Break only before function braces
-             BreakBeforeBraces: Stroustrup
+             BreakBeforeBraces: Allman
              AllowShortFunctionsOnASingleLine: Inline
              AlwaysBreakTemplateDeclarations: true
              ConstructorInitializerAllOnOneLineOrOnePerLine: true
              IndentCaseLabels: true
              MaxEmptyLinesToKeep: 2
-             Standard: Cpp03
+             Standard: Cpp11
+             UseTab: Never

CMakeLists.txt +1 -1

              if(NOT CMAKE_BUILD_TYPE)
                set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
              endif()
-             set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
+             set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g3")
              find_package(Qt5 COMPONENTS Core Widgets Network PrintSupport Svg Test REQUIRED)

gui/src/Visualization/VisualizationGraphWidget.cpp +67 -34

                      }
                  }
-                 void startDrawingZone(const QPoint &pos, VisualizationGraphWidget *graph)
+                 void selectZone(const QPoint &pos)
                  {
-                     endDrawingZone(graph);
+                     auto zoneAtPos = selectionZoneAt(pos);
+                     setSelectionZonesEditionEnabled(sqpApp->plotsInteractionMode() == SqpApplication::PlotsInteractionMode::SelectionZones);
+                 }
+                 void startDrawingZone(const QPoint &pos)
+                 {
+                     endDrawingZone();
                      auto axisPos = posToAxisPos(pos);
                      m_DrawingZone->setEditionEnabled(false);
                  }
-                 void endDrawingZone(VisualizationGraphWidget *graph)
+                 void endDrawingZone()
                  {
                      if (m_DrawingZone) {
                          auto drawingZoneRange = m_DrawingZone->range();
                              addSelectionZone(m_DrawingZone);
                          }
                          else {
-                             graph->plot().removeItem(m_DrawingZone); // the item is deleted by QCustomPlot
+                             m_plot->removeItem(m_DrawingZone);
                          }
-                         graph->plot().replot(QCustomPlot::rpQueuedReplot);
+                         m_plot->replot(QCustomPlot::rpQueuedReplot);
                          m_DrawingZone = nullptr;
                      }
                  }
+                 void moveSelectionZone(const QPoint& destination)
+                 {
+                     /*
+                      * I give up on this for now
+                      * @TODO implement this, the difficulty is that selection zones have their own
+                      * event handling code which seems to rely on QCP GUI event handling propagation
+                      * which was a realy bad design choice.
+                     */
+                 }
                  void setSelectionZonesEditionEnabled(bool value)
                  {
                      for (auto s : m_SelectionZones) {
                  }
                  else if (event->buttons() == Qt::LeftButton)
                  {
-                     impl->moveGraph(event->pos());
+                     switch (sqpApp->plotsInteractionMode())
+                     {
+                         case SqpApplication::PlotsInteractionMode::None:
+                             impl->moveGraph(event->pos());
+                             break;
+                         case SqpApplication::PlotsInteractionMode::SelectionZones:
+                             break;
+                         default:
+                             break;
+                     }
                  }
                  else
                  {
                      impl->m_RenderingDelegate->updateTooltip(event);
                  }
-                 event->accept();
                  QWidget::mouseMoveEvent(event);
              }
                  }
                  else if(impl->isDrawingZoneRect())
                  {
-                     impl->endDrawingZone(this);
+                     impl->endDrawingZone();
                  }
                  else
                  {
              void VisualizationGraphWidget::mousePressEvent(QMouseEvent *event)
              {
-                 if (event->button() == Qt::LeftButton) {
-                     if (event->modifiers() == Qt::ControlModifier) {
+                     }
-                     else if (event->modifiers() == Qt::AltModifier) {
+                     }
-                     else
+                 if (event->button()==Qt::RightButton)
+                 {
+                     onGraphMenuRequested(event->pos());
+                 }
+                 else
+                 {
+                     auto selectedZone = impl->selectionZoneAt(event->pos());
+                     switch (sqpApp->plotsInteractionMode())
                      {
-                         switch (sqpApp->plotsInteractionMode())
+                     case SqpApplication::PlotsInteractionMode::DragAndDrop :
+                         break;
+                     case SqpApplication::PlotsInteractionMode::SelectionZones :
+                         impl->setSelectionZonesEditionEnabled(true);
+                         if ((event->modifiers() == Qt::ControlModifier) && (selectedZone != nullptr))
                          {
-                         case SqpApplication::PlotsInteractionMode::DragAndDrop :
-                             break;
-                         case SqpApplication::PlotsInteractionMode::SelectionZones :
-                             if (!impl->selectionZoneAt(event->pos())) {
-                                 impl->startDrawingZone(event->pos(), this);
+                                 selectedZone->setAssociatedEditedZones(parentVisualizationWidget()->selectionZoneManager().selectedItems());
+                         }
+                         else
+                         {
+                             if (!selectedZone)
+                             {
+                                 parentVisualizationWidget()->selectionZoneManager().clearSelection();
+                                 impl->startDrawingZone(event->pos());
+                             }
+                             else
+                             {
+                                 parentVisualizationWidget()->selectionZoneManager().select({ selectedZone });
                              }
-                             break;
-                         case SqpApplication::PlotsInteractionMode::ZoomBox :
-                             impl->startDrawingRect(event->pos());
-                             break;
-                         default:
-                             setCursor(Qt::ClosedHandCursor);
-                             impl->updateMousePosition(event->pos());
                          }
+                         break;
+                     case SqpApplication::PlotsInteractionMode::ZoomBox :
+                         impl->startDrawingRect(event->pos());
+                         break;
+                     default:
+                         setCursor(Qt::ClosedHandCursor);
+                         impl->updateMousePosition(event->pos());
                      }
                  }
-                 else if (event->button()==Qt::RightButton)
+                 {
-                     onGraphMenuRequested(event->pos());
+                 }
                  QWidget::mousePressEvent(event);
              }
                          // Starts a new selection zone
                          auto zoneAtPos = impl->selectionZoneAt(event->pos());
                          if (!zoneAtPos) {
-                             impl->startDrawingZone(event->pos(), this);
+                             impl->startDrawingZone(event->pos());
                          }
                      }
                  }
                      }
                  }
-                 impl->endDrawingZone(this);
+                 impl->endDrawingZone();
                  // Selection / Deselection
                  auto isSelectionZoneMode

gui/tests/simple_graph/main.cpp 0 -1

                  while (!isReady(var))\
                  QCoreApplication::processEvents();\
                  w.addVariable(var, range);\
-                 GET_CHILD_WIDGET_FOR_GUI_TESTS(w, plot, QCustomPlot, "widget");\
                  auto cent = center(&w);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages