[gst-debugger/refactor-v1.0] refactor: remove filter function
- From: Marcin Kolny <mkolny src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gst-debugger/refactor-v1.0] refactor: remove filter function
- Date: Sat, 3 Oct 2015 23:46:32 +0000 (UTC)
commit cf35650722dacd1ea6ba428cd46aafcb49e16a13
Author: Marcin Kolny <marcin kolny gmail com>
Date: Sun Oct 4 00:36:45 2015 +0200
refactor: remove filter function
It's going to be restored in the furter release
src/gst-debugger/modules/base_main_module.cpp | 16 ---------
src/gst-debugger/modules/base_main_module.h | 2 -
src/gst-debugger/modules/log_module.cpp | 42 -------------------------
src/gst-debugger/modules/log_module.h | 3 --
src/gst-debugger/modules/main_module.cpp | 5 ---
src/gst-debugger/modules/main_module.h | 1 -
src/gst-debugger/ui/gst-debugger.glade | 12 -------
7 files changed, 0 insertions(+), 81 deletions(-)
---
diff --git a/src/gst-debugger/modules/base_main_module.cpp b/src/gst-debugger/modules/base_main_module.cpp
index 123d7e2..537db30 100644
--- a/src/gst-debugger/modules/base_main_module.cpp
+++ b/src/gst-debugger/modules/base_main_module.cpp
@@ -48,22 +48,6 @@ void BaseMainModule::load_details(Gtk::TreeView *view, const Gtk::TreeModel::Pat
load_details((*iter)[columns.data]);
}
-void BaseMainModule::update_filter_expression(const std::string &expr)
-{
-/* Parser p;
- auto prev = filter_expression;
- try
- {
- filter_expression = std::make_shared<Expression>(p.parse(expr));
- }
- catch (...) { filter_expression = std::shared_ptr<Expression>(); }
-
- if (prev != filter_expression)
- {
- filter->refilter();
- }*/
-}
-
void BaseMainModule::configure_details_view(Gtk::TreeView *view)
{
view->remove_all_columns();
diff --git a/src/gst-debugger/modules/base_main_module.h b/src/gst-debugger/modules/base_main_module.h
index c7432a6..97de4ca 100644
--- a/src/gst-debugger/modules/base_main_module.h
+++ b/src/gst-debugger/modules/base_main_module.h
@@ -64,8 +64,6 @@ public:
static void configure_details_view(Gtk::TreeView *view);
- void update_filter_expression(const std::string &expr);
-
Glib::RefPtr<Gtk::ListStore> get_model() const { return model; }
void set_controller(const std::shared_ptr<Controller> &controller) override;
diff --git a/src/gst-debugger/modules/log_module.cpp b/src/gst-debugger/modules/log_module.cpp
index b6cab95..6b183d9 100644
--- a/src/gst-debugger/modules/log_module.cpp
+++ b/src/gst-debugger/modules/log_module.cpp
@@ -33,48 +33,6 @@ void LogModule::data_received(const Gtk::TreeModel::Row& row, GstDebugger::GStre
row[columns.data] = new GstDebugger::LogInfo(data->log_info());
}
-bool LogModule::filter_function(const Gtk::TreeModel::const_iterator& it)
-{
-/* if (!filter_expression)
- return true;
-
- auto log = it->get_value(columns.log);
-
- if (log == nullptr)
- return true;
-
- std::shared_ptr<TokenIdentifier> ident;
- std::shared_ptr<TokenBase> value;
-
- if (filter_expression->left->get_type() == TokenType::IDENTIFIER)
- {
- ident = std::static_pointer_cast<TokenIdentifier>(filter_expression->left);
- value = filter_expression->right;
- }
- else
- {
- ident = std::static_pointer_cast<TokenIdentifier>(filter_expression->right);
- value = filter_expression->left;
- }
-
-#define MAKE_FIELD_FILTER(FIELD, GETTER, TOKEN_CLASS) \
- do { \
- if (ident->get_value() == FIELD) \
- return filter_expression->op->get_value() == OpType::EQ ? (log->GETTER() ==
std::static_pointer_cast<TOKEN_CLASS>(value)->get_value()) : \
- (log->GETTER() !=
std::static_pointer_cast<TOKEN_CLASS>(value)->get_value()); \
- } while (false);
-
- MAKE_FIELD_FILTER("line", line, TokenNumber);
- MAKE_FIELD_FILTER("level", level, TokenNumber);
- MAKE_FIELD_FILTER("category", category_name, TokenString);
- MAKE_FIELD_FILTER("file", file, TokenString);
- MAKE_FIELD_FILTER("function", function, TokenString);
- MAKE_FIELD_FILTER("object_path", object_path, TokenString);
- MAKE_FIELD_FILTER("message", message, TokenString);
-*/
- return true;
-}
-
LogControlModule::LogControlModule()
: ControlModule()
{
diff --git a/src/gst-debugger/modules/log_module.h b/src/gst-debugger/modules/log_module.h
index 7c39163..191e8e9 100644
--- a/src/gst-debugger/modules/log_module.h
+++ b/src/gst-debugger/modules/log_module.h
@@ -16,9 +16,6 @@ class LogModule : public BaseMainModule
void data_received(const Gtk::TreeModel::Row& row, GstDebugger::GStreamerData *data) override;
void load_details(gpointer data) override;
-protected:
- bool filter_function(const Gtk::TreeModel::const_iterator& it) override;
-
public:
LogModule();
virtual ~LogModule() {}
diff --git a/src/gst-debugger/modules/main_module.cpp b/src/gst-debugger/modules/main_module.cpp
index b105a7b..c39c082 100644
--- a/src/gst-debugger/modules/main_module.cpp
+++ b/src/gst-debugger/modules/main_module.cpp
@@ -28,11 +28,6 @@ MainModule::MainModule(const Glib::RefPtr<Gtk::Builder> &builder)
builder->get_widget("controllerFrame", controller_frame);
- builder->get_widget("dataFilterEntry", data_filter_entry);
- data_filter_entry->signal_activate().connect([this]{
- current_module->update_filter_expression(data_filter_entry->get_text());
- });
-
load_submodules(builder);
}
diff --git a/src/gst-debugger/modules/main_module.h b/src/gst-debugger/modules/main_module.h
index 1c0a2c6..eb70c79 100644
--- a/src/gst-debugger/modules/main_module.h
+++ b/src/gst-debugger/modules/main_module.h
@@ -27,7 +27,6 @@ class MainModule : public IBaseView
Gtk::TreeView *list_tree_view;
Gtk::TreeView *details_tree_view;
Gtk::Frame *controller_frame;
- Gtk::Entry *data_filter_entry;
TypesModelColumns types_columns;
diff --git a/src/gst-debugger/ui/gst-debugger.glade b/src/gst-debugger/ui/gst-debugger.glade
index 8576dc5..aad0bd8 100644
--- a/src/gst-debugger/ui/gst-debugger.glade
+++ b/src/gst-debugger/ui/gst-debugger.glade
@@ -233,18 +233,6 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkEntry" id="dataFilterEntry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="placeholder_text" translatable="yes">Data filter</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkPaned" id="paned7">
<property name="visible">True</property>
<property name="can_focus">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]