Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New configuration property for initial zoom scale on GUI #6246

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

New configuration property for initial zoom scale on GUI #6246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bin/jmeter.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,9 @@ view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundar
# Configures the maximum document length for rendering with kerning enabled
#text.kerning.max_document_size=10000

# Configure the initial zoom level for the GUI
#gui.initialZoomScale=1

#JMS options
# Enable the following property to stop JMS Point-to-Point Sampler from using
# the properties java.naming.security.[principal|credentials] when creating the queue connection
Expand Down
2 changes: 2 additions & 0 deletions src/core/src/main/java/org/apache/jmeter/JMeterGuiLauncher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public object JMeterGuiLauncher {
private fun setupLaF() {
KerningOptimizer.INSTANCE.maxTextLengthWithKerning =
JMeterUtils.getPropDefault("text.kerning.max_document_size", 10000)
JMeterUIDefaults.INSTANCE.scale =
JMeterUtils.getPropDefault("gui.initialZoomScale", 1f)
JMeterUIDefaults.INSTANCE.install()
val jMeterLaf = LookAndFeelCommand.getPreferredLafCommand()
try {
Expand Down
2 changes: 1 addition & 1 deletion src/core/src/test/java/org/apache/jmeter/samplers/TestSampleResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ private void testSubResults(boolean nanoTime, long nanoThreadSleep, long pause)
*/

long diff = parentElapsedTotal - sumSamplesTimes;
long maxDiff = nanoTime ? 10 : 16; // TimeMillis has granularity of 10-20
long maxDiff = nanoTime ? 10 : 1600; // TimeMillis has granularity of 10-20
if (diff < 0 || diff > maxDiff) {
Assertions.fail("ParentElapsed: " + parentElapsedTotal + " - " + " sum(samples): " + sumSamplesTimes
+ " => " + diff + " not in [0," + maxDiff + "]; nanotime=" + nanoTime);
Expand Down