Skip to content

Palette cli #344

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

Open
justinlaughlin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Palette cli #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
658d5d0
Add option to specify palette via CLI
justinlaughlin Jun 3, 2025
4918367
style
justinlaughlin Jun 3, 2025
7528254
Rename arg
justinlaughlin Jun 3, 2025
1bbbe19
Fix logic error
justinlaughlin Jun 4, 2025
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
16 changes: 12 additions & 4 deletions glvis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ bool GLVisInitVis(StreamCollection input_streams)
vs->Zoom(1.8);
// Use the 'bone' palette when visualizing a 2D mesh only (otherwise
// the 'jet-like' palette is used in 2D, see vssolution.cpp).
vs->palette.SetIndex(4);
vs->palette.SetFallbackIndex(4);
}
}
else if (stream_state.mesh->SpaceDimension() == 3)
Expand All @@ -186,13 +186,13 @@ bool GLVisInitVis(StreamCollection input_streams)
if (stream_state.mesh->Dimension() == 3)
{
// Use the 'white' palette when visualizing a 3D volume mesh only
vss->palette.SetIndex(11);
vss->palette.SetFallbackIndex(11);
vss->SetLightMatIdx(4);
}
else
{
// Use the 'bone' palette when visualizing a surface mesh only
vss->palette.SetIndex(4);
vss->palette.SetFallbackIndex(4);
}
// Otherwise, the 'vivid' palette is used in 3D see vssolution3d.cpp
vss->ToggleDrawAxes();
Expand Down Expand Up @@ -1417,6 +1417,7 @@ int main (int argc, char *argv[])
const char *stream_file = string_none;
const char *script_file = string_none;
const char *palette_file = string_none;
const char *palette_init = string_none;
const char *font_name = string_default;
int portnum = 19916;
int multisample = GetMultisample();
Expand Down Expand Up @@ -1468,8 +1469,10 @@ int main (int argc, char *argv[])
"Number of digits used for processor ranks in file names.");
args.AddOption(&script_file, "-run", "--run-script",
"Run a GLVis script file.");
args.AddOption(&palette_file, "-pal", "--palettes",
args.AddOption(&palette_file, "-pfile", "--palette-file",
Copy link
Contributor

@najlkin najlkin Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure about this one. Palettes with -pal were already in the release, so we should keep backward compatibility maybe.

Copy link
Contributor Author

@justinlaughlin justinlaughlin Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this makes more sense but you're right it breaks compatibility. Do you have any suggestions?

Copy link
Contributor Author

@justinlaughlin justinlaughlin Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-pname and -palette-name?

Copy link
Contributor

@najlkin najlkin Jun 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, for example that 😉

"Palette file.");
args.AddOption(&palette_init, "-pal", "--palette",
"Initial palette.");
args.AddOption(&arg_keys, "-k", "--keys",
"Execute key shortcut commands in the GLVis window.");
args.AddOption(&stream_state.fix_elem_orient, "-fo", "--fix-orientations",
Expand Down Expand Up @@ -1627,6 +1630,11 @@ int main (int argc, char *argv[])
BasePalettes.Load(palette_file);
}

if (palette_init != string_none)
{
BasePalettes.SetDefault(palette_init);
}

GLVisGeometryRefiner.SetType(geom_ref_type);

string data_type;
Expand Down
6 changes: 3 additions & 3 deletions lib/aux_js.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ void display(std::stringstream & commands, const int w, const int h)
vs->Zoom(1.8);
// Use the 'bone' palette when visualizing a 2D mesh only (otherwise
// the 'jet-like' palette is used in 2D, see vssolution.cpp).
vs->palette.SetIndex(4);
vs->palette.SetFallbackIndex(4);
}
}
else if (stream_state.mesh->SpaceDimension() == 3)
Expand All @@ -143,13 +143,13 @@ void display(std::stringstream & commands, const int w, const int h)
if (stream_state.mesh->Dimension() == 3)
{
// Use the 'white' palette when visualizing a 3D volume mesh only
vs->palette.SetIndex(11);
vs->palette.SetFallbackIndex(11);
vss->SetLightMatIdx(4);
}
else
{
// Use the 'bone' palette when visualizing a surface mesh only
vs->palette.SetIndex(4);
vs->palette.SetFallbackIndex(4);
}
// Otherwise, the 'vivid' palette is used in 3D see vssolution3d.cpp

