Remove 2D tab and rename trigram view to ngram.

wapiflapi · Jan 10, 2017 · d8fc0fd · d8fc0fd
1 parent b06e033
commit d8fc0fd
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 486 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,15 +82,13 @@ qt5_add_resources(VISUALISATION_SHADERS ${SRC_DIR}/visualisation/shaders/shaders
 add_library(veles_visualisation
     ${INCLUDE_DIR}/visualisation/panel.h
     ${INCLUDE_DIR}/visualisation/base.h
-    ${INCLUDE_DIR}/visualisation/digram.h
-    ${INCLUDE_DIR}/visualisation/trigram.h
+    ${INCLUDE_DIR}/visualisation/ngram.h
     ${INCLUDE_DIR}/visualisation/minimap.h
     ${INCLUDE_DIR}/visualisation/minimap_panel.h
     ${INCLUDE_DIR}/visualisation/selectrangedialog.h
     ${SRC_DIR}/visualisation/panel.cc
     ${SRC_DIR}/visualisation/base.cc
-    ${SRC_DIR}/visualisation/digram.cc
-    ${SRC_DIR}/visualisation/trigram.cc
+    ${SRC_DIR}/visualisation/ngram.cc
     ${SRC_DIR}/visualisation/minimap.cc
     ${SRC_DIR}/visualisation/minimap_panel.cc
     ${SRC_DIR}/visualisation/selectrangedialog.cc
@@ -219,13 +217,12 @@ add_executable(main_ui
   set (GENERATED_MOC_FILES
     ${CMAKE_SOURCE_DIR}/moc_base.cpp
     ${CMAKE_SOURCE_DIR}/moc_commands.cpp
-    ${CMAKE_SOURCE_DIR}/moc_digram.cpp
     ${CMAKE_SOURCE_DIR}/moc_veles_mainwindow.cpp
     ${CMAKE_SOURCE_DIR}/moc_hexedittab.cpp
     ${CMAKE_SOURCE_DIR}/moc_optionsdialog.cpp
     ${CMAKE_SOURCE_DIR}/moc_hexedit.cpp
     ${CMAKE_SOURCE_DIR}/moc_searchdialog.cpp
-    ${CMAKE_SOURCE_DIR}/moc_trigram.cpp)
+    ${CMAKE_SOURCE_DIR}/moc_ngram.cpp)
 
 set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_MOC_FILES})
 

diff --git a/include/visualisation/digram.h b/include/visualisation/digram.h
diff --git a/include/visualisation/trigram.h → include/visualisation/ngram.h b/include/visualisation/trigram.h → include/visualisation/ngram.h
@@ -17,7 +17,7 @@
 #ifndef TRIGRAM_H
 #define TRIGRAM_H
 
-#include "visualisation/trigram.h"
+#include "visualisation/ngram.h"
 
 #include <stdint.h>
 
@@ -39,14 +39,14 @@
 namespace veles {
 namespace visualisation {
 
-class TrigramWidget : public VisualisationWidget {
+class NGramWidget : public VisualisationWidget {
   Q_OBJECT
 
  public:
   enum class EVisualisationShape {CUBE, CYLINDER, SPHERE};
 
-  explicit TrigramWidget(QWidget *parent = 0);
-  ~TrigramWidget();
+  explicit NGramWidget(QWidget *parent = 0);
+  ~NGramWidget();
 
   bool prepareOptionsPanel(QBoxLayout *layout) override;
 

diff --git a/include/visualisation/panel.h b/include/visualisation/panel.h
@@ -46,17 +46,16 @@ class VisualisationPanel : public QWidget {
  private slots:
   void setSamplingMethod(const QString &name);
   void setSampleSize(int kilobytes);
-  void showDigramVisualisation();
-  void showTrigramVisualisation();
+  void showNGramVisualisation();
   void minimapSelectionChanged(size_t start, size_t end);
 
  private:
   enum class ESampler {NO_SAMPLER, UNIFORM_SAMPLER};
-  enum class EVisualisation {DIGRAM, EVERYTHING};
+  enum class EVisualisation {NGRAM};
 
   static const std::map<QString, ESampler> k_sampler_map;
   static const ESampler k_default_sampler = ESampler::UNIFORM_SAMPLER;
-  static const EVisualisation k_default_visualisation = EVisualisation::EVERYTHING;
+  static const EVisualisation k_default_visualisation = EVisualisation::NGRAM;
   static const int k_max_sample_size = 128 * 1024;
   static const int k_minimap_sample_size = 4096;
 
@@ -85,8 +84,6 @@ class VisualisationPanel : public QWidget {
   QBoxLayout *layout_, *options_layout_;
   QSplitter *splitter_;
   QWidget *child_options_wrapper_;
-  QAction *digram_action_, *trigram_action_, *layered_digram_action_;
-  QToolBar *visualisation_toolbar_;
   QLabel *selection_label_;
 };
 

diff --git a/src/ui/hexedittab.cc b/src/ui/hexedittab.cc
@@ -277,6 +277,7 @@ void HexEditTab::showVisualisation() {
   panel->setWindowTitle(curFilePath);
   panel->setAttribute(Qt::WA_DeleteOnClose);
 
+  qDebug() << "showing.";
   mainWindow->addTab(panel, dataModel->path().join(" : ") + " - Visualisation");
 }
 

diff --git a/src/ui/main.cc b/src/ui/main.cc
@@ -19,8 +19,7 @@
 #include <QTranslator>
 
 #include "ui/veles_mainwindow.h"
-#include "visualisation/digram.h"
-#include "visualisation/trigram.h"
+#include "visualisation/ngram.h"
 #include "util/settings/theme.h"
 #include "util/settings/shortcutmanager.h"
 

diff --git a/src/ui/veles_mainwindow.cc b/src/ui/veles_mainwindow.cc
@@ -617,6 +617,7 @@ void VelesMainWindow::createHexEditTab(QString fileName,
       new FileBlobModel(fileBlob, {QFileInfo(fileName).fileName()});
   HexEditTab *hex = new HexEditTab(this, dataModel);
   addTab(hex, dataModel->path().join(" : ") + " - Hex");
+  QTimer::singleShot(0, hex, SLOT(showVisualisation()));
 }
 
 }  // namespace ui