Skip to content

Commit

Permalink
- split qt-clients build on windows so one can build just the ones wh…
Browse files Browse the repository at this point in the history
…o is interested in

- better Compiler/Script cleaning
- clean OMEdit generated files on clean
- get rid of some warnings
- do Print.clearBuf() a bit differently in Main

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24453 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Feb 6, 2015
1 parent 1cb536a commit ae94042
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
Expand Up @@ -206,7 +206,7 @@ QSize ItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
/* Only calculate the height of the item based on the text for SimulationOutputTree items. Fix for multi line messages. */
if (mDrawRichText && parent() && qobject_cast<SimulationOutputTree*>(parent())) {
SimulationOutputTree *pSimulationOutputTree = qobject_cast<SimulationOutputTree*>(parent());
int width;
int width = 0;
if (pSimulationOutputTree) {
width = pSimulationOutputTree->columnWidth(index.column()) - (pSimulationOutputTree->indentation() * pSimulationOutputTree->getDepth(index));
}
Expand Down
8 changes: 4 additions & 4 deletions OMEdit/OMEditGUI/Plotting/VariablesWidget.cpp
Expand Up @@ -450,7 +450,7 @@ void VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath
/* open the .mat file */
ModelicaMatReader matReader;
matReader.file = 0;
matReader.fileName = "";
matReader.fileName = strdup("");
const char *msg[] = {""};
if (fileName.endsWith(".mat"))
{
Expand Down Expand Up @@ -491,7 +491,7 @@ void VariablesTreeModel::insertVariablesItems(QString fileName, QString filePath
findVariable = parentVariable.isEmpty() ? fileName + ".der(" + variable + ")" : fileName + "." + parentVariable + ".der(" + variable + ")";
else
findVariable = parentVariable.isEmpty() ? fileName + "." + variable : fileName + "." + parentVariable + "." + variable;
if (pParentVariablesTreeItem = findVariablesTreeItem(findVariable, pParentVariablesTreeItem))
if ((pParentVariablesTreeItem = findVariablesTreeItem(findVariable, pParentVariablesTreeItem)) != NULL)
{
if (count == 1)
parentVariable = variable;
Expand Down Expand Up @@ -607,7 +607,7 @@ void VariablesTreeModel::getVariableInformation(ModelicaMatReader *pMatReader, Q
/* if the variable is not a tunable parameter then read the final value of the variable. Only mat result files are supported. */
else
{
if (pMatReader->file && pMatReader->fileName != "")
if ((pMatReader->file != NULL) && strcmp(pMatReader->fileName, ""))
{
*value = "";
if (variableToFind.compare("time") == 0)
Expand All @@ -633,7 +633,7 @@ void VariablesTreeModel::getVariableInformation(ModelicaMatReader *pMatReader, Q
*displayUnit = hash["displayUnit"];
*description = hash["description"];
}
else if ((variableToFind.compare("time") == 0) && pMatReader->file && pMatReader->fileName != "")
else if ((variableToFind.compare("time") == 0) && (pMatReader->file != NULL) && strcmp(pMatReader->fileName, ""))
{
*value = QString::number(omc_matlab4_stopTime(pMatReader));
}
Expand Down

0 comments on commit ae94042

Please sign in to comment.