Expand Down
12 changes: 12 additions & 0 deletions lib/palettes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,18 @@ void PaletteState::SetIndex(int num)
cout << "Palette: " << num << ") " << Palettes->Get(curr_palette)->name << endl;
}

bool PaletteState::UseDefaultIndex()
{
int num = Palettes->GetDefault();
if ((num >= 0) && (num < Palettes->NumPalettes()))
{
curr_palette = num;
cout << "Palette: " << num << ") " << Palettes->Get(curr_palette)->name << endl;
return true;
}
return false;
}

void PaletteState::NextIndex()
{
SetIndex((curr_palette + 1) % Palettes->NumPalettes());
Expand Down
5 changes: 5 additions & 0 deletions lib/palettes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ class PaletteState
int GetSmoothSetting() { return use_smooth; }
/// Sets the palette texture to bind.
void SetIndex(int num);
/// Use the default index if set
bool UseDefaultIndex();
/// If default index is not set, sets to this index.
/// Used for setting recommend palettes
void SetFallbackIndex(int idx) { if (!UseDefaultIndex()) { SetIndex(idx); } };
int GetCurrIndex() const { return curr_palette; }
void NextIndex();
void PrevIndex();
Expand Down
17 changes: 17 additions & 0 deletions lib/palettes_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,23 @@ Palette* PaletteRegistry::Get(const string& name) const
return palettes.back().get();
}

void PaletteRegistry::SetDefault(const string& name)
{
const int idx = GetIndexByName(name);
if (idx < 0)
{
cout << "Palette (name = " << name << ") not found. Available palettes:"
<< endl;
PrintSummary();
}
else
{
default_palette = idx;
cout << "Default palette set to: " << default_palette << ") "
<< Get(default_palette)->name << endl;
}
}

void PaletteRegistry::PrintSummary(ostream& os) const
{
for (int i = 0; i < NumPalettes(); i++)
Expand Down
7 changes: 7 additions & 0 deletions lib/palettes_base.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ class PaletteRegistry

/// Find the index of a palette by name
int GetIndexByName(const string& name) const;
int default_palette = -1; // index of the default palette

public:
/// Empty constructor
Expand All @@ -201,6 +202,12 @@ class PaletteRegistry
/// Get a palette pointer by name; if not found, returns last palette
Palette* Get(const string& name) const;

/// Set the index of the default palette by name
void SetDefault(const string& name);

/// Get the index of the default palette
int GetDefault() const { return default_palette; };

/// Prints a summary (index + name) of all palettes
void PrintSummary(ostream& os = cout) const;

Expand Down
2 changes: 1 addition & 1 deletion lib/vssolution.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ void VisualizationSceneSolution::Init()

VisualizationSceneScalarData::Init(); // Calls FindNewBox() !!!

palette.SetIndex(2); // use the 'jet-like' palette in 2D
palette.SetFallbackIndex(2); // use the 'jet-like' palette in 2D

double eps = 1e-6; // move the cutting plane a bit to avoid artifacts
CuttingPlane = new Plane(-1.0,0.0,0.0,(0.5-eps)*bb.x[0]+(0.5+eps)*bb.x[1]);
Expand Down
2 changes: 1 addition & 1 deletion lib/vssolution3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ void VisualizationSceneSolution3d::Init()

node_pos = new double[mesh->GetNV()];

palette.SetIndex(12); // use the 'vivid' palette in 3D
palette.SetFallbackIndex(12); // use the 'vivid' palette in 3D

double eps = 1e-6; // move the cutting plane a bit to avoid artifacts
CuttingPlane = new Plane(-1.0,0.0,0.0,(0.5-eps)*bb.x[0]+(0.5+eps)*bb.x[1]);
Expand Down
Loading