mirror of
https://github.com/riegera2412/UVtools.git
synced 2026-07-08 17:42:31 +02:00
Shift + click on roi button to clear it out
This commit is contained in:
Tiago Conceição
+2
-2
@@ -2,8 +2,8 @@
|
||||
|
||||
## /09/2020 - v0.8.1.1
|
||||
|
||||
* (Add) Layer status bar: Button with ROI - Click to zoom in region
|
||||
* (Add) Setting: Allow the layer overlay tooltips for select issues, ROI, and edit pixel mode to be hidden.
|
||||
* (Add) Layer status bar: Button with ROI - Click to zoom in region | Click + shift to clear roi
|
||||
* (Add) Setting: Allow the layer overlay tooltips for select issues, ROI, and edit pixel mode to be hidden (#51)
|
||||
* (Change) Layer status bar: Bounds text to button - Click to zoom in region
|
||||
* (Change) Layer status bar: Pixel picker text to button - Click to center in point
|
||||
* (Change) Layer status bar: Resolution text to button - Click to zoom to fit
|
||||
|
||||
Generated
+17
-17
@@ -249,7 +249,6 @@ namespace UVtools.GUI
|
||||
this.panelLayerNavigation = new System.Windows.Forms.Panel();
|
||||
this.pbTrackerIssues = new System.Windows.Forms.PictureBox();
|
||||
this.lbActualLayer = new System.Windows.Forms.Label();
|
||||
this.tbLayer = new UVtools.GUI.Controls.TrackBarEx();
|
||||
this.lbInitialLayer = new System.Windows.Forms.Label();
|
||||
this.panel2 = new System.Windows.Forms.Panel();
|
||||
this.btnFindLayer = new System.Windows.Forms.Button();
|
||||
@@ -260,6 +259,7 @@ namespace UVtools.GUI
|
||||
this.toolTipInformation = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.layerScrollTimer = new System.Windows.Forms.Timer(this.components);
|
||||
this.mouseHoldTimer = new System.Windows.Forms.Timer(this.components);
|
||||
this.tbLayer = new UVtools.GUI.Controls.TrackBarEx();
|
||||
this.menu.SuspendLayout();
|
||||
this.mainTable.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scCenter)).BeginInit();
|
||||
@@ -318,8 +318,8 @@ namespace UVtools.GUI
|
||||
this.tlRight.SuspendLayout();
|
||||
this.panelLayerNavigation.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbTrackerIssues)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tbLayer)).BeginInit();
|
||||
this.panel2.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tbLayer)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// menu
|
||||
@@ -893,7 +893,7 @@ namespace UVtools.GUI
|
||||
this.btnLayerResolution.Name = "btnLayerResolution";
|
||||
this.btnLayerResolution.Size = new System.Drawing.Size(86, 22);
|
||||
this.btnLayerResolution.Text = "Resolution:";
|
||||
this.btnLayerResolution.ToolTipText = "Layer Resolution";
|
||||
this.btnLayerResolution.ToolTipText = "Layer Resolution\r\nClick: Zoom to fit";
|
||||
this.btnLayerResolution.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// toolStripSeparator11
|
||||
@@ -984,7 +984,7 @@ namespace UVtools.GUI
|
||||
this.btnLayerROI.Size = new System.Drawing.Size(67, 22);
|
||||
this.btnLayerROI.Text = "ROI: NS";
|
||||
this.btnLayerROI.ToolTipText = "Region of interest selection over layer. (NS): Not selected\r\nClick: go to region" +
|
||||
"";
|
||||
" | SHIFT + click: Clear ROI";
|
||||
this.btnLayerROI.Click += new System.EventHandler(this.EventClick);
|
||||
//
|
||||
// btnLayerMouseLocation
|
||||
@@ -2766,18 +2766,6 @@ namespace UVtools.GUI
|
||||
this.lbActualLayer.TabIndex = 9;
|
||||
this.lbActualLayer.Text = "?";
|
||||
//
|
||||
// tbLayer
|
||||
//
|
||||
this.tbLayer.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.tbLayer.Location = new System.Drawing.Point(93, 0);
|
||||
this.tbLayer.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.tbLayer.Name = "tbLayer";
|
||||
this.tbLayer.Orientation = System.Windows.Forms.Orientation.Vertical;
|
||||
this.tbLayer.Size = new System.Drawing.Size(45, 557);
|
||||
this.tbLayer.TabIndex = 8;
|
||||
this.tbLayer.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.tbLayer.ValueChanged += new System.EventHandler(this.ValueChanged);
|
||||
//
|
||||
// lbInitialLayer
|
||||
//
|
||||
this.lbInitialLayer.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
@@ -2868,6 +2856,18 @@ namespace UVtools.GUI
|
||||
this.mouseHoldTimer.Interval = 1000;
|
||||
this.mouseHoldTimer.Tick += new System.EventHandler(this.EventTimerTick);
|
||||
//
|
||||
// tbLayer
|
||||
//
|
||||
this.tbLayer.Dock = System.Windows.Forms.DockStyle.Right;
|
||||
this.tbLayer.Location = new System.Drawing.Point(93, 0);
|
||||
this.tbLayer.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.tbLayer.Name = "tbLayer";
|
||||
this.tbLayer.Orientation = System.Windows.Forms.Orientation.Vertical;
|
||||
this.tbLayer.Size = new System.Drawing.Size(45, 557);
|
||||
this.tbLayer.TabIndex = 8;
|
||||
this.tbLayer.TickStyle = System.Windows.Forms.TickStyle.TopLeft;
|
||||
this.tbLayer.ValueChanged += new System.EventHandler(this.ValueChanged);
|
||||
//
|
||||
// FrmMain
|
||||
//
|
||||
this.AllowDrop = true;
|
||||
@@ -2974,8 +2974,8 @@ namespace UVtools.GUI
|
||||
this.panelLayerNavigation.ResumeLayout(false);
|
||||
this.panelLayerNavigation.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pbTrackerIssues)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.tbLayer)).EndInit();
|
||||
this.panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.tbLayer)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
||||
@@ -1465,6 +1465,12 @@ namespace UVtools.GUI
|
||||
var roi = pbLayer.SelectionRegion;
|
||||
if (roi.IsEmpty) return;
|
||||
|
||||
if ((ModifierKeys & Keys.Shift) != 0)
|
||||
{
|
||||
pbLayer.SelectNone();
|
||||
return;
|
||||
}
|
||||
|
||||
CenterLayerAt(roi, 0, true);
|
||||
return;
|
||||
}
|
||||
|
||||
+23
-41
@@ -129,6 +129,12 @@
|
||||
<metadata name="tsLayerInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1773, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsThumbnails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>297, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsProperties.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>695, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsGCode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1040, 17</value>
|
||||
</metadata>
|
||||
@@ -144,6 +150,22 @@
|
||||
<metadata name="tsLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1587, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="btnLogVerbose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
|
||||
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
|
||||
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
|
||||
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
|
||||
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
|
||||
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
|
||||
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
|
||||
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
|
||||
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
|
||||
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="imageList16x16.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>811, 17</value>
|
||||
</metadata>
|
||||
@@ -152,7 +174,7 @@
|
||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk
|
||||
FAAAAk1TRnQBSQFMAgEBBgEAAZABCwGQAQsBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
FAAAAk1TRnQBSQFMAgEBBgEAAaABCwGgAQsBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
|
||||
AwABIAMAAQEBAAEgBgABIC4AAxgBIgMwAUsDMAFMAzIBUDMAAQEDJAE2AysBQqwAAyIBMQNWAbkDXQHi
|
||||
AwAB/wMAAf8BKgEtASgB/gNTAawDTQGVAwABARgAAwkBDAMzAVIDUAGdA1cB6AMAAf4DKwH8Ay8BSqQA
|
||||
AyEBMANZAewBKwEuASkB+gNRAfcDUgH0A1MB8QNIAfYDQQH5AwAB/wNPAZsDAAEBCAADFQEdAz8BbgNV
|
||||
@@ -240,43 +262,6 @@
|
||||
AQMBAAEBAYABgwHBAQ4BMAEDAcACAAGAAUEBhgEhAQMBwAEBAYABiAERAcIBAwIAAQEBgAGBAREB5gEH
|
||||
AgABgAEBAYEBMQH/AR8BwAEDAcABAwGBAfEB/wEfAcABAwHgAQcBgAEBAf8BHwHAAQMB8AEPAYABAQL/
|
||||
AfwBPws=
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="tsThumbnails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>297, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsProperties.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>695, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsGCode.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1040, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsIssuesLv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1668, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsIssues.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>947, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsPixelEditorHistory.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1430, 17</value>
|
||||
</metadata>
|
||||
<metadata name="tsLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1587, 17</value>
|
||||
</metadata>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="btnLogVerbose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
|
||||
YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
|
||||
0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
|
||||
bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
|
||||
VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
|
||||
c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
|
||||
Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
|
||||
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
|
||||
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
|
||||
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<metadata name="toolTipInformation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
@@ -288,9 +273,6 @@
|
||||
<metadata name="issueScrollTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>158, 17</value>
|
||||
</metadata>
|
||||
<metadata name="toolTipInformation.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1138, 17</value>
|
||||
</metadata>
|
||||
<metadata name="layerScrollTimer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>1292, 17</value>
|
||||
</metadata>
|
||||
|
||||
Reference in New Issue
Block a user