Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c479ee71d4a3
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6505ebc4e0f8
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 12, 2020

  1. Copy the full SHA
    3f87fc2 View commit details
  2. Copy the full SHA
    6505ebc View commit details
Showing with 13 additions and 13 deletions.
  1. +1 −1 graphwidget
  2. +1 −1 scopehal/FilterParameter.h
  3. +1 −1 scopehal/FlowGraphNode.cpp
  4. +2 −2 scopehal/FlowGraphNode.h
  5. +4 −4 scopehal/scopehal.cpp
  6. +4 −4 scopehal/scopehal.h
2 changes: 1 addition & 1 deletion graphwidget
Submodule graphwidget updated 1 files
+2 −3 Graph.cpp
2 changes: 1 addition & 1 deletion scopehal/FilterParameter.h
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ class FilterParameter
std::string m_fileFilterName;

//Add an enumerated value
void AddEnumValue(std::string name, int value)
void AddEnumValue(const std::string& name, int value)
{
m_forwardEnumMap[name] = value;
m_reverseEnumMap[value] = name;
2 changes: 1 addition & 1 deletion scopehal/FlowGraphNode.cpp
Original file line number Diff line number Diff line change
@@ -135,7 +135,7 @@ void FlowGraphNode::SetInput(size_t i, StreamDescriptor stream, bool force)
@param force Forcibly connect this stream without checking to make sure it's the right type.
Should only be set true by by Filter::LoadInputs() or in similar specialized situations.
*/
void FlowGraphNode::SetInput(string name, StreamDescriptor stream, bool force)
void FlowGraphNode::SetInput(const string& name, StreamDescriptor stream, bool force)
{
//Find the channel
for(size_t i=0; i<m_signalNames.size(); i++)
4 changes: 2 additions & 2 deletions scopehal/FlowGraphNode.h
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@ class FlowGraphNode
std::string GetInputName(size_t i);

void SetInput(size_t i, StreamDescriptor stream, bool force = false);
void SetInput(std::string name, StreamDescriptor stream, bool force = false);
void SetInput(const std::string& name, StreamDescriptor stream, bool force = false);
virtual bool ValidateChannel(size_t i, StreamDescriptor stream) =0;

StreamDescriptor GetInput(size_t i);
@@ -145,7 +145,7 @@ class FlowGraphNode
/**
@brief Creates and names an input signal
*/
void CreateInput(std::string name)
void CreateInput(const std::string& name)
{
m_signalNames.push_back(name);
m_inputs.push_back(StreamDescriptor(NULL, 0));
8 changes: 4 additions & 4 deletions scopehal/scopehal.cpp
Original file line number Diff line number Diff line change
@@ -161,7 +161,7 @@ string GetDefaultChannelColor(int i)
/**
@brief Converts a vector bus signal into a scalar (up to 64 bits wide)
*/
uint64_t ConvertVectorSignalToScalar(vector<bool> bits)
uint64_t ConvertVectorSignalToScalar(const vector<bool>& bits)
{
uint64_t rval = 0;
for(auto b : bits)
@@ -323,7 +323,7 @@ void InitializePlugins()
/**
@brief Removes whitespace from the start and end of a string
*/
string Trim(string str)
string Trim(const string& str)
{
string ret;
string tmp;
@@ -355,7 +355,7 @@ string Trim(string str)
/**
@brief Removes quotes from the start and end of a string
*/
string TrimQuotes(string str)
string TrimQuotes(const string& str)
{
string ret;
string tmp;
@@ -384,7 +384,7 @@ string TrimQuotes(string str)
return ret;
}

string BaseName(string const & path)
string BaseName(const string & path)
{
return path.substr(path.find_last_of("/\\") + 1);
}
8 changes: 4 additions & 4 deletions scopehal/scopehal.h
Original file line number Diff line number Diff line change
@@ -85,13 +85,13 @@
#include "TouchstoneParser.h"
#include "IBISParser.h"

uint64_t ConvertVectorSignalToScalar(std::vector<bool> bits);
uint64_t ConvertVectorSignalToScalar(const std::vector<bool>& bits);

std::string GetDefaultChannelColor(int i);

std::string Trim(std::string str);
std::string TrimQuotes(std::string str);
std::string BaseName(std::string const& path);
std::string Trim(const std::string& str);
std::string TrimQuotes(const std::string& str);
std::string BaseName(const std::string& path);

void TransportStaticInit();
void DriverStaticInit();