Skip to content

Commit

Permalink
added new logo + fixed all tooltips
Browse files Browse the repository at this point in the history
  • Loading branch information
cirquit committed Jan 6, 2021
1 parent e02dfdb commit c51c61c
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 29 deletions.
8 changes: 4 additions & 4 deletions trdrop/headers/cpp_interface/framerateoptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ class FramerateOptions
void _init_member()
{
fps_plot_color.setName("Framerate plot color");
fps_plot_color.setTooltip("Color of the framerate graph of this video index in the framerate plot");
fps_plot_color.setTooltip("Color of the framerate and frametime graph of this video index");
fps_plot_color.setColor(_get_random_color());

pixel_difference.setName("Pixel difference");
pixel_difference.setTooltip("Pixel Difference Margin (0 - 255)\n \
pixel_difference.setTooltip("Pixel Difference Margin (0 - 255)\n\
Currently every frame is converted to greyscale and compared on a pixel basis. Greater is more \"forgiving\"\n\
Example: \"5\" - The difference in color may be up to 5 to NOT trigger a new frame");
pixel_difference.setValue(0);
Expand All @@ -86,11 +86,11 @@ class FramerateOptions
displayed_text_fontsize_override = true;

rel_fps_text_x_position.setName("Relative FPS Text X Pos.");
rel_fps_text_x_position.setTooltip("TODO");
rel_fps_text_x_position.setTooltip("");
rel_fps_text_x_position.setValue(0.05);

rel_fps_text_y_position.setName("Relative FPS Text Y Pos.");
rel_fps_text_y_position.setTooltip("TODO");
rel_fps_text_y_position.setTooltip("");
rel_fps_text_y_position.setValue(0.1);
}
//! adds the framerate prefix text defined in the options to the framerate of the designated video
Expand Down
12 changes: 6 additions & 6 deletions trdrop/headers/qml_models/exportoptionsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,25 +199,25 @@ class ExportOptionsModel : public QAbstractListModel
_export_directory.setValue(getDefaultMoviesDirectory().toString());

_export_as_overlay.setName("Export as overlay");
_export_as_overlay.setTooltip("Export the graph only");
_export_as_overlay.setTooltip("Video content replaced by an alpha channel, only showing the graph (.png only)");
_export_as_overlay.setValue(false);

_enable_live_preview.setName("Enable live preview");
_enable_live_preview.setTooltip("Show the rendered frames");
_enable_live_preview.setTooltip("Disabling this will not show the created imagesequence, but will speed up the exporting");
_enable_live_preview.setValue(true);

_export_csv.setName("Export csv");
_export_csv.setTooltip("Export framerate as csv file");
_export_csv.setTooltip("Export framerate/frametime for each video as csv file in the same directory as the images");
_export_csv.setValue(false);

_imagesequence_prefix.setName("Export as imagesequence");
_imagesequence_prefix.setTooltip("Export the analysis as imagesequence");
_imagesequence_prefix.setTooltip("Appends the frame number after the set name (e.g. exportsequence_0000000000)");
_imagesequence_prefix.setValue("exportsequence_");
_imagesequence_prefix.setEnabled(true);
_imagesequence_prefix.setFont(QFont("Helvetica", 15));

