mirror of
https://github.com/eried/portapack-mayhem.git
synced 2024-10-01 01:26:06 -04:00
Added new icon for IQ Trim, and IQ Trim Button in FileMan (#1476)
* Add files via upload * Added trim icon * Added trim icon * Added Trim button to FileMan * Added Trim button to FileMan * Added Trim button to FileMan * Added Trim button to FileMan
This commit is contained in:
parent
defb934c3f
commit
ad987f2b5e
@ -30,6 +30,7 @@
|
|||||||
#include "ui_remote.hpp"
|
#include "ui_remote.hpp"
|
||||||
#include "ui_ss_viewer.hpp"
|
#include "ui_ss_viewer.hpp"
|
||||||
#include "ui_text_editor.hpp"
|
#include "ui_text_editor.hpp"
|
||||||
|
#include "ui_iq_trim.hpp"
|
||||||
#include "string_format.hpp"
|
#include "string_format.hpp"
|
||||||
#include "portapack.hpp"
|
#include "portapack.hpp"
|
||||||
#include "event_m0.hpp"
|
#include "event_m0.hpp"
|
||||||
@ -566,6 +567,7 @@ FileManagerView::FileManagerView(
|
|||||||
&button_new_file,
|
&button_new_file,
|
||||||
&button_open_notepad,
|
&button_open_notepad,
|
||||||
&button_rename_timestamp,
|
&button_rename_timestamp,
|
||||||
|
&button_open_iq_trim,
|
||||||
});
|
});
|
||||||
|
|
||||||
menu_view.on_highlight = [this]() {
|
menu_view.on_highlight = [this]() {
|
||||||
@ -648,6 +650,14 @@ FileManagerView::FileManagerView(
|
|||||||
} else
|
} else
|
||||||
nav_.display_modal("Timestamp Rename", "Can't rename that.");
|
nav_.display_modal("Timestamp Rename", "Can't rename that.");
|
||||||
};
|
};
|
||||||
|
|
||||||
|
button_open_iq_trim.on_select = [this]() {
|
||||||
|
auto path = get_selected_full_path();
|
||||||
|
if (selected_is_valid() && !get_selected_entry().is_directory && is_cxx_capture_file(path)) {
|
||||||
|
nav_.push<IQTrimView>(path);
|
||||||
|
} else
|
||||||
|
nav_.display_modal("IQ Trim", "Not a capture file.");
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace ui
|
} // namespace ui
|
||||||
|
@ -272,6 +272,12 @@ class FileManagerView : public FileManBaseView {
|
|||||||
&bitmap_icon_options_datetime,
|
&bitmap_icon_options_datetime,
|
||||||
Color::orange(),
|
Color::orange(),
|
||||||
/*vcenter*/ true};
|
/*vcenter*/ true};
|
||||||
|
|
||||||
|
NewButton button_open_iq_trim{
|
||||||
|
{9 * 8, 34 * 8, 4 * 8, 32},
|
||||||
|
{},
|
||||||
|
&bitmap_icon_trim,
|
||||||
|
Color::orange()};
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace ui */
|
} /* namespace ui */
|
||||||
|
@ -47,10 +47,7 @@ IQTrimView::IQTrimView(NavigationView& nav)
|
|||||||
auto open_view = nav_.push<FileLoadView>(".C*");
|
auto open_view = nav_.push<FileLoadView>(".C*");
|
||||||
open_view->push_dir(u"CAPTURES");
|
open_view->push_dir(u"CAPTURES");
|
||||||
open_view->on_changed = [this](fs::path path) {
|
open_view->on_changed = [this](fs::path path) {
|
||||||
path_ = std::move(path);
|
open_file(path);
|
||||||
profile_capture();
|
|
||||||
compute_range();
|
|
||||||
refresh_ui();
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -84,6 +81,18 @@ IQTrimView::IQTrimView(NavigationView& nav)
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
IQTrimView::IQTrimView(NavigationView& nav, const fs::path& path)
|
||||||
|
: IQTrimView(nav) {
|
||||||
|
open_file(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
void IQTrimView::open_file(const std::filesystem::path& path) {
|
||||||
|
path_ = std::move(path);
|
||||||
|
profile_capture();
|
||||||
|
compute_range();
|
||||||
|
refresh_ui();
|
||||||
|
}
|
||||||
|
|
||||||
void IQTrimView::paint(Painter& painter) {
|
void IQTrimView::paint(Painter& painter) {
|
||||||
if (info_) {
|
if (info_) {
|
||||||
uint32_t power_cutoff = field_cutoff.value() * static_cast<uint64_t>(info_->max_power) / 100;
|
uint32_t power_cutoff = field_cutoff.value() * static_cast<uint64_t>(info_->max_power) / 100;
|
||||||
|
@ -68,12 +68,15 @@ class TrimProgressUI {
|
|||||||
class IQTrimView : public View {
|
class IQTrimView : public View {
|
||||||
public:
|
public:
|
||||||
IQTrimView(NavigationView& nav);
|
IQTrimView(NavigationView& nav);
|
||||||
|
IQTrimView(NavigationView& nav, const std::filesystem::path& path);
|
||||||
|
|
||||||
std::string title() const override { return "IQ Trim"; }
|
std::string title() const override { return "IQ Trim"; }
|
||||||
void paint(Painter& painter) override;
|
void paint(Painter& painter) override;
|
||||||
void focus() override;
|
void focus() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void open_file(const std::filesystem::path& path);
|
||||||
|
|
||||||
/* Update controls with latest values. */
|
/* Update controls with latest values. */
|
||||||
void refresh_ui();
|
void refresh_ui();
|
||||||
|
|
||||||
|
@ -5645,6 +5645,44 @@ static constexpr Bitmap bitmap_icon_shift{
|
|||||||
{16, 16},
|
{16, 16},
|
||||||
bitmap_icon_shift_data};
|
bitmap_icon_shift_data};
|
||||||
|
|
||||||
|
static constexpr uint8_t bitmap_icon_trim_data[] = {
|
||||||
|
0x10,
|
||||||
|
0x10,
|
||||||
|
0x30,
|
||||||
|
0x12,
|
||||||
|
0x50,
|
||||||
|
0x15,
|
||||||
|
0x50,
|
||||||
|
0x15,
|
||||||
|
0x50,
|
||||||
|
0x15,
|
||||||
|
0x52,
|
||||||
|
0x95,
|
||||||
|
0x56,
|
||||||
|
0xD5,
|
||||||
|
0x5F,
|
||||||
|
0xF5,
|
||||||
|
0x56,
|
||||||
|
0xD5,
|
||||||
|
0x52,
|
||||||
|
0x95,
|
||||||
|
0x50,
|
||||||
|
0x15,
|
||||||
|
0x50,
|
||||||
|
0x15,
|
||||||
|
0x50,
|
||||||
|
0x15,
|
||||||
|
0x90,
|
||||||
|
0x18,
|
||||||
|
0x10,
|
||||||
|
0x10,
|
||||||
|
0x00,
|
||||||
|
0x00,
|
||||||
|
};
|
||||||
|
static constexpr Bitmap bitmap_icon_trim{
|
||||||
|
{16, 16},
|
||||||
|
bitmap_icon_trim_data};
|
||||||
|
|
||||||
} /* namespace ui */
|
} /* namespace ui */
|
||||||
|
|
||||||
#endif /*__BITMAP_HPP__*/
|
#endif /*__BITMAP_HPP__*/
|
||||||
|
@ -560,7 +560,7 @@ UtilitiesMenuView::UtilitiesMenuView(NavigationView& nav) {
|
|||||||
{"File Manager", Color::green(), &bitmap_icon_dir, [&nav]() { nav.push<FileManagerView>(); }},
|
{"File Manager", Color::green(), &bitmap_icon_dir, [&nav]() { nav.push<FileManagerView>(); }},
|
||||||
{"Freq. Manager", Color::green(), &bitmap_icon_freqman, [&nav]() { nav.push<FrequencyManagerView>(); }},
|
{"Freq. Manager", Color::green(), &bitmap_icon_freqman, [&nav]() { nav.push<FrequencyManagerView>(); }},
|
||||||
{"Notepad", Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<TextEditorView>(); }},
|
{"Notepad", Color::dark_cyan(), &bitmap_icon_notepad, [&nav]() { nav.push<TextEditorView>(); }},
|
||||||
{"IQ Trim", Color::orange(), &bitmap_icon_cut, [&nav]() { nav.push<IQTrimView>(); }},
|
{"IQ Trim", Color::orange(), &bitmap_icon_trim, [&nav]() { nav.push<IQTrimView>(); }},
|
||||||
{"SD Over USB", Color::yellow(), &bitmap_icon_hackrf, [&nav]() { nav.push<SdOverUsbView>(); }},
|
{"SD Over USB", Color::yellow(), &bitmap_icon_hackrf, [&nav]() { nav.push<SdOverUsbView>(); }},
|
||||||
{"Signal Gen", Color::green(), &bitmap_icon_cwgen, [&nav]() { nav.push<SigGenView>(); }},
|
{"Signal Gen", Color::green(), &bitmap_icon_cwgen, [&nav]() { nav.push<SigGenView>(); }},
|
||||||
// {"Test App", Color::dark_grey(), nullptr, [&nav](){ nav.push<TestView>(); }},
|
// {"Test App", Color::dark_grey(), nullptr, [&nav](){ nav.push<TestView>(); }},
|
||||||
|
BIN
firmware/graphics/icon_trim.png
Normal file
BIN
firmware/graphics/icon_trim.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 187 B |
Loading…
Reference in New Issue
Block a user