_csv_filename.setName("Export as csv"); // not used because a switch already shows that text
_csv_filename.setTooltip("csv filename");
_csv_filename.setName("CSV Filename"); // not used because a switch already shows that text
_csv_filename.setTooltip("");
_csv_filename.setValue("trdrop_analysis.csv");
_csv_filename.setEnabled(false); // by default false, same as the csv export
_csv_filename.setFont(QFont("Helvetica", 15));
Expand Down
2 changes: 1 addition & 1 deletion trdrop/headers/qml_models/generaloptionsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class GeneralOptionsModel : public QAbstractListModel
void _init_options()
{
_enable_fps_analysis.setName("Enable framerate analysis");
_enable_fps_analysis.setTooltip("Renders the framerate plot and framerate text");
_enable_fps_analysis.setTooltip("Renders the framerate plot and the framerate text");
_enable_fps_analysis.setValue(true);

_enable_tear_analysis.setName("Enable tear analysis");
Expand Down
Binary file removed trdrop/images/trdrop_logo_alpha.ico
Binary file not shown.
10 changes: 5 additions & 5 deletions trdrop/qml/ExportWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ import QtQuick 2.12
import QtQml.Models 2.1
import QtQuick.Window 2.12
import QtQuick.Controls.Material 2.12
import QtQuick.Controls 2.5
import QtQuick.Layouts 1.12
import QtQuick.Dialogs 1.2
import QtQuick.Controls 2.15

import "../utils.js" as Utils

Window {
id: exportWindow
title: "Export"
visible: true
width: 740
width: 700
minimumHeight: 410
flags: if (Qt.platform.os == "linux") { return Qt.SubWindow } else { return Qt.Dialog }
Material.theme: Material.Dark
Expand Down Expand Up @@ -145,7 +145,7 @@ Window {
//exportAsCSVSwitchName.enabled = model.exportCSVValue;
}
}
ToolTip.text: "Exports the framerate into a trdrop_analysis.csv into the export directory for each video"
ToolTip.text: model.exportCSVTooltip
ToolTip.delay: 500
ToolTip.visible: hovered
}
Expand Down Expand Up @@ -193,7 +193,7 @@ Window {
model.enableLivePreviewValue = !model.enableLivePreviewValue;
}
}
ToolTip.text: "Enables the live rendering of the resulting video"
ToolTip.text: model.enableLivePreviewTooltip
ToolTip.delay: 500
ToolTip.visible: hovered
}
Expand All @@ -218,7 +218,7 @@ Window {
imagecomposer.updateComposition();
}
}
ToolTip.text: "Exports the graph/text overlay (png only)"
ToolTip.text: model.exportAsOverlayTooltip
ToolTip.delay: 500
ToolTip.visible: hovered

Expand Down
14 changes: 2 additions & 12 deletions trdrop/qml/OptionsWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Window {
title: "Options"
visible: true
width: 900
minimumHeight: 900
minimumHeight: 940
flags: if (Qt.platform.os == "linux") { return Qt.SubWindow } else { return Qt.Dialog }
Material.theme: Material.Dark
Material.accent: Material.DeepPurple
Expand Down Expand Up @@ -360,9 +360,6 @@ Window {
id: colorLabel
text: model.colorName + ":"
Layout.rightMargin: 5
ToolTip.text: model.colorTooltip
ToolTip.delay: 500
ToolTip.visible: hovered
}
Rectangle {
id: fpsColorRectangle
Expand Down Expand Up @@ -523,9 +520,6 @@ Window {
enabled: model.fpsOptionsEnabled
stepSize: 0.01
value: model.fpsTextXPosition
ToolTip.delay: 500
ToolTip.visible: hovered
ToolTip.text: model.fpsTextPositionXTooltip
onMoved: {
if (model.fpsTextXPosition !== value) model.fpsTextXPosition = Utils.round(value, 2);
}
Expand Down Expand Up @@ -560,9 +554,6 @@ Window {
enabled: model.fpsOptionsEnabled
stepSize: 0.01
value: model.fpsTextYPosition
ToolTip.delay: 500
ToolTip.visible: hovered
ToolTip.text: model.fpsTextYPositionTooltip
onMoved: {
if (model.fpsTextYPosition !== value) model.fpsTextYPosition = Utils.round(value, 2);
}
Expand Down Expand Up @@ -628,7 +619,6 @@ Window {
Layout.leftMargin: 50
Layout.rightMargin: 50
Layout.fillWidth: true
ToolTip.text: model.colorTooltip
MouseArea {
anchors.fill: parent
enabled: model.tearOptionsEnabled
Expand Down Expand Up @@ -667,7 +657,7 @@ Window {
onValueChanged: {
if (model.dismissTearPercentage !== value){ model.dismissTearPercentage = value; }
}
ToolTip.text: "Tears that take less than this percentage of the video height count as new frame"
ToolTip.text: "Tears that take less than this percentage of the video height count as new frame\nExample: Video has 30FPS. If 40% of the frame is from the previous frame, but 60% is new, this can lead to 60FPS.\nTo count this as the correct 30 FPS, you need to set the Tear Difference to 50%."
ToolTip.delay: 500
ToolTip.visible: hovered
}
Expand Down
3 changes: 2 additions & 1 deletion trdrop/trdrop.pro
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ unix: LIBS += -L/usr/local/lib \
-lopencv_video

windows: INCLUDEPATH += c:\opencv-4.5.1\build\install\include
windows: LIBS += -Lc:\opencv-4.5.1\build_64\install\x64\mingw\lib \
# windows: LIBS += -Lc:\opencv-4.5.1\build_64\install\x64\mingw\lib \
windows: LIBS += -Lc:\opencv-4.5.1\build\install\x64\mingw\lib \
-lopencv_calib3d451 \
-lopencv_core451 \
-lopencv_dnn451 \
Expand Down

0 comments on commit c51c61c

Please sign in to comment.